From ecccadcd8a402df92d78d732e447e49f34608677 Mon Sep 17 00:00:00 2001 From: Syping Date: Thu, 2 Jul 2020 16:20:10 +0200 Subject: [PATCH] CONFIG+=LUAENGINE_LUA53 for using Lua 5.3 --- src/luaenginecore/lua.pri | 6 +++++- src/luaenginecore/lua53.pri | 2 -- src/luaenginecore/lua53_module.pri | 3 +++ src/luaenginecore/lua54_module.pri | 3 +++ src/luaenginecore/lua_module.pri | 6 +++++- 5 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/luaenginecore/lua.pri b/src/luaenginecore/lua.pri index ae875dd..834f9e8 100644 --- a/src/luaenginecore/lua.pri +++ b/src/luaenginecore/lua.pri @@ -15,4 +15,8 @@ #* limitations under the License. #*****************************************************************************/ -include($$PWD/lua54.pri) +CONFIG(LUAENGINE_LUA53) { + include($$PWD/lua53.pri) +} else { + include($$PWD/lua54.pri) +} diff --git a/src/luaenginecore/lua53.pri b/src/luaenginecore/lua53.pri index 80159ff..b0fb9ef 100644 --- a/src/luaenginecore/lua53.pri +++ b/src/luaenginecore/lua53.pri @@ -15,8 +15,6 @@ #* limitations under the License. #*****************************************************************************/ -DEFINES += LUA_COMPAT_5_2 -DEFINES += LUAENGINE_LUA_53 shared: win32: DEFINES += LUA_BUILD_AS_DLL linux: DEFINES += LUA_USE_LINUX gcc: QMAKE_CFLAGS += -Wno-cast-function-type diff --git a/src/luaenginecore/lua53_module.pri b/src/luaenginecore/lua53_module.pri index 5970e85..28728e1 100644 --- a/src/luaenginecore/lua53_module.pri +++ b/src/luaenginecore/lua53_module.pri @@ -15,6 +15,9 @@ #* limitations under the License. #*****************************************************************************/ +DEFINES += LUA_COMPAT_5_2 +DEFINES += LUAENGINE_LUA_53 + INCLUDEPATH += \ $$PWD/lua53_module diff --git a/src/luaenginecore/lua54_module.pri b/src/luaenginecore/lua54_module.pri index bfba411..edf4065 100644 --- a/src/luaenginecore/lua54_module.pri +++ b/src/luaenginecore/lua54_module.pri @@ -15,6 +15,9 @@ #* limitations under the License. #*****************************************************************************/ +DEFINES += LUA_COMPAT_5_2 +DEFINES += LUAENGINE_LUA_54 + INCLUDEPATH += \ $$PWD/lua54_module diff --git a/src/luaenginecore/lua_module.pri b/src/luaenginecore/lua_module.pri index d074479..fc0ffb5 100644 --- a/src/luaenginecore/lua_module.pri +++ b/src/luaenginecore/lua_module.pri @@ -15,4 +15,8 @@ #* limitations under the License. #*****************************************************************************/ -include($$PWD/lua54_module.pri) +CONFIG(LUAENGINE_LUA53) { + include($$PWD/lua53_module.pri) +} else { + include($$PWD/lua54_module.pri) +}