diff options
| author |   Romain Forlot <romain.forlot@iot.bzh> | 2017-10-05 01:38:18 +0200 |
|---|---|---|
| committer | Romain Forlot <romain.forlot@iot.bzh> | 2017-12-14 11:00:25 +0100 |
| commit | 8df3e437f941912067231250ff5695b8a3a7fd92 (patch) | |
| tree | c812fb252ad0f8a48041aff28b7fc60a75f245d1 /controller | |
| parent | 8364673ab93eb484e25c7c4776e5d705b73330b4 (diff) | |
LUA lib and bin embedded in project
Change-Id: I1a61b49f55e4daa305800e754a14b6041aa81b34
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'controller')
| -rw-r--r-- | controller/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | controller/ctl-plugin.c | 1 | ||||
| -rw-r--r-- | controller/ctl-plugin.h | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/controller/CMakeLists.txt b/controller/CMakeLists.txt index 6b4662e..5269bcc 100644 --- a/controller/CMakeLists.txt +++ b/controller/CMakeLists.txt @@ -15,6 +15,7 @@ # See the License for the specific language governing permissions and # limitations under the License. ########################################################################### + # Include LUA only when requested get_property(COMPDEF DIRECTORY PROPERTY COMPILE_DEFINITIONS) if("CONTROL_SUPPORT_LUA=1" IN_LIST COMPDEF) @@ -33,7 +34,7 @@ PROJECT_TARGET_ADD(afb-controller) # Library dependencies (include updates automatically) TARGET_LINK_LIBRARIES(${TARGET_NAME} - afb-utilities + ${link_libraries} ) # Define target includes for this target client diff --git a/controller/ctl-plugin.c b/controller/ctl-plugin.c index 6c73573..9a34a29 100644 --- a/controller/ctl-plugin.c +++ b/controller/ctl-plugin.c @@ -84,7 +84,6 @@ STATIC int PluginLoadOne (CtlPluginT *ctlPlugin, json_object *pluginJ, void* han char *ldSearchPath = NULL; void *dlHandle; - // plugin initialises at 1st load further init actions should be place into onload section if (!pluginJ) return 0; diff --git a/controller/ctl-plugin.h b/controller/ctl-plugin.h index 361fd34..4b8bd26 100644 --- a/controller/ctl-plugin.h +++ b/controller/ctl-plugin.h @@ -46,8 +46,8 @@ extern "C" { typedef struct luaL_Reg luaL_Reg; typedef struct { - char *label; - char *info; + const char *label; + const char *info; afb_req request; void *context; } CtlSourceT; |