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

Fix lua build [ci build]

This commit is contained in:
halx99 2021-05-24 19:18:15 +08:00
parent c49a4ea632
commit adce3298de
5 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/Modules/CocosBuildHelpers.cmake
View File

@ -50,7 +50,7 @@ function(cocos_copy_lua_scripts cocos_target src_dir dst_dir)
if(MSVC)
add_custom_command(TARGET ${luacompile_target} POST_BUILD
COMMAND ${PYTHON_COMMAND} ARGS ${ADXE_ROOT_PATH}/cmake/scripts/sync_folder.py
-s ${src_dir} -d ${dst_dir} -l ${LUAJIT32_COMMAND} -m $<CONFIG>
-s ${src_dir} -d ${dst_dir} -m $<CONFIG>
)
else()
if("${CMAKE_BUILD_TYPE}" STREQUAL "")
@ -61,9 +61,7 @@ function(cocos_copy_lua_scripts cocos_target src_dir dst_dir)
else()
add_custom_command(TARGET ${luacompile_target} POST_BUILD
COMMAND ${PYTHON_COMMAND} ARGS ${ADXE_ROOT_PATH}/cmake/scripts/sync_folder.py
-s ${src_dir} -d ${dst_dir} -l ${LUAJIT32_COMMAND} -m ${CMAKE_BUILD_TYPE}
COMMAND ${PYTHON_COMMAND} ARGS ${ADXE_ROOT_PATH}/cmake/scripts/sync_folder.py
-s ${src_dir} -d ${dst_dir}/64bit -l ${LUAJIT64_COMMAND} -m ${CMAKE_BUILD_TYPE}
-s ${src_dir} -d ${dst_dir} -m ${CMAKE_BUILD_TYPE}
)
endif()
endif()

4
cocos/CMakeLists.txt
View File

@ -25,8 +25,8 @@
# ****************************************************************************/
# this CMakeLists is to generate Cocos2d-x Engine Library
# build libcocos2d
# build luacocos2d if BUILD_LUA_LIBS=ON
# build adxe
# build adxelua if BUILD_LUA_LIBS=ON
# The version number
set(ADXE_VERSION 1.0)

2
templates/lua-template-default/CMakeLists.txt
View File

@ -126,7 +126,7 @@ else()
config_android_shared_libs("org.cocos2dx.lib" "${CMAKE_CURRENT_SOURCE_DIR}/frameworks/runtime-src/proj.android/app/src")
endif()
target_link_libraries(${APP_NAME} luacocos2d)
target_link_libraries(${APP_NAME} ${ADXE_LUA_LIB})
target_include_directories(${APP_NAME} PRIVATE ${RUNTIME_SRC_ROOT}/Classes)
# mark app resources, resource will be copy auto after mark

2
tests/lua-empty-test/project/CMakeLists.txt
View File

@ -101,7 +101,7 @@ else()
config_android_shared_libs("org.cocos2dx.lib" "${CMAKE_CURRENT_SOURCE_DIR}/proj.android/app/src")
endif()
target_link_libraries(${APP_NAME} luacocos2d)
target_link_libraries(${APP_NAME} ${ADXE_LUA_LIB})
target_include_directories(${APP_NAME} PRIVATE Classes)
# mark app resources

2
tests/lua-tests/project/CMakeLists.txt
View File

@ -114,7 +114,7 @@ else()
config_android_shared_libs("org.cocos2dx.lib" "${CMAKE_CURRENT_SOURCE_DIR}/proj.android/app/src")
endif()
target_link_libraries(${APP_NAME} luacocos2d)
target_link_libraries(${APP_NAME} ${ADXE_LUA_LIB})
target_include_directories(${APP_NAME} PRIVATE Classes)
# mark app resources