immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for linking to SDL

dev
Tomasz Kapuściński 2022-11-26 14:52:39 +01:00
parent 5feffc70df
commit 2f50470591
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -307,9 +307,9 @@ include("${colobot_SOURCE_DIR}/cmake/colobot-lint.cmake")
## ##
find_package(OpenGL 1.4 REQUIRED) find_package(OpenGL 1.4 REQUIRED)
find_package(SDL2 REQUIRED) find_package(SDL2 CONFIG REQUIRED)
find_package(SDL2_image REQUIRED) find_package(SDL2_image CONFIG REQUIRED)
find_package(SDL2_ttf REQUIRED) find_package(SDL2_ttf CONFIG REQUIRED)
find_package(PNG 1.2 REQUIRED) find_package(PNG 1.2 REQUIRED)
find_package(Gettext REQUIRED) find_package(Gettext REQUIRED)
find_package(PhysFS REQUIRED) find_package(PhysFS REQUIRED)

8
src/CMakeLists.txt
View File

@ -487,9 +487,9 @@ target_include_directories(colobotbase PUBLIC
target_link_libraries(colobotbase PUBLIC target_link_libraries(colobotbase PUBLIC
CBot CBot
localename localename
SDL2::Core $<IF:$<TARGET_EXISTS:SDL2::SDL2>,SDL2::SDL2,SDL2::SDL2-static>
SDL2::Image $<IF:$<TARGET_EXISTS:SDL2_image::SDL2_image>,SDL2_image::SDL2_image,SDL2_image::SDL2_image-static>
SDL2::TTF $<IF:$<TARGET_EXISTS:SDL2_ttf::SDL2_ttf>,SDL2_ttf::SDL2_ttf,SDL2_ttf::SDL2_ttf-static>
OpenGL::GL OpenGL::GL
PNG::PNG PNG::PNG
GLEW::GLEW GLEW::GLEW
@ -610,7 +610,7 @@ endif()
if(PLATFORM_WINDOWS) if(PLATFORM_WINDOWS)
target_sources(colobot PRIVATE ../desktop/colobot.rc) target_sources(colobot PRIVATE ../desktop/colobot.rc)
endif() endif()
target_link_libraries(colobot colobotbase SDL2::Main) target_link_libraries(colobot colobotbase SDL2::SDL2main)
# Install # Install
install(TARGETS colobot RUNTIME DESTINATION ${COLOBOT_INSTALL_BIN_DIR}) install(TARGETS colobot RUNTIME DESTINATION ${COLOBOT_INSTALL_BIN_DIR})