Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge: 91bfb7c8ff a5cf017e0f 

Merge pull request #330 from c4games/lua54-compat

Lua 5.4 compatible
This commit is contained in:
halx99 2021-03-13 18:46:13 +08:00 committed by GitHub
parent d7610b8c77
commit b8892e446b
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/CMakeLists.txt
View File

@ -151,7 +151,7 @@ set_target_properties(${ENGINEX_CORE_LIB}
PROPERTIES PROPERTIES
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin" RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
VERSION "${ENGINEX_VERSION}" VERSION "${ENGINEX_VERSION}"
FOLDER "Internal" FOLDER "Internal"
) )

2
extensions/CMakeLists.txt
View File

@ -48,7 +48,7 @@ function(setup_cocos_extension_config target_name)
PROPERTIES PROPERTIES
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin" RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
FOLDER "Extensions" FOLDER "Extensions"
) )

6
extensions/scripting/lua-bindings/script/init.lua
View File

@ -22,6 +22,12 @@ THE SOFTWARE.
]] ]]
if (math.pow == nil) then
math.pow = function (x,y)
return x ^ y
end
end
require "cocos.cocos2d.Cocos2d" require "cocos.cocos2d.Cocos2d"
require "cocos.cocos2d.Cocos2dConstants" require "cocos.cocos2d.Cocos2dConstants"
require "cocos.cocos2d.functions" require "cocos.cocos2d.functions"