games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-05-27 22:47:48 +02:00
Code Issues Releases Activity

Fix build system

Browse Source
This commit is contained in:
nordsoft 2023-01-18 02:02:32 +04:00
parent ccef596cc0
commit d1f4b176eb
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
client/CMakeLists.txt
View File

@ -278,7 +278,7 @@ if(ENABLE_SINGLE_APP_BUILD)
endif() endif()
endif() endif()
target_link_libraries(vcmiclient PRIVATE target_link_libraries(vcmiclient PRIVATE
${VCMI_LIB_TARGET} SDL2::SDL2 SDL2::Image SDL2::Mixer SDL2::TTF ${ENET_LIBRARIES} ${VCMI_LIB_TARGET} SDL2::SDL2 SDL2::Image SDL2::Mixer SDL2::TTF
) )
if(ffmpeg_LIBRARIES) if(ffmpeg_LIBRARIES)
@ -290,8 +290,7 @@ else()
endif() endif()
target_include_directories(vcmiclient target_include_directories(vcmiclient
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
${ENET_INCLUDE_DIRS})
vcmi_set_output_dir(vcmiclient "") vcmi_set_output_dir(vcmiclient "")
enable_pch(vcmiclient) enable_pch(vcmiclient)

2
cmake_modules/VCMI_lib.cmake
View File

@ -458,6 +458,7 @@ macro(add_main_lib TARGET_NAME LIBRARY_TYPE)
set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_DEFINITIONS "VCMI_DLL=1") set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_DEFINITIONS "VCMI_DLL=1")
target_link_libraries(${TARGET_NAME} PUBLIC target_link_libraries(${TARGET_NAME} PUBLIC
minizip::minizip ZLIB::ZLIB minizip::minizip ZLIB::ZLIB
${ENET_LIBRARIES}
${SYSTEM_LIBS} Boost::boost Boost::thread Boost::filesystem Boost::program_options Boost::locale Boost::date_time ${SYSTEM_LIBS} Boost::boost Boost::thread Boost::filesystem Boost::program_options Boost::locale Boost::date_time
) )
if(APPLE_IOS) if(APPLE_IOS)
@ -469,6 +470,7 @@ macro(add_main_lib TARGET_NAME LIBRARY_TYPE)
PUBLIC ${MAIN_LIB_DIR}/.. PUBLIC ${MAIN_LIB_DIR}/..
PUBLIC ${MAIN_LIB_DIR}/../include PUBLIC ${MAIN_LIB_DIR}/../include
PUBLIC ${MAIN_LIB_DIR} PUBLIC ${MAIN_LIB_DIR}
PRIVATE ${ENET_INCLUDE_DIRS}
PRIVATE ${SDL2_INCLUDE_DIR} PRIVATE ${SDL2_INCLUDE_DIR}
) )

2
lib/CMakeLists.txt
View File

@ -1,6 +1,4 @@
add_main_lib(vcmi SHARED) add_main_lib(vcmi SHARED)
target_include_directories(vcmi PRIVATE ${ENET_INCLUDE_DIRS})
target_link_libraries(vcmi PRIVATE ${ENET_LIBRARIES})
if(ENABLE_SINGLE_APP_BUILD) if(ENABLE_SINGLE_APP_BUILD)
target_compile_definitions(vcmi PUBLIC VCMI_LIB_NAMESPACE=LIB_CLIENT) target_compile_definitions(vcmi PUBLIC VCMI_LIB_NAMESPACE=LIB_CLIENT)
endif() endif()

3
server/CMakeLists.txt
View File

@ -34,11 +34,10 @@ endif()
if(CMAKE_SYSTEM_NAME MATCHES FreeBSD) if(CMAKE_SYSTEM_NAME MATCHES FreeBSD)
set(server_LIBS execinfo ${server_LIBS}) set(server_LIBS execinfo ${server_LIBS})
endif() endif()
target_link_libraries(vcmiserver PRIVATE ${server_LIBS} minizip::minizip ${ENET_LIBRARIES}) target_link_libraries(vcmiserver PRIVATE ${server_LIBS} minizip::minizip)
target_include_directories(vcmiserver target_include_directories(vcmiserver
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
${ENET_INCLUDE_DIRS}
) )
if(WIN32) if(WIN32)