diff options
| author |   Thierry Bultel <thierry.bultel@iot.bzh> | 2018-05-25 17:50:22 +0200 |
|---|---|---|
| committer | Thierry Bultel <thierry.bultel@iot.bzh> | 2018-05-25 17:50:22 +0200 |
| commit | 28ed131e3cac9cbd0f806e9e0c9f02eb0f92a368 (patch) | |
| tree | 2544fd1813c59b7e35f91e3402e35ebbbc7ca3b7 | |
| parent | e58ef6051020bbeb269960a308f1fa33f39097cb (diff) | |
fixed search path for config
| -rw-r--r-- | conf.d/cmake/config.cmake | 11 | ||||
| -rw-r--r-- | conf.d/project/etc/4a-softmixer-test.json (renamed from conf.d/project/etc/4a--softmixer-test.json) | 2 | ||||
| -rw-r--r-- | mixer-binding/mixer-binding.c | 5 |
3 files changed, 15 insertions, 3 deletions
diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake index 4f4e239..1cef680 100644 --- a/conf.d/cmake/config.cmake +++ b/conf.d/cmake/config.cmake @@ -131,9 +131,18 @@ list(APPEND link_libraries afb-helpers) # CACHE STRING "Compilation flags for RELEASE build type.") set(CONTROL_SUPPORT_LUA 1) -add_definitions(-DCONTROL_PLUGIN_PATH="${CMAKE_BINARY_DIR}/package/lib/plugins:${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/lib/plugins") + +IF(CMAKE_CROSSCOMPILING) +set (TARGET_BASEDIR /opt) +add_definitions(-DCONTROL_CONFIG_PATH="${TARGET_BASEDIR}/${PROJECT_NAME}/etc") +add_definitions(-DCONTROL_PLUGIN_PATH="${TARGET_BASEDIR}/${PROJECT_NAME}/lib/plugins") +add_definitions(-DCONTROL_LUA_PATH="${TARGET_BASEDIR}/${PROJECT_NAME}/var") +ELSE() 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") +ENDIF() + add_definitions(-DCTL_PLUGIN_MAGIC=987456123) add_definitions(-DUSE_API_DYN=1 -DAFB_BINDING_VERSION=dyn) diff --git a/conf.d/project/etc/4a--softmixer-test.json b/conf.d/project/etc/4a-softmixer-test.json index d646e3b..6caf228 100644 --- a/conf.d/project/etc/4a--softmixer-test.json +++ b/conf.d/project/etc/4a-softmixer-test.json @@ -10,7 +10,7 @@ { "uid": "softmixer", "info": "Map alsa-loop subdevices to 4A HAL streams", - "spath": "./plugins/alsa:../conf.d/project/lua.d", + "spath": "./lib/plugins:./var", "libs": ["alsa-softmixer.ctlso", "softmixer-simple-test.lua"], "lua": { "prefix": "smix", diff --git a/mixer-binding/mixer-binding.c b/mixer-binding/mixer-binding.c index 1d4be59..d742fad 100644 --- a/mixer-binding/mixer-binding.c +++ b/mixer-binding/mixer-binding.c @@ -115,9 +115,12 @@ PUBLIC int afbBindingVdyn(afb_dynapi *apiHandle) { AFB_ApiNotice (apiHandle, "Controller in afbBindingVdyn"); const char *dirList= getenv("CONTROL_CONFIG_PATH"); + + AFB_DEBUG("%s: env CONTROL_PLUGIN_PATH=%s\n", __func__, dirList); + if (!dirList) dirList=CONTROL_CONFIG_PATH; - const char *configPath = CtlConfigSearch(apiHandle, dirList, "4a-"); + const char *configPath = CtlConfigSearch(apiHandle, dirList, "4a"); if (!configPath) { AFB_ApiError(apiHandle, "CtlPreInit: No 4a-%s-* config found in %s ", GetBinderName(), dirList); goto OnErrorExit; |