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

Fix #522

This commit is contained in:
halx99 2021-10-12 13:16:27 +08:00
parent b99a445519
commit 846231e2f1
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmake/Modules/CocosBuildHelpers.cmake
View File

@ -215,7 +215,6 @@ function(cocos_copy_target_dll cocos_target)
add_custom_command(TARGET ${cocos_target} POST_BUILD add_custom_command(TARGET ${cocos_target} POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different COMMAND ${CMAKE_COMMAND} -E copy_if_different
"${CMAKE_BINARY_DIR}/bin/\$\(Configuration\)/OpenAL32.dll" "${CMAKE_BINARY_DIR}/bin/\$\(Configuration\)/OpenAL32.dll"
"${CMAKE_BINARY_DIR}/bin/\$\(Configuration\)/plainlua.dll"
$<TARGET_FILE_DIR:${cocos_target}>) $<TARGET_FILE_DIR:${cocos_target}>)
# Copy windows angle binaries # Copy windows angle binaries
@ -228,6 +227,13 @@ function(cocos_copy_target_dll cocos_target)
) )
endfunction() endfunction()
function(cocos_copy_lua_dlls cocos_target)
add_custom_command(TARGET ${cocos_target} POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different
"${CMAKE_BINARY_DIR}/bin/\$\(Configuration\)/plainlua.dll"
$<TARGET_FILE_DIR:${cocos_target}>)
endfunction()
# mark `FILES` as resources, files will be put into sub-dir tree depend on its absolute path # mark `FILES` as resources, files will be put into sub-dir tree depend on its absolute path
function(cocos_mark_resources) function(cocos_mark_resources)
set(oneValueArgs BASEDIR RESOURCEBASE) set(oneValueArgs BASEDIR RESOURCEBASE)

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

@ -161,6 +161,7 @@ if(APPLE)
endif() endif()
elseif(WINDOWS) elseif(WINDOWS)
cocos_copy_target_dll(${APP_NAME}) cocos_copy_target_dll(${APP_NAME})
cocos_copy_lua_dlls(${APP_NAME})
endif() endif()
# copy resource on linux or WINDOWS # copy resource on linux or WINDOWS
if(WINDOWS) if(WINDOWS)

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

@ -146,6 +146,7 @@ if(APPLE)
#set_xcode_property(${APP_NAME} DEVELOPMENT_TEAM "GRLXXXX2K9") #set_xcode_property(${APP_NAME} DEVELOPMENT_TEAM "GRLXXXX2K9")
elseif(WINDOWS) elseif(WINDOWS)
cocos_copy_target_dll(${APP_NAME}) cocos_copy_target_dll(${APP_NAME})
cocos_copy_lua_dlls(${APP_NAME})
endif() endif()
if(WINDOWS) if(WINDOWS)