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

Revert "Fix for SDL on Windows" 

This reverts commit 21b6572b5b.
fix-squashed-planets
Tomasz Kapuściński 2022-11-26 20:00:44 +01:00
parent 21b6572b5b
commit 1d8e06c7ba
2 changed files with 7 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
CMakeLists.txt
View File

@ -309,19 +309,12 @@ include("${colobot_SOURCE_DIR}/cmake/colobot-lint.cmake")
## ##
find_package(OpenGL 1.4 REQUIRED) find_package(OpenGL 1.4 REQUIRED)
find_package(PNG 1.2 REQUIRED)
find_package(Gettext REQUIRED)
find_package(PhysFS REQUIRED)
if(PLATFORM_WINDOWS)
find_package(SDL2 CONFIG REQUIRED)
find_package(SDL2_image CONFIG REQUIRED)
find_package(SDL2_ttf CONFIG REQUIRED)
else()
find_package(SDL2 REQUIRED) find_package(SDL2 REQUIRED)
find_package(SDL2_image REQUIRED) find_package(SDL2_image REQUIRED)
find_package(SDL2_ttf REQUIRED) find_package(SDL2_ttf REQUIRED)
endif() find_package(PNG 1.2 REQUIRED)
find_package(Gettext REQUIRED)
find_package(PhysFS REQUIRED)
set(Boost_USE_STATIC_LIBS ${BOOST_STATIC}) set(Boost_USE_STATIC_LIBS ${BOOST_STATIC})
set(Boost_USE_MULTITHREADED ON) set(Boost_USE_MULTITHREADED ON)

22
src/CMakeLists.txt
View File

@ -480,6 +480,9 @@ target_include_directories(colobotbase PUBLIC
target_link_libraries(colobotbase PUBLIC target_link_libraries(colobotbase PUBLIC
CBot CBot
localename localename
SDL2::Core
SDL2::Image
SDL2::TTF
OpenGL::GL OpenGL::GL
PNG::PNG PNG::PNG
GLEW::GLEW GLEW::GLEW
@ -504,20 +507,6 @@ if(mp3lame_FOUND)
) )
endif() endif()
if(PLATFORM_WINDOWS)
target_link_libraries(colobotbase PUBLIC
$<IF:$<TARGET_EXISTS:SDL2::SDL2>,SDL2::SDL2,SDL2::SDL2-static>
$<IF:$<TARGET_EXISTS:SDL2_image::SDL2_image>,SDL2_image::SDL2_image,SDL2_image::SDL2_image-static>
$<IF:$<TARGET_EXISTS:SDL2_ttf::SDL2_ttf>,SDL2_ttf::SDL2_ttf,SDL2_ttf::SDL2_ttf-static>
)
elseif()
target_link_libraries(colobotbase PUBLIC
SDL2::Core
SDL2::Image
SDL2::TTF
)
endif()
# Optional libraries # Optional libraries
if(OPENAL_SOUND) if(OPENAL_SOUND)
target_sources(colobotbase PRIVATE target_sources(colobotbase PRIVATE
@ -612,12 +601,7 @@ endif()
if(PLATFORM_WINDOWS) if(PLATFORM_WINDOWS)
target_sources(colobot PRIVATE ../desktop/colobot.rc) target_sources(colobot PRIVATE ../desktop/colobot.rc)
endif() endif()
if(PLATFORM_WINDOWS)
target_link_libraries(colobot colobotbase SDL2::SDL2main)
elseif()
target_link_libraries(colobot colobotbase SDL2::Main) target_link_libraries(colobot colobotbase SDL2::Main)
endif()
# Install # Install
install(TARGETS colobot RUNTIME DESTINATION ${COLOBOT_INSTALL_BIN_DIR}) install(TARGETS colobot RUNTIME DESTINATION ${COLOBOT_INSTALL_BIN_DIR})