diff options
| m--------- | afb-helpers | 0 | ||||
| m--------- | app-controller | 0 | ||||
| m--------- | conf.d/app-templates | 0 | ||||
| -rw-r--r-- | conf.d/cmake/config.cmake | 12 | ||||
| -rw-r--r-- | src/xds-binding.c | 4 |
5 files changed, 8 insertions, 8 deletions
diff --git a/afb-helpers b/afb-helpers -Subproject 9a1f7ea8029ff518d81ed7f13000a7c0bddcca5 +Subproject 52f04783535948f2782780992710276f3419e56 diff --git a/app-controller b/app-controller -Subproject 78cdd6c4096744ffb0f3168475bf1df5992c68f +Subproject 440be0984f16562fdf321c770d65787ecea0e36 diff --git a/conf.d/app-templates b/conf.d/app-templates -Subproject 66f7bc88bfc7a17e1ef277c4f7293f95f6ec8b6 +Subproject 332f377e84a673cdcfe52ce71c932f39c4b4802 diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake index 3c17187..536841b 100644 --- a/conf.d/cmake/config.cmake +++ b/conf.d/cmake/config.cmake @@ -77,7 +77,7 @@ set (PKG_REQUIRED_LIST # Prefix path where will be installed the files # Default: /usr/local (need root permission to write in) # ------------------------------------------------------ -set(CMAKE_INSTALL_PREFIX $ENV{HOME}/opt) +set(INSTALL_PREFIX $ENV{HOME}/opt) # Customize link option # ----------------------------- @@ -126,15 +126,15 @@ set(CMAKE_INSTALL_PREFIX $ENV{HOME}/opt) # 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_BINARY_DIR}/package/var:${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/lib/plugins") -add_definitions(-DCONTROL_CONFIG_PATH="${CMAKE_BINARY_DIR}/package/etc:${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/etc") +add_definitions(-DCONTROL_PLUGIN_PATH="${CMAKE_BINARY_DIR}/package/lib/plugins:${CMAKE_BINARY_DIR}/package/var:${INSTALL_PREFIX}/${PROJECT_NAME}/lib/plugins") +add_definitions(-DCONTROL_CONFIG_PATH="${CMAKE_BINARY_DIR}/package/etc:${INSTALL_PREFIX}/${PROJECT_NAME}/etc") add_definitions(-DCTL_PLUGIN_MAGIC=1286576532) -add_definitions(-DUSE_API_DYN=1) +add_definitions(-DUSE_API_DYN=1 -DAFB_BINDING_VERSION=3 -DAFB_BINDING_WANT_DYNAPI) # (BUG!!!) as PKG_CONFIG_PATH does not work [should be an env variable] # --------------------------------------------------------------------- -set(CMAKE_PREFIX_PATH ${CMAKE_INSTALL_PREFIX}/lib64/pkgconfig ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig) -set(LD_LIBRARY_PATH ${CMAKE_INSTALL_PREFIX}/lib64 ${CMAKE_INSTALL_PREFIX}/lib) +set(CMAKE_PREFIX_PATH ${INSTALL_PREFIX}/lib64/pkgconfig ${INSTALL_PREFIX}/lib/pkgconfig) +set(LD_LIBRARY_PATH ${INSTALL_PREFIX}/lib64 ${INSTALL_PREFIX}/lib) # Optional location for config.xml.in # ----------------------------------- diff --git a/src/xds-binding.c b/src/xds-binding.c index 3d9839b..c4193b0 100644 --- a/src/xds-binding.c +++ b/src/xds-binding.c @@ -125,11 +125,11 @@ static int CtrlLoadOneApi(void* cbdata, AFB_ApiT apiHandle) return err; } -int afbBindingVdyn(afb_dynapi* apiHandle) +int afbBindingEntry(afb_dynapi* apiHandle) { AFB_default = apiHandle; - AFB_ApiNotice(apiHandle, "Controller in afbBindingVdyn"); + AFB_ApiNotice(apiHandle, "Controller in afbBindingEntry"); const char* dirList = getenv("CONTROL_CONFIG_PATH"); if (!dirList) |