Index: CMakeLists.txt =================================================================== --- CMakeLists.txt (revisión: 9890) +++ CMakeLists.txt (copia de trabajo) @@ -140,11 +140,8 @@ if (SIMUTRANS_BACKEND STREQUAL "sdl2") target_sources(simutrans PRIVATE display/simgraph16.cc sys/simsys_s2.cc sound/sdl2_sound.cc) - target_include_directories(simutrans PRIVATE ${SDL2_INCLUDE_DIRS}) if (MINGW) target_link_libraries(simutrans PRIVATE ${SDL2_STATIC_LIBRARIES}) - elseif (APPLE) - target_link_libraries(simutrans PRIVATE ${SDL2_LIBRARIES}) elseif (MSVC) target_link_libraries(simutrans PRIVATE SDL2::SDL2) else () @@ -174,11 +171,9 @@ target_link_libraries(simutrans PRIVATE BZip2::BZip2) if (SIMUTRANS_USE_FREETYPE) - target_include_directories(simutrans PRIVATE ${Freetype_INCLUDE_DIRS}) if (MINGW) + target_include_directories(simutrans PRIVATE ${Freetype_INCLUDE_DIRS}) target_link_libraries(simutrans PRIVATE ${Freetype_STATIC_LIBRARIES}) - elseif (APPLE) - target_link_libraries(simutrans PRIVATE ${Freetype_LIBRARIES}) elseif (MSVC) target_link_libraries(simutrans PRIVATE Freetype::Freetype) else () @@ -216,7 +211,7 @@ # manually linking them instead, until it is fixed target_link_libraries(simutrans PRIVATE -lfluidsynth -lharfbuzz -lgraphite2 -lglib-2.0 -lintl -liconv -ldsound -lole32 -lws2_32 -lgomp -lksuser) elseif (MSVC) - target_link_libraries(simutrans PRIVATE ${FluidSynth_LIBRARIES}) + target_link_libraries(simutrans PRIVATE FluidSynth::FluidSynth) else () target_link_libraries(simutrans PRIVATE PkgConfig::FluidSynth) endif (MINGW)