Code Review
/
src
/
app-framework-binder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Give priority to option --binding
[src/app-framework-binder.git]
/
nbproject
/
configurations.xml
diff --git
a/nbproject/configurations.xml
b/nbproject/configurations.xml
index
93b861c
..
e7a060a
100644
(file)
--- a/
nbproject/configurations.xml
+++ b/
nbproject/configurations.xml
@@
-70,9
+70,8
@@
<rebuildPropChanged>false</rebuildPropChanged>
</toolsSet>
<flagsDictionary>
<rebuildPropChanged>false</rebuildPropChanged>
</toolsSet>
<flagsDictionary>
- <element flagsID="0" commonFlags="-fPIC"/>
- <element flagsID="1" commonFlags="-fPIE"/>
- <element flagsID="2" commonFlags="-mtune=generic -march=x86-64 -fPIC"/>
+ <element flagsID="0" commonFlags="-fPIE"/>
+ <element flagsID="1" commonFlags="-mtune=generic -march=x86-64 -fPIC"/>
</flagsDictionary>
<codeAssistance>
</codeAssistance>
</flagsDictionary>
<codeAssistance>
</codeAssistance>
@@
-82,7
+81,7
@@
<buildCommand>${MAKE} -f Makefile</buildCommand>
<cleanCommand>${MAKE} -f Makefile clean</cleanCommand>
<executablePath>build/afb-daemon</executablePath>
<buildCommand>${MAKE} -f Makefile</buildCommand>
<cleanCommand>${MAKE} -f Makefile clean</cleanCommand>
<executablePath>build/afb-daemon</executablePath>
- <cTool flags="
2
">
+ <cTool flags="
1
">
</cTool>
</makeTool>
<preBuild>
</cTool>
</makeTool>
<preBuild>
@@
-119,7
+118,6
@@
<cTool>
<incDir>
<pElem>plugins/audio</pElem>
<cTool>
<incDir>
<pElem>plugins/audio</pElem>
- <pElem>build/plugins/audio</pElem>
</incDir>
<preprocessorList>
<Elem>PLUGIN_INSTALL_DIR="/usr/local/lib64/afb"</Elem>
</incDir>
<preprocessorList>
<Elem>PLUGIN_INSTALL_DIR="/usr/local/lib64/afb"</Elem>
@@
-144,8
+142,16
@@
</folder>
<folder path="0/plugins/samples">
<cTool>
</folder>
<folder path="0/plugins/samples">
<cTool>
+ <incDir>
+ <pElem>plugins/samples</pElem>
+ <pElem>build/plugins/samples</pElem>
+ </incDir>
<preprocessorList>
<Elem>PLUGIN_INSTALL_DIR="/usr/local/lib64/afb"</Elem>
<preprocessorList>
<Elem>PLUGIN_INSTALL_DIR="/usr/local/lib64/afb"</Elem>
+ <Elem>__PIC__=2</Elem>
+ <Elem>__REGISTER_PREFIX__=</Elem>
+ <Elem>__USER_LABEL_PREFIX__=</Elem>
+ <Elem>__pic__=2</Elem>
</preprocessorList>
</cTool>
</folder>
</preprocessorList>
</cTool>
</folder>
@@
-169,8
+175,10
@@
ex="false"
tool="0"
flavor2="2">
ex="false"
tool="0"
flavor2="2">
- <cTool flags="
2
">
+ <cTool flags="
1
">
<incDir>
<incDir>
+ <pElem>include</pElem>
+ <pElem>/usr/include/uuid</pElem>
<pElem>build/plugins/afm-main-plugin</pElem>
</incDir>
</cTool>
<pElem>build/plugins/afm-main-plugin</pElem>
</incDir>
</cTool>
@@
-179,7
+187,7
@@
ex="false"
tool="0"
flavor2="2">
ex="false"
tool="0"
flavor2="2">
- <cTool flags="
2
">
+ <cTool flags="
1
">
<incDir>
<pElem>/usr/lib64/dbus-1.0/include/dbus</pElem>
<pElem>/usr/include/dbus-1.0/dbus</pElem>
<incDir>
<pElem>/usr/lib64/dbus-1.0/include/dbus</pElem>
<pElem>/usr/include/dbus-1.0/dbus</pElem>
@@
-190,70
+198,60
@@
</cTool>
</item>
<item path="plugins/audio/audio-alsa.c" ex="false" tool="0" flavor2="2">
</cTool>
</item>
<item path="plugins/audio/audio-alsa.c" ex="false" tool="0" flavor2="2">
- <cTool flags="2">
+ <cTool flags="1">
+ <incDir>
+ <pElem>include</pElem>
+ <pElem>/usr/include/json-c</pElem>
+ <pElem>/usr/include/uuid</pElem>
+ <pElem>build/plugins/audio</pElem>
+ </incDir>
</cTool>
</item>
<item path="plugins/audio/audio-api.c" ex="false" tool="0" flavor2="2">
</cTool>
</item>
<item path="plugins/audio/audio-api.c" ex="false" tool="0" flavor2="2">
- <cTool flags="2">
+ <cTool flags="1">
+ <incDir>
+ <pElem>/usr/include/json-c</pElem>
+ <pElem>include</pElem>
+ <pElem>/usr/include/uuid</pElem>
+ <pElem>build/plugins/audio</pElem>
+ </incDir>
</cTool>
</item>
<item path="plugins/radio/radio-api.c" ex="false" tool="0" flavor2="2">
</cTool>
</item>
<item path="plugins/radio/radio-api.c" ex="false" tool="0" flavor2="2">
- <cTool flags="
2
">
+ <cTool flags="
1
">
</cTool>
</item>
<item path="plugins/radio/radio-rtlsdr.c" ex="false" tool="0" flavor2="2">
</cTool>
</item>
<item path="plugins/radio/radio-rtlsdr.c" ex="false" tool="0" flavor2="2">
- <cTool flags="
2
">
+ <cTool flags="
1
">
</cTool>
</item>
<item path="plugins/samples/ClientCtx.c" ex="false" tool="0" flavor2="2">
</cTool>
</item>
<item path="plugins/samples/ClientCtx.c" ex="false" tool="0" flavor2="2">
- <cTool flags="2">
- <incDir>
- <pElem>plugins/samples</pElem>
- <pElem>build/plugins/samples</pElem>
- </incDir>
+ <cTool flags="1">
<preprocessorList>
<preprocessorList>
- <Elem>__PIC__=2</Elem>
- <Elem>__REGISTER_PREFIX__=</Elem>
- <Elem>__USER_LABEL_PREFIX__=</Elem>
- <Elem>__pic__=2</Elem>
<Elem>clientCtx_api_EXPORTS=1</Elem>
</preprocessorList>
</cTool>
</item>
<item path="plugins/samples/HelloWorld.c" ex="false" tool="0" flavor2="2">
<Elem>clientCtx_api_EXPORTS=1</Elem>
</preprocessorList>
</cTool>
</item>
<item path="plugins/samples/HelloWorld.c" ex="false" tool="0" flavor2="2">
- <cTool flags="2">
- <incDir>
- <pElem>plugins/samples</pElem>
- <pElem>build/plugins/samples</pElem>
- </incDir>
+ <cTool flags="1">
<preprocessorList>
<preprocessorList>
- <Elem>__PIC__=2</Elem>
- <Elem>__REGISTER_PREFIX__=</Elem>
- <Elem>__USER_LABEL_PREFIX__=</Elem>
- <Elem>__pic__=2</Elem>
<Elem>helloWorld_api_EXPORTS=1</Elem>
</preprocessorList>
</cTool>
</item>
<item path="plugins/samples/SamplePost.c" ex="false" tool="0" flavor2="2">
<Elem>helloWorld_api_EXPORTS=1</Elem>
</preprocessorList>
</cTool>
</item>
<item path="plugins/samples/SamplePost.c" ex="false" tool="0" flavor2="2">
- <cTool flags="0">
- <incDir>
- <pElem>/usr/include/dbus-1.0</pElem>
- <pElem>/usr/lib64/dbus-1.0/include</pElem>
- <pElem>/usr/include/alsa</pElem>
- <pElem>build/plugins/samples</pElem>
- </incDir>
+ <cTool flags="1">
<preprocessorList>
<preprocessorList>
- <Elem>samplePost_api_EXPORTS</Elem>
+ <Elem>samplePost_api_EXPORTS
=1
</Elem>
</preprocessorList>
</cTool>
</item>
<item path="plugins/session/token-api.c" ex="false" tool="0" flavor2="2">
</preprocessorList>
</cTool>
</item>
<item path="plugins/session/token-api.c" ex="false" tool="0" flavor2="2">
- <cTool flags="
2
">
+ <cTool flags="
1
">
</cTool>
</item>
<item path="src/afbs-api.c" ex="false" tool="0" flavor2="2">
</cTool>
</item>
<item path="src/afbs-api.c" ex="false" tool="0" flavor2="2">
- <cTool flags="
1
">
+ <cTool flags="
0
">
<incDir>
<pElem>plugins/audio</pElem>
<pElem>/usr/include/json-c</pElem>
<incDir>
<pElem>plugins/audio</pElem>
<pElem>/usr/include/json-c</pElem>
@@
-267,7
+265,7
@@
</cTool>
</item>
<item path="src/alsa-api.c" ex="false" tool="0" flavor2="2">
</cTool>
</item>
<item path="src/alsa-api.c" ex="false" tool="0" flavor2="2">
- <cTool flags="
1
">
+ <cTool flags="
0
">
<incDir>
<pElem>plugins/audio</pElem>
<pElem>/usr/include/json-c</pElem>
<incDir>
<pElem>plugins/audio</pElem>
<pElem>/usr/include/json-c</pElem>
@@
-281,7
+279,7
@@
</cTool>
</item>
<item path="src/config.c" ex="false" tool="0" flavor2="2">
</cTool>
</item>
<item path="src/config.c" ex="false" tool="0" flavor2="2">
- <cTool flags="
2
">
+ <cTool flags="
1
">
<incDir>
<pElem>src</pElem>
<pElem>/usr/include/json-c</pElem>
<incDir>
<pElem>src</pElem>
<pElem>/usr/include/json-c</pElem>
@@
-299,7
+297,7
@@
</cTool>
</item>
<item path="src/dbus-api.c" ex="false" tool="0" flavor2="2">
</cTool>
</item>
<item path="src/dbus-api.c" ex="false" tool="0" flavor2="2">
- <cTool flags="
1
">
+ <cTool flags="
0
">
<incDir>
<pElem>plugins/audio</pElem>
<pElem>/usr/include/json-c</pElem>
<incDir>
<pElem>plugins/audio</pElem>
<pElem>/usr/include/json-c</pElem>
@@
-313,23
+311,18
@@
</cTool>
</item>
<item path="src/helper-api.c" ex="false" tool="0" flavor2="2">
</cTool>
</item>
<item path="src/helper-api.c" ex="false" tool="0" flavor2="2">
- <cTool flags="
0
">
+ <cTool flags="
1
">
<incDir>
<incDir>
- <pElem>
include
</pElem>
+ <pElem>
src
</pElem>
<pElem>/usr/include/json-c</pElem>
<pElem>/usr/include/json-c</pElem>
+ <pElem>include</pElem>
<pElem>/usr/include/uuid</pElem>
<pElem>/usr/include/uuid</pElem>
- <pElem>/usr/include/dbus-1.0</pElem>
- <pElem>/usr/lib64/dbus-1.0/include</pElem>
- <pElem>/usr/include/alsa</pElem>
<pElem>build/src</pElem>
</incDir>
<pElem>build/src</pElem>
</incDir>
- <preprocessorList>
- <Elem>PLUGIN_INSTALL_DIR="/usr/local/lib64/afb"</Elem>
- </preprocessorList>
</cTool>
</item>
<item path="src/http-svc.c" ex="false" tool="0" flavor2="2">
</cTool>
</item>
<item path="src/http-svc.c" ex="false" tool="0" flavor2="2">
- <cTool flags="
2
">
+ <cTool flags="
1
">
<incDir>
<pElem>src</pElem>
<pElem>/usr/include/json-c</pElem>
<incDir>
<pElem>src</pElem>
<pElem>/usr/include/json-c</pElem>
@@
-340,7
+333,7
@@
</cTool>
</item>
<item path="src/main.c" ex="false" tool="0" flavor2="2">
</cTool>
</item>
<item path="src/main.c" ex="false" tool="0" flavor2="2">
- <cTool flags="
2
">
+ <cTool flags="
1
">
<incDir>
<pElem>src</pElem>
<pElem>/usr/include/json-c</pElem>
<incDir>
<pElem>src</pElem>
<pElem>/usr/include/json-c</pElem>
@@
-358,7
+351,7
@@
</cTool>
</item>
<item path="src/radio-api.c" ex="false" tool="0" flavor2="2">
</cTool>
</item>
<item path="src/radio-api.c" ex="false" tool="0" flavor2="2">
- <cTool flags="
1
">
+ <cTool flags="
0
">
<incDir>
<pElem>plugins/audio</pElem>
<pElem>/usr/include/json-c</pElem>
<incDir>
<pElem>plugins/audio</pElem>
<pElem>/usr/include/json-c</pElem>
@@
-376,23
+369,18
@@
</cTool>
</item>
<item path="src/rest-api.c" ex="false" tool="0" flavor2="2">
</cTool>
</item>
<item path="src/rest-api.c" ex="false" tool="0" flavor2="2">
- <cTool flags="
0
">
+ <cTool flags="
1
">
<incDir>
<incDir>
- <pElem>
include
</pElem>
+ <pElem>
src
</pElem>
<pElem>/usr/include/json-c</pElem>
<pElem>/usr/include/json-c</pElem>
+ <pElem>include</pElem>
<pElem>/usr/include/uuid</pElem>
<pElem>/usr/include/uuid</pElem>
- <pElem>/usr/include/dbus-1.0</pElem>
- <pElem>/usr/lib64/dbus-1.0/include</pElem>
- <pElem>/usr/include/alsa</pElem>
<pElem>build/src</pElem>
</incDir>
<pElem>build/src</pElem>
</incDir>
- <preprocessorList>
- <Elem>PLUGIN_INSTALL_DIR="/usr/local/lib64/afb"</Elem>
- </preprocessorList>
</cTool>
</item>
<item path="src/session.c" ex="false" tool="0" flavor2="2">
</cTool>
</item>
<item path="src/session.c" ex="false" tool="0" flavor2="2">
- <cTool flags="
2
">
+ <cTool flags="
1
">
<incDir>
<pElem>src</pElem>
<pElem>/usr/include/json-c</pElem>
<incDir>
<pElem>src</pElem>
<pElem>/usr/include/json-c</pElem>
@@
-400,6
+388,13
@@
<pElem>include</pElem>
<pElem>build/src</pElem>
</incDir>
<pElem>include</pElem>
<pElem>build/src</pElem>
</incDir>
+ <preprocessorList>
+ <Elem>PLUGIN_INSTALL_DIR="/usr/local/lib64/afb"</Elem>
+ <Elem>__PIC__=2</Elem>
+ <Elem>__REGISTER_PREFIX__=</Elem>
+ <Elem>__USER_LABEL_PREFIX__=</Elem>
+ <Elem>__pic__=2</Elem>
+ </preprocessorList>
</cTool>
</item>
</conf>
</cTool>
</item>
</conf>