Skip to content

Commit 8f018cd

Browse files
authored
Move AXGameFinalSetup.cmake to cpp and lua templates because of differences in code (#2557)
* Move AXGameFinalSetup.cmake to cpp and lua templates since there are different code sections * Add default _AX_USE_PREBUILT as FALSE
1 parent 30955ec commit 8f018cd

File tree

3 files changed

+25
-0
lines changed

3 files changed

+25
-0
lines changed

templates/lua/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ set(CMAKE_MODULE_PATH
3939

4040
# Important when BUILD_SHARED_LIBS option is set to TRUE
4141
set(_AX_LUA_PROJ TRUE)
42+
set(_AX_USE_PREBUILT FALSE)
4243

4344
# NOTE: The order of the cmake module "include(AXGame...)" statements matters
4445
include(AXGameEngineOptions)
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
if ((NOT APPLE) AND (NOT WINRT))
2+
ax_get_resource_path(APP_RES_DIR ${APP_NAME})
3+
ax_sync_target_res(${APP_NAME} LINK_TO ${APP_RES_DIR} FOLDERS ${content_folder} SYM_LINK 1)
4+
5+
if((WINDOWS AND (NOT (CMAKE_GENERATOR MATCHES "Ninja"))))
6+
set_property(TARGET ${APP_NAME} PROPERTY VS_DEBUGGER_WORKING_DIRECTORY "${content_folder}")
7+
if(NOT DEFINED BUILD_ENGINE_DONE)
8+
set_property(DIRECTORY PROPERTY VS_STARTUP_PROJECT ${APP_NAME})
9+
endif()
10+
endif()
11+
elseif(WINRT)
12+
if(NOT DEFINED BUILD_ENGINE_DONE)
13+
set_property(DIRECTORY PROPERTY VS_STARTUP_PROJECT ${APP_NAME})
14+
endif()
15+
endif()
16+
17+
if (_AX_USE_PREBUILT) # support windows and linux
18+
use_ax_compile_define(${APP_NAME})
19+
20+
include(AXLinkHelpers)
21+
ax_link_lua_prebuilt(${APP_NAME} ${_AX_ROOT} ${AX_PREBUILT_DIR})
22+
endif()
23+
24+
ax_setup_app_props(${APP_NAME})

0 commit comments

Comments
 (0)