diff options
| author |   Manuel Bachmann <manuel.bachmann@iot.bzh> | 2015-12-14 14:51:18 +0100 |
|---|---|---|
| committer | Manuel Bachmann <manuel.bachmann@iot.bzh> | 2015-12-14 14:51:18 +0100 |
| commit | e2dc9bcbd7f8d225a134a4a3729c0ebc1c60f49c (patch) | |
| tree | 574b339c5f2d2bb787f4140d97ea90e8bd067ce5 | |
| parent | 1231491515aca29877935f44d5a97ced86066dd2 (diff) | |
Document UUID dependency, make radio plugin buildable
Signed-off-by: Manuel Bachmann <manuel.bachmann@iot.bzh>
| -rw-r--r-- | README.md | 3 | ||||
| -rw-r--r-- | nbproject/configurations.xml | 141 | ||||
| -rw-r--r-- | nbproject/private/Default.properties | 17 | ||||
| -rw-r--r-- | nbproject/private/configurations.xml | 4 | ||||
| -rw-r--r-- | src/radio-api.c | 178 |
5 files changed, 124 insertions, 219 deletions
@@ -14,6 +14,7 @@ industry requirementsas the primary target for this code is AGL. * libmagic ("libmagic-dev" under Debian/Ubuntu, "file-devel" under OpenSUSE); * libmicrohttpd ("libmicrohttpd-dev/devel"); * json-c ("libjson-c-dev/devel"); + * uuid ("uuid-dev/libuuid-devel"); optionally, for plugins : @@ -26,7 +27,7 @@ industry requirementsas the primary target for this code is AGL. To install all dependencies under OpenSUSE (except rtl-sdr), please type: -$ zypper in file-devel libmicrohttpd-devel libjson-c-devel pkg-config cmake +$ zypper in file-devel libmicrohttpd-devel libjson-c-devel libuuid-devel pkg-config cmake To build from the root directory, please type: diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml index d9919548..129838ae 100644 --- a/nbproject/configurations.xml +++ b/nbproject/configurations.xml @@ -9,6 +9,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> @@ -47,7 +48,6 @@ </toolsSet> <flagsDictionary> <element flagsID="0" commonFlags="-fPIE"/> - <element flagsID="1" commonFlags="-mtune=generic -march=x86-64 -fPIE"/> </flagsDictionary> <codeAssistance> </codeAssistance> @@ -57,6 +57,17 @@ <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>/usr/include/libusb-1.0</pElem> + <pElem>build/src</pElem> + </incDir> + <preprocessorList> + <Elem>WITH_RADIO_PLUGIN=1</Elem> + </preprocessorList> + </cTool> </makeTool> <preBuild> <preBuildCommandWorkingDir>build</preBuildCommandWorkingDir> @@ -65,145 +76,39 @@ </preBuild> </makefileType> <item path="src/afbs-api.c" ex="false" tool="0" flavor2="2"> - <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 flags="0"> </cTool> </item> <item path="src/alsa-api.c" ex="false" tool="0" flavor2="2"> - <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 flags="0"> </cTool> </item> <item path="src/config.c" ex="false" tool="0" flavor2="2"> - <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& |