diff options
| -rw-r--r-- | conf.d/cmake/config.cmake | 16 | ||||
| -rw-r--r-- | nbproject/configurations.xml | 30 |
2 files changed, 20 insertions, 26 deletions
diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake index 52ab7bb..aa32646 100644 --- a/conf.d/cmake/config.cmake +++ b/conf.d/cmake/config.cmake @@ -18,14 +18,14 @@ # Project Info # ------------------ -set(PROJECT_NAME 4a-hal) -set(PROJECT_PRETTY_NAME "4A-HAL") -set(PROJECT_DESCRIPTION "Hardware Abastraction Layer for AGL Audio Advanced Architecture") +set(PROJECT_NAME 4a-hal-unicens) +set(PROJECT_PRETTY_NAME "4A-HAL-UNICENS") +set(PROJECT_DESCRIPTION "Hardware Abastraction Layer for UNICENS/MLD") set(PROJECT_VERSION "0.9") -set(PROJECT_URL "https://github.com/iotbzh/4a-hal-generic") +set(PROJECT_URL "https://github.com/tjahnk/4a-hal-unicens") set(PROJECT_ICON "icon.png") -set(PROJECT_AUTHOR "Jonathan Aillet") -set(PROJECT_AUTHOR_MAIL "jonathan.aillet@iot.bzh") +set(PROJECT_AUTHOR "Jonathan Aillet, Tobias Jahnke") +set(PROJECT_AUTHOR_MAIL "jonathan.aillet@iot.bzh, tobias.jahnke@microchip.com") set(PROJECT_LICENSE "APL2.0") set(PROJECT_LANGUAGES "C") @@ -132,7 +132,7 @@ set(CONTROL_SUPPORT_LUA 1 CACHE BOOL "Active or not LUA Support") add_definitions(-DCTL_PLUGIN_MAGIC=7053042648) add_definitions(-DCONTROL_CONFIG_PATH="${CMAKE_SOURCE_DIR}/conf.d/project/etc:${CMAKE_BINARY_DIR}/package/etc:${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/etc") add_definitions(-DCONTROL_PLUGIN_PATH="${CMAKE_BINARY_DIR}/package/lib/plugins:${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/lib/plugins") -add_definitions(-DCONTROL_LUA_PATH="${CMAKE_SOURCE_DIR}/conf.d/project/lua.d:${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/var") +#add_definitions(-DCONTROL_LUA_PATH="${CMAKE_SOURCE_DIR}/conf.d/project/lua.d:${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/var") add_definitions(-DAFB_BINDING_VERSION=3 -DAFB_BINDING_WANT_DYNAPI=1) # (BUG!!!) as PKG_CONFIG_PATH does not work [should be an env variable] @@ -167,7 +167,7 @@ set(WIDGET_TYPE application/vnd.agl.service) # This is the file that will be executed, loaded, # at launch time by the application framework. # -set(WIDGET_ENTRY_POINT lib/afb-4a-hal.so) +#set(WIDGET_ENTRY_POINT lib/afb-4a-hal.so) # Optional dependencies order # --------------------------- diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml index 5578966..c5ab4c7 100644 --- a/nbproject/configurations.xml +++ b/nbproject/configurations.xml @@ -92,9 +92,8 @@ <preprocessorList> <Elem>AFB_BINDING_VERSION=3</Elem> <Elem>AFB_BINDING_WANT_DYNAPI=1</Elem> - <Elem>CONTROL_CONFIG_PATH="/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/conf.d/project/etc:/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/build/package/etc:/usr/local/4a-hal/etc"</Elem> - <Elem>CONTROL_LUA_PATH="/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/conf.d/project/lua.d:/usr/local/4a-hal/var"</Elem> - <Elem>CONTROL_PLUGIN_PATH="/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/build/package/lib/plugins:/usr/local/4a-hal/lib/plugins"</Elem> + <Elem>CONTROL_CONFIG_PATH="/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/conf.d/project/etc:/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/build/package/etc:/usr/local/4a-hal-unicens/etc"</Elem> + <Elem>CONTROL_PLUGIN_PATH="/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/build/package/lib/plugins:/usr/local/4a-hal-unicens/lib/plugins"</Elem> <Elem>CTL_PLUGIN_MAGIC=7053042648</Elem> <Elem>NDEBUG</Elem> <Elem>SUSE_LUA_INCDIR</Elem> @@ -117,9 +116,8 @@ <preprocessorList> <Elem>AFB_BINDING_VERSION=3</Elem> <Elem>AFB_BINDING_WANT_DYNAPI=1</Elem> - <Elem>CONTROL_CONFIG_PATH="/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/conf.d/project/etc:/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/build/package/etc:/usr/local/4a-hal/etc"</Elem> - <Elem>CONTROL_LUA_PATH="/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/conf.d/project/lua.d:/usr/local/4a-hal/var"</Elem> - <Elem>CONTROL_PLUGIN_PATH="/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/build/package/lib/plugins:/usr/local/4a-hal/lib/plugins"</Elem> + <Elem>CONTROL_CONFIG_PATH="/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/conf.d/project/etc:/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/build/package/etc:/usr/local/4a-hal-unicens/etc"</Elem> + <Elem>CONTROL_PLUGIN_PATH="/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/build/package/lib/plugins:/usr/local/4a-hal-unicens/lib/plugins"</Elem> <Elem>CTL_PLUGIN_MAGIC=7053042648</Elem> <Elem>NDEBUG</Elem> <Elem>SUSE_LUA_INCDIR</Elem> @@ -149,9 +147,8 @@ <preprocessorList> <Elem>AFB_BINDING_VERSION=3</Elem> <Elem>AFB_BINDING_WANT_DYNAPI=1</Elem> - <Elem>CONTROL_CONFIG_PATH="/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/conf.d/project/etc:/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/build/package/etc:/usr/local/4a-hal/etc"</Elem> - <Elem>CONTROL_LUA_PATH="/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/conf.d/project/lua.d:/usr/local/4a-hal/var"</Elem> - <Elem>CONTROL_PLUGIN_PATH="/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/build/package/lib/plugins:/usr/local/4a-hal/lib/plugins"</Elem> + <Elem>CONTROL_CONFIG_PATH="/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/conf.d/project/etc:/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/build/package/etc:/usr/local/4a-hal-unicens/etc"</Elem> + <Elem>CONTROL_PLUGIN_PATH="/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/build/package/lib/plugins:/usr/local/4a-hal-unicens/lib/plugins"</Elem> <Elem>CTL_PLUGIN_MAGIC=7053042648</Elem> <Elem>NDEBUG</Elem> <Elem>SUSE_LUA_INCDIR</Elem> @@ -229,9 +226,8 @@ <preprocessorList> <Elem>AFB_BINDING_VERSION=3</Elem> <Elem>AFB_BINDING_WANT_DYNAPI=1</Elem> - <Elem>CONTROL_CONFIG_PATH="/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/conf.d/project/etc:/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/build/package/etc:/usr/local/4a-hal/etc"</Elem> - <Elem>CONTROL_LUA_PATH="/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/conf.d/project/lua.d:/usr/local/4a-hal/var"</Elem> - <Elem>CONTROL_PLUGIN_PATH="/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/build/package/lib/plugins:/usr/local/4a-hal/lib/plugins"</Elem> + <Elem>CONTROL_CONFIG_PATH="/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/conf.d/project/etc:/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/build/package/etc:/usr/local/4a-hal-unicens/etc"</Elem> + <Elem>CONTROL_PLUGIN_PATH="/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/build/package/lib/plugins:/usr/local/4a-hal-unicens/lib/plugins"</Elem> <Elem>CONTROL_SUPPORT_LUA</Elem> <Elem>CTL_PLUGIN_MAGIC=7053042648</Elem> <Elem>NDEBUG</Elem> @@ -257,9 +253,8 @@ <preprocessorList> <Elem>AFB_BINDING_VERSION=3</Elem> <Elem>AFB_BINDING_WANT_DYNAPI=1</Elem> - <Elem>CONTROL_CONFIG_PATH="/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/conf.d/project/etc:/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/build/package/etc:/usr/local/4a-hal/etc"</Elem> - <Elem>CONTROL_LUA_PATH="/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/conf.d/project/lua.d:/usr/local/4a-hal/var"</Elem> - <Elem>CONTROL_PLUGIN_PATH="/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/build/package/lib/plugins:/usr/local/4a-hal/lib/plugins"</Elem> + <Elem>CONTROL_CONFIG_PATH="/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/conf.d/project/etc:/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/build/package/etc:/usr/local/4a-hal-unicens/etc"</Elem> + <Elem>CONTROL_PLUGIN_PATH="/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/build/package/lib/plugins:/usr/local/4a-hal-unicens/lib/plugins"</Elem> <Elem>CTL_PLUGIN_MAGIC=7053042648</Elem> <Elem>NDEBUG</Elem> <Elem>SUSE_LUA_INCDIR</Elem> @@ -281,9 +276,8 @@ <preprocessorList> <Elem>AFB_BINDING_VERSION=3</Elem> <Elem>AFB_BINDING_WANT_DYNAPI=1</Elem> - <Elem>CONTROL_CONFIG_PATH="/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/conf.d/project/etc:/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/build/package/etc:/usr/local/4a-hal/etc"</Elem> - <Elem>CONTROL_LUA_PATH="/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/conf.d/project/lua.d:/usr/local/4a-hal/var"</Elem> - <Elem>CONTROL_PLUGIN_PATH="/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/build/package/lib/plugins:/usr/local/4a-hal/lib/plugins"</Elem> + <Elem>CONTROL_CONFIG_PATH="/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/conf.d/project/etc:/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/build/package/etc:/usr/local/4a-hal-unicens/etc"</Elem> + <Elem>CONTROL_PLUGIN_PATH="/home/M21106/Development/agl/git/4a-hal-integration/4a-hal-unicens/build/package/lib/plugins:/usr/local/4a-hal-unicens/lib/plugins"</Elem> <Elem>CTL_PLUGIN_MAGIC=7053042648</Elem> <Elem>NDEBUG</Elem> <Elem>SUSE_LUA_INCDIR</Elem> |