diff options
author | Fulup Ar Foll <fulup@iot.bzh> | 2015-12-12 03:10:34 +0100 |
---|---|---|
committer | Fulup Ar Foll <fulup@iot.bzh> | 2015-12-12 03:10:34 +0100 |
commit | e7c246a1b0d30b8156c7033061a61ecb5d2bdfc8 (patch) | |
tree | eedbde29dfd073934c6b985d6cb213621708cd51 /nbproject | |
parent | 335eeec7aaf944d66cac87b5bb3f64f8fc7e385e (diff) |
Added Session Management
Diffstat (limited to 'nbproject')
-rw-r--r-- | nbproject/configurations.xml | 120 | ||||
-rw-r--r-- | nbproject/private/Default.properties | 7 | ||||
-rw-r--r-- | nbproject/private/configurations.xml | 15 |
3 files changed, 110 insertions, 32 deletions
diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml index 3d743b11..4b821789 100644 --- a/nbproject/configurations.xml +++ b/nbproject/configurations.xml @@ -47,6 +47,7 @@ </toolsSet> <flagsDictionary> <element flagsID="0" commonFlags="-fPIE"/> + <element flagsID="1" commonFlags="-mtune=generic -march=x86-64 -fPIE"/> </flagsDictionary> <codeAssistance> </codeAssistance> @@ -56,13 +57,6 @@ <buildCommand>${MAKE} -f Makefile</buildCommand> <cleanCommand>${MAKE} -f Makefile clean</cleanCommand> <executablePath>build/src/afb-daemon</executablePath> - <cTool> - <incDir> - <pElem>include</pElem> - <pElem>/usr/include/json-c</pElem> - <pElem>build/src</pElem> - </incDir> - </cTool> </makeTool> <preBuild> <preBuildCommandWorkingDir>build</preBuildCommandWorkingDir> @@ -72,34 +66,134 @@ </makefileType> <item path="src/afbs-api.c" ex="false" tool="0" flavor2="2"> <cTool flags="0"> + <incDir> + <pElem>include</pElem> + <pElem>/usr/include/json-c</pElem> + <pElem>build/src</pElem> + </incDir> </cTool> </item> <item path="src/alsa-api.c" ex="false" tool="0" flavor2="2"> <cTool flags="0"> + <incDir> + <pElem>include</pElem> + <pElem>/usr/include/json-c</pElem> + <pElem>build/src</pElem> + </incDir> </cTool> </item> <item path="src/config.c" ex="false" tool="0" flavor2="2"> - <cTool flags="0"> + <cTool flags="1"> + <incDir> + <pElem>src</pElem> + <pElem>/usr/include/json-c</pElem> + <pElem>include</pElem> + <pElem>/usr/include/uuid</pElem> + <pElem>build/src</pElem> + </incDir> + <preprocessorList> + <Elem>__PIC__=2</Elem> + <Elem>__PIE__=2</Elem> + <Elem>__REGISTER_PREFIX__=</Elem> + <Elem>__USER_LABEL_PREFIX__=</Elem> + <Elem>__pic__=2</Elem> + <Elem>__pie__=2</Elem> + </preprocessorList> </cTool> </item> <item path="src/dbus-api.c" ex="false" tool="0" flavor2="2"> - <cTool flags="0"> + <cTool flags="1"> + <incDir> + <pElem>src</pElem> + <pElem>/usr/include/json-c</pElem> + <pElem>include</pElem> + <pElem>/usr/include/uuid</pElem> + <pElem>build/src</pElem> + </incDir> + <preprocessorList> + <Elem>__PIC__=2</Elem> + <Elem>__PIE__=2</Elem> + <Elem>__REGISTER_PREFIX__=</Elem> + <Elem>__USER_LABEL_PREFIX__=</Elem> + <Elem>__pic__=2</Elem> + <Elem>__pie__=2</Elem> + </preprocessorList> </cTool> </item> <item path="src/http-svc.c" ex="false" tool="0" flavor2="2"> - <cTool flags="0"> + <cTool flags="1"> + <incDir> + <pElem>src</pElem> + <pElem>/usr/include/json-c</pElem> + <pElem>include</pElem> + <pElem>/usr/include/uuid</pElem> + <pElem>build/src</pElem> + </incDir> + <preprocessorList> + <Elem>__PIC__=2</Elem> + <Elem>__PIE__=2</Elem> + <Elem>__REGISTER_PREFIX__=</Elem> + <Elem>__USER_LABEL_PREFIX__=</Elem> + <Elem>__pic__=2</Elem> + <Elem>__pie__=2</Elem> + </preprocessorList> </cTool> </item> <item path="src/main.c" ex="false" tool="0" flavor2="2"> - <cTool flags="0"> + <cTool flags="1"> + <incDir> + <pElem>src</pElem> + <pElem>/usr/include/json-c</pElem> + <pElem>include</pElem> + <pElem>/usr/include/uuid</pElem> + <pElem>build/src</pElem> + </incDir> + <preprocessorList> + <Elem>__PIC__=2</Elem> + <Elem>__PIE__=2</Elem> + <Elem>__REGISTER_PREFIX__=</Elem> + <Elem>__USER_LABEL_PREFIX__=</Elem> + <Elem>__pic__=2</Elem> + <Elem>__pie__=2</Elem> + </preprocessorList> </cTool> </item> <item path="src/rest-api.c" ex="false" tool="0" flavor2="2"> - <cTool flags="0"> + <cTool flags="1"> + <incDir> + <pElem>src</pElem> + <pElem>/usr/include/json-c</pElem> + <pElem>include</pElem> + <pElem>/usr/include/uuid</pElem> + <pElem>build/src</pElem> + </incDir> + <preprocessorList> + <Elem>__PIC__=2</Elem> + <Elem>__PIE__=2</Elem> + <Elem>__REGISTER_PREFIX__=</Elem> + <Elem>__USER_LABEL_PREFIX__=</Elem> + <Elem>__pic__=2</Elem> + <Elem>__pie__=2</Elem> + </preprocessorList> </cTool> </item> <item path="src/session.c" ex="false" tool="0" flavor2="2"> - <cTool flags="0"> + <cTool flags="1"> + <incDir> + <pElem>src</pElem> + <pElem>/usr/include/json-c</pElem> + <pElem>/usr/include/uuid</pElem> + <pElem>include</pElem> + <pElem>build/src</pElem> + </incDir> + <preprocessorList> + <Elem>__PIC__=2</Elem> + <Elem>__PIE__=2</Elem> + <Elem>__REGISTER_PREFIX__=</Elem> + <Elem>__USER_LABEL_PREFIX__=</Elem> + <Elem>__pic__=2</Elem> + <Elem>__pie__=2</Elem> + </preprocessorList> </cTool> </item> </conf> diff --git a/nbproject/private/Default.properties b/nbproject/private/Default.properties index de73bf9e..0f8ddbcc 100644 --- a/nbproject/private/Default.properties +++ b/nbproject/private/Default.properties @@ -1,8 +1 @@ -/home/fulup/Workspace/afb-daemon/src/session.c=/home/fulup/Workspace/afb-daemon/build/src#-g3 -gdwarf-2 -fPIE -I/home/fulup/Workspace/afb-daemon/include -I/usr/include/json-c -o CMakeFiles/afb-daemon.dir/session.c.o -c /home/fulup/Workspace/afb-daemon/src/session.c -/home/fulup/Workspace/afb-daemon/src/alsa-api.c=/home/fulup/Workspace/afb-daemon/build/src#-g3 -gdwarf-2 -fPIE -I/home/fulup/Workspace/afb-daemon/include -I/usr/include/json-c -o CMakeFiles/afb-daemon.dir/alsa-api.c.o -c /home/fulup/Workspace/afb-daemon/src/alsa-api.c -/home/fulup/Workspace/afb-daemon/src/main.c=/home/fulup/Workspace/afb-daemon/build/src#-g3 -gdwarf-2 -fPIE -I/home/fulup/Workspace/afb-daemon/include -I/usr/include/json-c -o CMakeFiles/afb-daemon.dir/main.c.o -c /home/fulup/Workspace/afb-daemon/src/main.c -/home/fulup/Workspace/afb-daemon/src/dbus-api.c=/home/fulup/Workspace/afb-daemon/build/src#-g3 -gdwarf-2 -fPIE -I/home/fulup/Workspace/afb-daemon/include -I/usr/include/json-c -o CMakeFiles/afb-daemon.dir/dbus-api.c.o -c /home/fulup/Workspace/afb-daemon/src/dbus-api.c -/home/fulup/Workspace/afb-daemon/src/http-svc.c=/home/fulup/Workspace/afb-daemon/build/src#-g3 -gdwarf-2 -fPIE -I/home/fulup/Workspace/afb-daemon/include -I/usr/include/json-c -o CMakeFiles/afb-daemon.dir/http-svc.c.o -c /home/fulup/Workspace/afb-daemon/src/http-svc.c /home/fulup/Workspace/afb-daemon/src/afbs-api.c=/home/fulup/Workspace/afb-daemon/build/src#-g3 -gdwarf-2 -fPIE -I/home/fulup/Workspace/afb-daemon/include -I/usr/include/json-c -o CMakeFiles/afb-daemon.dir/afbs-api.c.o -c /home/fulup/Workspace/afb-daemon/src/afbs-api.c -/home/fulup/Workspace/afb-daemon/src/rest-api.c=/home/fulup/Workspace/afb-daemon/build/src#-g3 -gdwarf-2 -fPIE -I/home/fulup/Workspace/afb-daemon/include -I/usr/include/json-c -o CMakeFiles/afb-daemon.dir/rest-api.c.o -c /home/fulup/Workspace/afb-daemon/src/rest-api.c -/home/fulup/Workspace/afb-daemon/src/config.c=/home/fulup/Workspace/afb-daemon/build/src#-g3 -gdwarf-2 -fPIE -I/home/fulup/Workspace/afb-daemon/include -I/usr/include/json-c -o CMakeFiles/afb-daemon.dir/config.c.o -c /home/fulup/Workspace/afb-daemon/src/config.c diff --git a/nbproject/private/configurations.xml b/nbproject/private/configurations.xml index 457c443c..4cc0c9f9 100644 --- a/nbproject/private/configurations.xml +++ b/nbproject/private/configurations.xml @@ -20,12 +20,6 @@ </df> </df> </df> - <df name="dist"> - <df name="Debug"> - <df name="GNU-Linux"> - </df> - </df> - </df> <df name="include"> <in>local-def.h</in> <in>proto-def.h</in> @@ -37,6 +31,7 @@ <in>dbus-api.c</in> <in>http-svc.c</in> <in>main.c</in> + <in>radio-api.c</in> <in>rest-api.c</in> <in>session.c</in> </df> @@ -58,12 +53,6 @@ </df> </df> </df> - <df name="dist"> - <df name="Debug"> - <df name="GNU-Linux"> - </df> - </df> - </df> <df name="include"> </df> <df name="src"> @@ -95,6 +84,8 @@ <gdb_interceptlist> <gdbinterceptoptions gdb_all="false" gdb_unhandled="true" gdb_unexpected="true"/> </gdb_interceptlist> + <gdb_signals> + </gdb_signals> <gdb_options> <DebugOptions> </DebugOptions> |