diff options
| author |   Fulup Ar Foll <fulup@iot.bzh> | 2017-08-24 13:56:29 +0200 |
|---|---|---|
| committer | Fulup Ar Foll <fulup@iot.bzh> | 2017-08-24 13:56:29 +0200 |
| commit | 4ddac4ec016d2656f8819ca860b9a6ee9c13caa2 (patch) | |
| tree | 9e70106d230f449607b70ff168845639b9d795d3 | |
| parent | 74f18989816c648f3c992566b90361bd467f58f1 (diff) | |
Fix include issue on plugin
| -rw-r--r-- | ctl-plugin/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | nbproject/configurations.xml | 27 |
2 files changed, 24 insertions, 6 deletions
diff --git a/ctl-plugin/CMakeLists.txt b/ctl-plugin/CMakeLists.txt index 070a1d3..d89e67d 100644 --- a/ctl-plugin/CMakeLists.txt +++ b/ctl-plugin/CMakeLists.txt @@ -43,11 +43,10 @@ PROJECT_TARGET_ADD(audio-plugin-sample) # Library dependencies (include updates automatically) TARGET_LINK_LIBRARIES(${TARGET_NAME} afb-utilities - afb-controller ${link_libraries} ) - include_directories("../afb-source") + include_directories("../ctl-binding") diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml index c894fc0..a05bf8d 100644 --- a/nbproject/configurations.xml +++ b/nbproject/configurations.xml @@ -30,6 +30,9 @@ <in>feature_tests.cxx</in> </df> </df> + <df name="ctl-plugin"> + <in>ctl-plugin-sample.c</in> + </df> </df> <logicalFolder name="ExternalFiles" displayName="Important Files" @@ -74,7 +77,6 @@ <preBuild> <preBuildCommandWorkingDir>build</preBuildCommandWorkingDir> <preBuildCommand>cmake ..</preBuildCommand> - <preBuildFirst>true</preBuildFirst> </preBuild> </makefileType> <item path="afb-source/ctl-binding.c" ex="false" tool="0" flavor2="3"> @@ -88,7 +90,7 @@ <pElem>build/afb-source</pElem> </incDir> <preprocessorList> - <Elem>CONTROL_CONFIG_PATH="/home/fulup/Workspace/AGL-AppFW/afb-controller/conf.d/project/json.d:/home/fulup/opt/Controller-binding/json.d"</Elem> + <Elem>CONTROL_CONFIG_PATH="/home/fulup/Workspace/AGL-AppFW/afb-controller/conf.d/project/json.d:/home/fulup/opt/afb-controller/json.d"</Elem> <Elem>CONTROL_CONFIG_POST="control"</Elem> <Elem>CONTROL_CONFIG_PRE="onload"</Elem> <Elem>CONTROL_DOSCRIPT_PRE="doscript"</Elem> @@ -96,10 +98,11 @@ <Elem>CONTROL_LUA_PATH="/home/fulup/Workspace/AGL-AppFW/afb-controller/conf.d/project/lua.d:/home/fulup/opt/controller-plugins/ctl-lua.d"</Elem> <Elem>CONTROL_MAXPATH_LEN=255</Elem> <Elem>CONTROL_ONLOAD_PROFILE="onload-default"</Elem> - <Elem>CONTROL_PLUGIN_PATH="/home/fulup/Workspace/AGL-AppFW/afb-controller/build:/home/fulup/opt/Controller-binding/lib/controller-plugins:/usr/lib/afb/controller-plugins/ctlplug"</Elem> + <Elem>CONTROL_PLUGIN_PATH="/home/fulup/Workspace/AGL-AppFW/afb-controller/build:/home/fulup/opt/afb-controller/lib/controller-plugins:/usr/lib/afb/controller-plugins/ctlplug"</Elem> <Elem>CONTROL_SUPPORT_LUA</Elem> <Elem>CTL_PLUGIN_MAGIC=2468013579</Elem> - <Elem>control_afb_EXPORTS</Elem> + <Elem>NATIVE_LINUX</Elem> + <Elem>controller_EXPORTS</Elem> </preprocessorList> </cTool> </item> @@ -204,6 +207,10 @@ </item> <item path="build/CMakeFiles/feature_tests.cxx" ex="false" tool="1" flavor2="4"> </item> + <item path="ctl-plugin/ctl-plugin-sample.c" ex="false" tool="0" flavor2="3"> + <cTool flags="1"> + </cTool> + </item> <folder path="0/build"> <cTool> <incDir> @@ -211,6 +218,18 @@ </incDir> </cTool> </folder> + <folder path="0/ctl-plugin"> + <cTool> + <incDir> + <pElem>../../../opt/include/afb</pElem> + <pElem>ctl-plugin</pElem> + <pElem>/usr/include/json-c</pElem> + <pElem>/usr/include/lua5.3</pElem> + <pElem>afb-source</pElem> + <pElem>build/ctl-plugin</pElem> + </incDir> + </cTool> + </folder> </conf> </confs> </configurationDescriptor> |