aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFulup Ar Foll <fulup@iot.bzh>2015-12-21 13:22:28 +0100
committerFulup Ar Foll <fulup@iot.bzh>2015-12-21 13:22:28 +0100
commit33c9353cce432422fea4ba61ab17b20dd8cfe800 (patch)
tree249d5fd030e9c802bb4cebb866551b125ecf71a8
parente4f582781690edbee5a29fd416b0f3b4b2e9d14e (diff)
Fix HelloWorld
-rw-r--r--.gitignore2
-rw-r--r--nbproject/configurations.xml28
-rw-r--r--nbproject/private/Default.properties20
-rw-r--r--nbproject/private/configurations.xml50
4 files changed, 84 insertions, 16 deletions
diff --git a/.gitignore b/.gitignore
index 04aecf22..b47de8ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,4 @@ dist/*
.dep.inc
CMakeFiles/
CMakeCache.txt
-nbproject/*
+nbproject/**
diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml
index c4d8a5ef..449cdafc 100644
--- a/nbproject/configurations.xml
+++ b/nbproject/configurations.xml
@@ -98,8 +98,12 @@
<folder path="0/plugins/audio">
<cTool>
<incDir>
- <pElem>build/plugins</pElem>
+ <pElem>build/plugins/audio</pElem>
</incDir>
+ <preprocessorList>
+ <Elem>PLUGIN_INSTALL_DIR="/usr/local/lib64/afb"</Elem>
+ <Elem>audio_api_EXPORTS</Elem>
+ </preprocessorList>
</cTool>
</folder>
<folder path="0/plugins/radio">
@@ -115,15 +119,22 @@
<folder path="0/plugins/samples">
<cTool>
<incDir>
- <pElem>build/plugins</pElem>
+ <pElem>build/plugins/samples</pElem>
</incDir>
+ <preprocessorList>
+ <Elem>PLUGIN_INSTALL_DIR="/usr/local/lib64/afb"</Elem>
+ </preprocessorList>
</cTool>
</folder>
<folder path="0/plugins/session">
<cTool>
<incDir>
- <pElem>build/plugins</pElem>
+ <pElem>build/plugins/session</pElem>
</incDir>
+ <preprocessorList>
+ <Elem>PLUGIN_INSTALL_DIR="/usr/local/lib64/afb"</Elem>
+ <Elem>token_api_EXPORTS</Elem>
+ </preprocessorList>
</cTool>
</folder>
<item path="plugins/audio/audio-alsa.c" ex="false" tool="0" flavor2="2">
@@ -144,10 +155,16 @@
</item>
<item path="plugins/samples/HelloWorld.c" ex="false" tool="0" flavor2="2">
<cTool flags="0">
+ <preprocessorList>
+ <Elem>helloWorld_api_EXPORTS</Elem>
+ </preprocessorList>
</cTool>
</item>
<item path="plugins/samples/SamplePost.c" ex="false" tool="0" flavor2="2">
<cTool flags="0">
+ <preprocessorList>
+ <Elem>samplePost_api_EXPORTS</Elem>
+ </preprocessorList>
</cTool>
</item>
<item path="plugins/session/token-api.c" ex="false" tool="0" flavor2="2">
@@ -193,6 +210,7 @@
</incDir>
<preprocessorList>
<Elem>HAVE_AUDIO_PLUGIN=1</Elem>
+ <Elem>PLUGIN_INSTALL_DIR="/usr/local/lib64/afb"</Elem>
</preprocessorList>
</cTool>
</item>
@@ -221,6 +239,7 @@
</incDir>
<preprocessorList>
<Elem>HAVE_AUDIO_PLUGIN=1</Elem>
+ <Elem>PLUGIN_INSTALL_DIR="/usr/local/lib64/afb"</Elem>
</preprocessorList>
</cTool>
</item>
@@ -235,6 +254,7 @@
</incDir>
<preprocessorList>
<Elem>HAVE_AUDIO_PLUGIN=1</Elem>
+ <Elem>PLUGIN_INSTALL_DIR="/usr/local/lib64/afb"</Elem>
</preprocessorList>
</cTool>
</item>
@@ -267,6 +287,7 @@
</incDir>
<preprocessorList>
<Elem>HAVE_AUDIO_PLUGIN=1</Elem>
+ <Elem>PLUGIN_INSTALL_DIR="/usr/local/lib64/afb"</Elem>
</preprocessorList>
</cTool>
</item>
@@ -281,6 +302,7 @@
</incDir>
<preprocessorList>
<Elem>HAVE_AUDIO_PLUGIN=1</Elem>
+ <Elem>PLUGIN_INSTALL_DIR="/usr/local/lib64/afb"</Elem>
</preprocessorList>
</cTool>
</item>
diff --git a/nbproject/private/Default.properties b/nbproject/private/Default.properties
index df9c96c1..24854184 100644
--- a/nbproject/private/Default.properties
+++ b/nbproject/private/Default.properties
@@ -1,10 +1,10 @@
-/home/fulup/Workspace/afb-daemon/src/session.c=/home/fulup/Workspace/afb-daemon/build/src#-DHAVE_AUDIO_PLUGIN=1 -g3 -gdwarf-2 -fPIC -I/home/fulup/Workspace/afb-daemon/include -I/usr/include/json-c -I/usr/include/uuid -I/usr/include/alsa -o CMakeFiles/src.dir/session.c.o -c /home/fulup/Workspace/afb-daemon/src/session.c
-/home/fulup/Workspace/afb-daemon/src/main.c=/home/fulup/Workspace/afb-daemon/build/src#-DHAVE_AUDIO_PLUGIN=1 -g3 -gdwarf-2 -fPIC -I/home/fulup/Workspace/afb-daemon/include -I/usr/include/json-c -I/usr/include/uuid -I/usr/include/alsa -o CMakeFiles/src.dir/main.c.o -c /home/fulup/Workspace/afb-daemon/src/main.c
-/home/fulup/Workspace/afb-daemon/src/http-svc.c=/home/fulup/Workspace/afb-daemon/build/src#-DHAVE_AUDIO_PLUGIN=1 -g3 -gdwarf-2 -fPIC -I/home/fulup/Workspace/afb-daemon/include -I/usr/include/json-c -I/usr/include/uuid -I/usr/include/alsa -o CMakeFiles/src.dir/http-svc.c.o -c /home/fulup/Workspace/afb-daemon/src/http-svc.c
-/home/fulup/Workspace/afb-daemon/src/rest-api.c=/home/fulup/Workspace/afb-daemon/build/src#-DHAVE_AUDIO_PLUGIN=1 -g3 -gdwarf-2 -fPIC -I/home/fulup/Workspace/afb-daemon/include -I/usr/include/json-c -I/usr/include/uuid -I/usr/include/alsa -o CMakeFiles/src.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#-DHAVE_AUDIO_PLUGIN=1 -g3 -gdwarf-2 -fPIC -I/home/fulup/Workspace/afb-daemon/include -I/usr/include/json-c -I/usr/include/uuid -I/usr/include/alsa -o CMakeFiles/src.dir/config.c.o -c /home/fulup/Workspace/afb-daemon/src/config.c
-/home/fulup/Workspace/afb-daemon/plugins/session/token-api.c=/home/fulup/Workspace/afb-daemon/build/plugins#-g3 -gdwarf-2 -fPIC -I/home/fulup/Workspace/afb-daemon/include -I/usr/include/json-c -I/usr/include/uuid -I/usr/include/alsa -o CMakeFiles/plugins.dir/session/token-api.c.o -c /home/fulup/Workspace/afb-daemon/plugins/session/token-api.c
-/home/fulup/Workspace/afb-daemon/plugins/audio/audio-api.c=/home/fulup/Workspace/afb-daemon/build/plugins#-g3 -gdwarf-2 -fPIC -I/home/fulup/Workspace/afb-daemon/include -I/usr/include/json-c -I/usr/include/uuid -I/usr/include/alsa -o CMakeFiles/plugins.dir/audio/audio-api.c.o -c /home/fulup/Workspace/afb-daemon/plugins/audio/audio-api.c
-/home/fulup/Workspace/afb-daemon/plugins/audio/audio-alsa.c=/home/fulup/Workspace/afb-daemon/build/plugins#-g3 -gdwarf-2 -fPIC -I/home/fulup/Workspace/afb-daemon/include -I/usr/include/json-c -I/usr/include/uuid -I/usr/include/alsa -o CMakeFiles/plugins.dir/audio/audio-alsa.c.o -c /home/fulup/Workspace/afb-daemon/plugins/audio/audio-alsa.c
-/home/fulup/Workspace/afb-daemon/plugins/samples/HelloWorld.c=/home/fulup/Workspace/afb-daemon/build/plugins#-g3 -gdwarf-2 -fPIC -I/home/fulup/Workspace/afb-daemon/include -I/usr/include/json-c -I/usr/include/uuid -I/usr/include/alsa -o CMakeFiles/plugins.dir/samples/HelloWorld.c.o -c /home/fulup/Workspace/afb-daemon/plugins/samples/HelloWorld.c
-/home/fulup/Workspace/afb-daemon/plugins/samples/SamplePost.c=/home/fulup/Workspace/afb-daemon/build/plugins#-g3 -gdwarf-2 -fPIC -I/home/fulup/Workspace/afb-daemon/include -I/usr/include/json-c -I/usr/include/uuid -I/usr/include/alsa -o CMakeFiles/plugins.dir/samples/SamplePost.c.o -c /home/fulup/Workspace/afb-daemon/plugins/samples/SamplePost.c
+/home/fulup/Workspace/afb-daemon/src/session.c=/home/fulup/Workspace/afb-daemon/build/src#-DHAVE_AUDIO_PLUGIN=1 -DPLUGIN_INSTALL_DIR=\"/usr/local/lib64/afb\" -g3 -gdwarf-2 -fPIC -I/home/fulup/Workspace/afb-daemon/include -I/usr/include/json-c -I/usr/include/uuid -I/usr/include/alsa -o CMakeFiles/src.dir/session.c.o -c /home/fulup/Workspace/afb-daemon/src/session.c
+/home/fulup/Workspace/afb-daemon/src/main.c=/home/fulup/Workspace/afb-daemon/build/src#-DHAVE_AUDIO_PLUGIN=1 -DPLUGIN_INSTALL_DIR=\"/usr/local/lib64/afb\" -g3 -gdwarf-2 -fPIC -I/home/fulup/Workspace/afb-daemon/include -I/usr/include/json-c -I/usr/include/uuid -I/usr/include/alsa -o CMakeFiles/src.dir/main.c.o -c /home/fulup/Workspace/afb-daemon/src/main.c
+/home/fulup/Workspace/afb-daemon/src/http-svc.c=/home/fulup/Workspace/afb-daemon/build/src#-DHAVE_AUDIO_PLUGIN=1 -DPLUGIN_INSTALL_DIR=\"/usr/local/lib64/afb\" -g3 -gdwarf-2 -fPIC -I/home/fulup/Workspace/afb-daemon/include -I/usr/include/json-c -I/usr/include/uuid -I/usr/include/alsa -o CMakeFiles/src.dir/http-svc.c.o -c /home/fulup/Workspace/afb-daemon/src/http-svc.c
+/home/fulup/Workspace/afb-daemon/src/rest-api.c=/home/fulup/Workspace/afb-daemon/build/src#-DHAVE_AUDIO_PLUGIN=1 -DPLUGIN_INSTALL_DIR=\"/usr/local/lib64/afb\" -g3 -gdwarf-2 -fPIC -I/home/fulup/Workspace/afb-daemon/include -I/usr/include/json-c -I/usr/include/uuid -I/usr/include/alsa -o CMakeFiles/src.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#-DHAVE_AUDIO_PLUGIN=1 -DPLUGIN_INSTALL_DIR=\"/usr/local/lib64/afb\" -g3 -gdwarf-2 -fPIC -I/home/fulup/Workspace/afb-daemon/include -I/usr/include/json-c -I/usr/include/uuid -I/usr/include/alsa -o CMakeFiles/src.dir/config.c.o -c /home/fulup/Workspace/afb-daemon/src/config.c
+/home/fulup/Workspace/afb-daemon/plugins/session/token-api.c=/home/fulup/Workspace/afb-daemon/build/plugins/session#-DPLUGIN_INSTALL_DIR=\"/usr/local/lib64/afb\" -Dtoken_api_EXPORTS -g3 -gdwarf-2 -fPIC -I/home/fulup/Workspace/afb-daemon/include -I/usr/include/json-c -I/usr/include/uuid -I/usr/include/alsa -o CMakeFiles/token-api.dir/token-api.c.o -c /home/fulup/Workspace/afb-daemon/plugins/session/token-api.c
+/home/fulup/Workspace/afb-daemon/plugins/audio/audio-api.c=/home/fulup/Workspace/afb-daemon/build/plugins/audio#-DPLUGIN_INSTALL_DIR=\"/usr/local/lib64/afb\" -Daudio_api_EXPORTS -g3 -gdwarf-2 -fPIC -I/home/fulup/Workspace/afb-daemon/include -I/usr/include/json-c -I/usr/include/uuid -I/usr/include/alsa -o CMakeFiles/audio-api.dir/audio-api.c.o -c /home/fulup/Workspace/afb-daemon/plugins/audio/audio-api.c
+/home/fulup/Workspace/afb-daemon/plugins/audio/audio-alsa.c=/home/fulup/Workspace/afb-daemon/build/plugins/audio#-DPLUGIN_INSTALL_DIR=\"/usr/local/lib64/afb\" -Daudio_api_EXPORTS -g3 -gdwarf-2 -fPIC -I/home/fulup/Workspace/afb-daemon/include -I/usr/include/json-c -I/usr/include/uuid -I/usr/include/alsa -o CMakeFiles/audio-api.dir/audio-alsa.c.o -c /home/fulup/Workspace/afb-daemon/plugins/audio/audio-alsa.c
+/home/fulup/Workspace/afb-daemon/plugins/samples/HelloWorld.c=/home/fulup/Workspace/afb-daemon/build/plugins/samples#-DPLUGIN_INSTALL_DIR=\"/usr/local/lib64/afb\" -DhelloWorld_api_EXPORTS -g3 -gdwarf-2 -fPIC -I/home/fulup/Workspace/afb-daemon/include -I/usr/include/json-c -I/usr/include/uuid -I/usr/include/alsa -o CMakeFiles/helloWorld-api.dir/HelloWorld.c.o -c /home/fulup/Workspace/afb-daemon/plugins/samples/HelloWorld.c
+/home/fulup/Workspace/afb-daemon/plugins/samples/SamplePost.c=/home/fulup/Workspace/afb-daemon/build/plugins/samples#-DPLUGIN_INSTALL_DIR=\"/usr/local/lib64/afb\" -DsamplePost_api_EXPORTS -g3 -gdwarf-2 -fPIC -I/home/fulup/Workspace/afb-daemon/include -I/usr/include/json-c -I/usr/include/uuid -I/usr/include/alsa -o CMakeFiles/samplePost-api.dir/SamplePost.c.o -c /home/fulup/Workspace/afb-daemon/plugins/samples/SamplePost.c
diff --git a/nbproject/private/configurations.xml b/nbproject/private/configurations.xml
index d48f5acd..9f71b586 100644
--- a/nbproject/private/configurations.xml
+++ b/nbproject/private/configurations.xml
@@ -16,6 +16,12 @@
<in>feature_tests.c</in>
</df>
<df name="plugins">
+ <df name="audio">
+ <df name="CMakeFiles">
+ <df name="audio-api.dir">
+ </df>
+ </df>
+ </df>
<df name="CMakeFiles">
<df name="plugins.dir">
<df name="audio">
@@ -26,6 +32,24 @@
</df>
</df>
</df>
+ <df name="radio">
+ <df name="CMakeFiles">
+ </df>
+ </df>
+ <df name="samples">
+ <df name="CMakeFiles">
+ <df name="helloWorld-api.dir">
+ </df>
+ <df name="samplePost-api.dir">
+ </df>
+ </df>
+ </df>
+ <df name="session">
+ <df name="CMakeFiles">
+ <df name="token-api.dir">
+ </df>
+ </df>
+ </df>
</df>
<df name="src">
<df name="CMakeFiles">
@@ -90,6 +114,12 @@
</df>
</df>
<df name="plugins">
+ <df name="audio">
+ <df name="CMakeFiles">
+ <df name="audio-api.dir">
+ </df>
+ </df>
+ </df>
<df name="CMakeFiles">
<df name="plugins.dir">
<df name="audio">
@@ -100,6 +130,24 @@
</df>
</df>
</df>
+ <df name="radio">
+ <df name="CMakeFiles">
+ </df>
+ </df>
+ <df name="samples">
+ <df name="CMakeFiles">
+ <df name="helloWorld-api.dir">
+ </df>
+ <df name="samplePost-api.dir">
+ </df>
+ </df>
+ </df>
+ <df name="session">
+ <df name="CMakeFiles">
+ <df name="token-api.dir">
+ </df>
+ </df>
+ </df>
</df>
<df name="src">
<df name="CMakeFiles">
@@ -155,8 +203,6 @@
<gdb_interceptlist>
<gdbinterceptoptions gdb_all="false" gdb_unhandled="true" gdb_unexpected="true"/>
</gdb_interceptlist>
- <gdb_signals>
- </gdb_signals>
<gdb_options>
<DebugOptions>
</DebugOptions>