diff options
| author | tqfx <[email protected]> | 2024-05-24 22:39:12 +0800 |
|---|---|---|
| committer | tqfx <[email protected]> | 2024-05-26 21:45:46 +0800 |
| commit | 1d6f7c99f8c7992e2eb7cd99bb7eb6aa309bb314 (patch) | |
| tree | 2fa78116390103b9b80e3b80adeab13b19eefd8f /core/src/lua | |
| parent | 4cdcaa4772957ab2672d2618ca11e1dcce0e71c2 (diff) | |
Fix building xmake using xmake on mingw
Diffstat (limited to 'core/src/lua')
| -rw-r--r-- | core/src/lua/xmake.lua | 2 | ||||
| -rwxr-xr-x | core/src/lua/xmake.sh | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/core/src/lua/xmake.lua b/core/src/lua/xmake.lua index 8803dd2b3..006480397 100644 --- a/core/src/lua/xmake.lua +++ b/core/src/lua/xmake.lua @@ -21,7 +21,7 @@ target("lua") -- add definitions add_defines("LUA_COMPAT_5_1", "LUA_COMPAT_5_2", "LUA_COMPAT_5_3", {public = true}) - if is_plat("windows") then + if is_plat("windows", "mingw") then -- it has been defined in luaconf.h --add_defines("LUA_USE_WINDOWS") elseif is_plat("macosx", "iphoneos") then diff --git a/core/src/lua/xmake.sh b/core/src/lua/xmake.sh index 78e05bd21..59eff5dd3 100755 --- a/core/src/lua/xmake.sh +++ b/core/src/lua/xmake.sh @@ -44,8 +44,9 @@ target "lua" # add definitions add_defines "LUA_COMPAT_5_1" "LUA_COMPAT_5_2" "LUA_COMPAT_5_3" "{public}" - if is_plat "mingw"; then - add_defines "LUA_USE_WINDOWS" + if is_plat "mingw"; then true + # it has been defined in luaconf.h + #add_defines "LUA_USE_WINDOWS" elif is_plat "macosx"; then add_defines "LUA_USE_MACOSX" else |