games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Code Issues Releases Activity

fix building vcmiERM for iOS

Browse Source
This commit is contained in:
Andrey Filipenkov
2022-08-15 14:38:03 +03:00
parent cd88f3fa9e
commit 7b411a5fc4
5 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
CMakeLists.txt
View File

@@ -404,6 +404,16 @@ set(SCRIPTING_LIB_DIR "${LIB_DIR}/scripting")
# Add subdirectories # # Add subdirectories #
####################################### #######################################
include(VCMI_lib)
if(BUILD_SINGLE_APP)
add_subdirectory(lib_client)
add_subdirectory(lib_server)
set(VCMI_LIB_TARGET vcmi_lib_client)
else()
add_subdirectory(lib)
set(VCMI_LIB_TARGET vcmi)
endif()
if(ENABLE_ERM) if(ENABLE_ERM)
add_subdirectory(scripting/erm) add_subdirectory(scripting/erm)
endif() endif()
@@ -415,14 +425,6 @@ if(NOT TARGET minizip::minizip)
add_library(minizip::minizip ALIAS minizip) add_library(minizip::minizip ALIAS minizip)
endif() endif()
include(VCMI_lib)
if(BUILD_SINGLE_APP)
add_subdirectory(lib_client)
add_subdirectory(lib_server)
else()
add_subdirectory(lib)
endif()
if(ENABLE_LAUNCHER) if(ENABLE_LAUNCHER)
add_subdirectory(launcher) add_subdirectory(launcher)
endif() endif()

12
client/CMakeLists.txt
View File

@@ -174,7 +174,16 @@ if(ENABLE_DEBUG_CONSOLE)
else() else()
add_executable(vcmiclient WIN32 ${client_SRCS} ${client_HEADERS} ${client_ICON}) add_executable(vcmiclient WIN32 ${client_SRCS} ${client_HEADERS} ${client_ICON})
endif(ENABLE_DEBUG_CONSOLE) endif(ENABLE_DEBUG_CONSOLE)
add_dependencies(vcmiclient vcmiserver BattleAI StupidAI VCAI Nullkiller) add_dependencies(vcmiclient vcmiserver BattleAI StupidAI VCAI Nullkiller)
if(APPLE_IOS)
if(ENABLE_ERM)
add_dependencies(vcmiclient vcmiERM)
endif()
if(ENABLE_LUA)
add_dependencies(vcmiclient vcmiLua)
endif()
endif()
if(WIN32) if(WIN32)
set_target_properties(vcmiclient set_target_properties(vcmiclient
@@ -226,9 +235,6 @@ if(BUILD_SINGLE_APP)
if(ENABLE_LAUNCHER) if(ENABLE_LAUNCHER)
target_link_libraries(vcmiclient PRIVATE vcmilauncher) target_link_libraries(vcmiclient PRIVATE vcmilauncher)
endif() endif()
set(VCMI_LIB_TARGET vcmi_lib_client)
else()
set(VCMI_LIB_TARGET vcmi)
endif() endif()
target_link_libraries(vcmiclient PRIVATE target_link_libraries(vcmiclient PRIVATE
${VCMI_LIB_TARGET} SDL2::SDL2 SDL2::Image SDL2::Mixer SDL2::TTF ${VCMI_LIB_TARGET} SDL2::SDL2 SDL2::Image SDL2::Mixer SDL2::TTF

5
launcher/CMakeLists.txt
View File

@@ -110,11 +110,6 @@ if(APPLE)
set_property(GLOBAL PROPERTY AUTOGEN_TARGETS_FOLDER vcmilauncher) set_property(GLOBAL PROPERTY AUTOGEN_TARGETS_FOLDER vcmilauncher)
endif() endif()
if(BUILD_SINGLE_APP)
set(VCMI_LIB_TARGET vcmi_lib_client)
else()
set(VCMI_LIB_TARGET vcmi)
endif()
target_link_libraries(vcmilauncher ${VCMI_LIB_TARGET} Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::Network) target_link_libraries(vcmilauncher ${VCMI_LIB_TARGET} Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::Network)
target_include_directories(vcmilauncher target_include_directories(vcmilauncher
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}

8
scripting/erm/CMakeLists.txt
View File

@@ -15,9 +15,13 @@ set(lib_HDRS
) )
add_library(vcmiERM SHARED ${lib_SRCS} ${lib_HDRS}) add_library(vcmiERM SHARED ${lib_SRCS} ${lib_HDRS})
target_link_libraries(vcmiERM Boost::boost vcmi) target_link_libraries(vcmiERM Boost::boost ${VCMI_LIB_TARGET})
vcmi_set_output_dir(vcmiERM "scripting") vcmi_set_output_dir(vcmiERM "scripting")
enable_pch(vcmiERM) enable_pch(vcmiERM)
install(TARGETS vcmiERM LIBRARY DESTINATION ${SCRIPTING_LIB_DIR} OPTIONAL) if(APPLE_IOS)
install(TARGETS vcmiERM LIBRARY DESTINATION ${SCRIPTING_LIB_DIR})
else()
install(TARGETS vcmiERM DESTINATION ${SCRIPTING_LIB_DIR})
endif()

1
scripting/erm/StdInc.h
View File

@@ -6,3 +6,4 @@
// Here you can add specific libraries and macros which are specific to this project. // Here you can add specific libraries and macros which are specific to this project.
VCMI_LIB_USING_NAMESPACE