Merge pull request #520 from adxeproject/lua-5.4

Use lua-5.4.3 as default plainlua version

Author: halx99

extensions/scripting/lua-bindings/script/framework/package_support.lua

@@ -23,6 +23,7 @@ THE SOFTWARE.
 ]]
 
 -- Cocos2d-Lua core functions
+local unpack = table.unpack
 cc.loaded_packages = {}
 local loaded_packages = cc.loaded_packages
 

extensions/scripting/lua-bindings/script/framework/transition.lua

@@ -22,6 +22,7 @@ THE SOFTWARE.
 
 ]]
 
+local unpack = table.unpack
 local transition = {}
 
 local ACTION_EASING = {}

extensions/scripting/lua-bindings/script/init.lua

@@ -22,13 +22,18 @@ THE SOFTWARE.
 
 ]]
 
--- lua-5.4
+-- >= lua-5.4
 if (math.pow == nil) then
     math.pow = function (x,y)
         return x ^ y
     end
 end
 
+-- < lua-5.4
+if (unpack) then
+    table.unpack = unpack
+end
+
 require "cocos.cocos2d.Cocos2d"
 require "cocos.cocos2d.Cocos2dConstants"
 require "cocos.cocos2d.functions"

extensions/scripting/lua-bindings/script/network/DeprecatedNetworkFunc.lua

@@ -1,3 +1,5 @@
+local unpack = table.unpack
+
 if nil == cc.XMLHttpRequest then
     return
 end

thirdparty/CMakeLists.txt

@@ -54,7 +54,7 @@ endif()
 
 if(LUA_ENGINE STREQUAL "plainlua")
     if(NOT DEFINED LUA_VERSION)
-        set(LUA_VERSION "5.3.6" CACHE INTERNAL "The plainlua version")
+        set(LUA_VERSION "5.4.3" CACHE INTERNAL "The plainlua version")
     endif()
     message(STATUS "Using plainlua: ${LUA_VERSION}")
 elseif(LUA_ENGINE STREQUAL "luajit")

thirdparty/README.md

@@ -97,7 +97,7 @@
 ## lua
 - plainlua
   - Upstream: http://www.lua.org/
-  - Version: 5.3.6 with modified for bytecode 32/64bit compatible
+  - Version: 5.4.3
   - License: MIT (http://www.lua.org/license.html)
 
 - sol2