From 33c9353cce432422fea4ba61ab17b20dd8cfe800 Mon Sep 17 00:00:00 2001 From: Fulup Ar Foll Date: Mon, 21 Dec 2015 13:22:28 +0100 Subject: [PATCH] Fix HelloWorld --- .gitignore | 2 +- nbproject/configurations.xml | 28 +++++++++++++++++--- nbproject/private/Default.properties | 20 +++++++-------- nbproject/private/configurations.xml | 50 ++++++++++++++++++++++++++++++++++-- 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 @@ - build/plugins + build/plugins/audio + + PLUGIN_INSTALL_DIR="/usr/local/lib64/afb" + audio_api_EXPORTS + @@ -115,15 +119,22 @@ - build/plugins + build/plugins/samples + + PLUGIN_INSTALL_DIR="/usr/local/lib64/afb" + - build/plugins + build/plugins/session + + PLUGIN_INSTALL_DIR="/usr/local/lib64/afb" + token_api_EXPORTS + @@ -144,10 +155,16 @@ + + helloWorld_api_EXPORTS + + + samplePost_api_EXPORTS + @@ -193,6 +210,7 @@ HAVE_AUDIO_PLUGIN=1 + PLUGIN_INSTALL_DIR="/usr/local/lib64/afb" @@ -221,6 +239,7 @@ HAVE_AUDIO_PLUGIN=1 + PLUGIN_INSTALL_DIR="/usr/local/lib64/afb" @@ -235,6 +254,7 @@ HAVE_AUDIO_PLUGIN=1 + PLUGIN_INSTALL_DIR="/usr/local/lib64/afb" @@ -267,6 +287,7 @@ HAVE_AUDIO_PLUGIN=1 + PLUGIN_INSTALL_DIR="/usr/local/lib64/afb" @@ -281,6 +302,7 @@ HAVE_AUDIO_PLUGIN=1 + PLUGIN_INSTALL_DIR="/usr/local/lib64/afb" 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 @@ feature_tests.c + + + + + + @@ -26,6 +32,24 @@ + + + + + + + + + + + + + + + + + + @@ -90,6 +114,12 @@ + + + + + + @@ -100,6 +130,24 @@ + + + + + + + + + + + + + + + + + + @@ -155,8 +203,6 @@ - - -- 2.16.6