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

fix linux prebuilt support 

now lua-template can also use this feature
This commit is contained in:
AsakuraMizu 2022-11-17 23:20:26 +08:00
parent 0f32899747
commit ff8e10f280
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cmake/Modules/AXLinkHelpers.cmake
View File

@ -84,7 +84,7 @@ function(ax_link_cxx_prebuilt APP_NAME AX_ROOT_DIR AX_PREBUILT_DIR)
if (WINDOWS) if (WINDOWS)
target_link_libraries(${APP_NAME} winmm Version) target_link_libraries(${APP_NAME} winmm Version)
else() else()
target_link_libraries(${APP_NAME} X11 fontconfig) target_link_libraries(${APP_NAME} X11 fontconfig glib-2.0 gtk-3 gobject-2.0)
endif() endif()
# Linking engine and thirdparty libs # Linking engine and thirdparty libs
@ -131,9 +131,9 @@ function(ax_link_cxx_prebuilt APP_NAME AX_ROOT_DIR AX_PREBUILT_DIR)
${LIBS} ${LIBS}
z z
jpeg jpeg
crypto
ssl
curl curl
ssl
crypto
openal openal
) )
endif() endif()
@ -183,14 +183,15 @@ function(ax_link_cxx_prebuilt APP_NAME AX_ROOT_DIR AX_PREBUILT_DIR)
endfunction(ax_link_cxx_prebuilt) endfunction(ax_link_cxx_prebuilt)
function(ax_link_lua_prebuilt APP_NAME AX_ROOT_DIR AX_PREBUILT_DIR) function(ax_link_lua_prebuilt APP_NAME AX_ROOT_DIR AX_PREBUILT_DIR)
ax_link_cxx_prebuilt(${APP_NAME} ${AX_ROOT_DIR} ${AX_PREBUILT_DIR})
if (NOT AX_USE_SHARED_PREBUILT) if (NOT AX_USE_SHARED_PREBUILT)
target_compile_definitions(${APP_NAME} target_compile_definitions(${APP_NAME}
PRIVATE _USRLUASTATIC=1 PRIVATE _USRLUASTATIC=1
) )
endif() endif()
target_link_libraries(${APP_NAME} axlua lua-cjson tolua plainlua) target_link_libraries(${APP_NAME} axlua lua-cjson tolua plainlua)
ax_link_cxx_prebuilt(${APP_NAME} ${AX_ROOT_DIR} ${AX_PREBUILT_DIR})
if (WINDOWS) if (WINDOWS)
add_custom_command(TARGET ${APP_NAME} POST_BUILD add_custom_command(TARGET ${APP_NAME} POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different COMMAND ${CMAKE_COMMAND} -E copy_if_different