From 90cb917c2478031198bda197892ac40bcfaabee8 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Wed, 30 Nov 2016 07:55:32 +0100 Subject: [PATCH] =?UTF-8?q?[Horus]=C2=A0Compilation=20failed=20when=20LUA?= =?UTF-8?q?=20not=20defined?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- radio/src/lua/lua_api.h | 4 ++-- radio/src/opentx.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/radio/src/lua/lua_api.h b/radio/src/lua/lua_api.h index dba2b8f2f..622a0f868 100644 --- a/radio/src/lua/lua_api.h +++ b/radio/src/lua/lua_api.h @@ -37,7 +37,7 @@ extern bool luaLcdAllowed; void luaInit(); void luaInitThemesAndWidgets(); - +#define LUA_INIT_THEMES_AND_WIDGETS() luaInitThemesAndWidgets() #define lua_registernumber(L, n, i) (lua_pushnumber(L, (i)), lua_setglobal(L, (n))) #define lua_registerint(L, n, i) (lua_pushinteger(L, (i)), lua_setglobal(L, (n))) @@ -147,8 +147,8 @@ void luaSetInstructionsLimit(lua_State* L, int count); void luaCompileAndSave(lua_State * L, const char *bytecodeName); #else // defined(LUA) #define luaInit() +#define LUA_INIT_THEMES_AND_WIDGETS() #define LUA_LOAD_MODEL_SCRIPTS() -#define luaLoadThemes() #endif // defined(LUA) #endif // _LUA_API_H_ diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp index 90e4718fd..52fb46fca 100644 --- a/radio/src/opentx.cpp +++ b/radio/src/opentx.cpp @@ -2437,7 +2437,7 @@ void opentxInit(OPENTX_INIT_ARGS) #if defined(PCBHORUS) topbar = new Topbar(&g_model.topbarData); - luaInitThemesAndWidgets(); + LUA_INIT_THEMES_AND_WIDGETS(); #endif #if defined(RAMBACKUP)