summaryrefslogtreecommitdiffstats
path: root/nbproject
diff options
context:
space:
mode:
authorFulup Ar Foll <fulup@iot.bzh>2015-12-16 15:38:27 +0100
committerFulup Ar Foll <fulup@iot.bzh>2015-12-16 15:38:27 +0100
commitf4df9160115470439d1820409126694d138cd7be (patch)
treecafdb70f5a01aeb19cc7c4feb7f665a480ccfb85 /nbproject
parentdcff5c07efce171084d19e9ddea6030f15b1a55b (diff)
En court
Diffstat (limited to 'nbproject')
-rw-r--r--nbproject/configurations.xml106
1 files changed, 52 insertions, 54 deletions
diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml
index 6b0679df..23e01917 100644
--- a/nbproject/configurations.xml
+++ b/nbproject/configurations.xml
@@ -48,7 +48,8 @@
</toolsSet>
<flagsDictionary>
<element flagsID="0" commonFlags="-fPIE"/>
- <element flagsID="1" commonFlags="-mtune=generic -march=x86-64 -fPIE"/>
+ <element flagsID="1" commonFlags="-mtune=generic -march=x86-64 -fPIC"/>
+ <element flagsID="2" commonFlags="-mtune=generic -march=x86-64 -fPIE"/>
</flagsDictionary>
<codeAssistance>
</codeAssistance>
@@ -65,65 +66,59 @@
<preBuildFirst>true</preBuildFirst>
</preBuild>
</makefileType>
- <item path="src/afbs-api.c" ex="false" tool="0" flavor2="2">
+ <item path="plugins/audio/audio-api.c" ex="false" tool="0" flavor2="2">
<cTool flags="1">
<incDir>
- <pElem>src</pElem>
+ <pElem>plugins/audio</pElem>
<pElem>/usr/include/json-c</pElem>
<pElem>include</pElem>
<pElem>/usr/include/uuid</pElem>
- <pElem>build/src</pElem>
+ <pElem>build/plugins</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/alsa-api.c" ex="false" tool="0" flavor2="2">
+ <item path="plugins/samples/HelloWorld.c" ex="false" tool="0" flavor2="2">
<cTool flags="1">
<incDir>
- <pElem>src</pElem>
+ <pElem>plugins/samples</pElem>
<pElem>/usr/include/json-c</pElem>
<pElem>include</pElem>
<pElem>/usr/include/uuid</pElem>
- <pElem>build/src</pElem>
+ <pElem>build/plugins</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/config.c" ex="false" tool="0" flavor2="2">
+ <item path="plugins/session/token-api.c" ex="false" tool="0" flavor2="2">
<cTool flags="1">
<incDir>
- <pElem>src</pElem>
+ <pElem>plugins/session</pElem>
<pElem>/usr/include/json-c</pElem>
<pElem>include</pElem>
<pElem>/usr/include/uuid</pElem>
+ <pElem>build/plugins</pElem>
+ </incDir>
+ </cTool>
+ </item>
+ <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>
- <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="1">
+ <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="2">
<incDir>
<pElem>src</pElem>
<pElem>/usr/include/json-c</pElem>
@@ -141,6 +136,15 @@
</preprocessorList>
</cTool>
</item>
+ <item path="src/dbus-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/http-svc.c" ex="false" tool="0" flavor2="2">
<cTool flags="1">
<incDir>
@@ -150,18 +154,10 @@
<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="1">
+ <cTool flags="2">
<incDir>
<pElem>src</pElem>
<pElem>/usr/include/json-c</pElem>
@@ -193,7 +189,7 @@
</cTool>
</item>
<item path="src/rest-api.c" ex="false" tool="0" flavor2="2">
- <cTool flags="1">
+ <cTool flags="2">
<incDir>
<pElem>src</pElem>
<pElem>/usr/include/json-c</pElem>
@@ -201,6 +197,17 @@
<pElem>/usr/include/uuid</pElem>
<pElem>build/src</pElem>
</incDir>
+ </cTool>
+ </item>
+ <item path="src/session.c" ex="false" tool="0" flavor2="2">
+ <cTool flags="2">
+ <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>
@@ -211,15 +218,6 @@
</preprocessorList>
</cTool>
</item>
- <item path="src/session.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>
</conf>
</confs>
</configurationDescriptor>