Index: CMakeLists.txt =================================================================== --- CMakeLists.txt (revisión: 9867) +++ CMakeLists.txt (copia de trabajo) @@ -15,7 +15,9 @@ set(CMAKE_WARN_DEPRECATED ON) list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/") -include(SimutransVcpkgTriplet) +if (MSVC) + include(SimutransVcpkgTriplet) +endif () project(simutrans LANGUAGES C CXX) @@ -41,12 +43,11 @@ find_package(BZip2 REQUIRED) find_package(PNG REQUIRED) find_package(MiniUPNP) -find_package(ZSTD) -#find_package(ZLIB REQUIRED) if (MSVC) find_package(SDL2) find_package(Freetype) find_package(FluidSynth) + find_package(ZSTD) else () find_package(PkgConfig MODULE REQUIRED) pkg_check_modules(SDL2 IMPORTED_TARGET sdl2) @@ -53,6 +54,7 @@ pkg_check_modules(Freetype IMPORTED_TARGET freetype2) # pkg_check_modules(FluidSynth IMPORTED_TARGET fluidsynth) pkg_check_modules(FluidSynth IMPORTED_TARGET fluidsynth>=2.1.0) + pkg_check_modules(ZSTD IMPORTED_TARGET libzstd) endif () set(CMAKE_THREAD_PREFER_PTHREAD ON) @@ -83,7 +85,7 @@ # # sources # -if ($ OR $) +if ( ($ OR $) OR (CMAKE_BUILD_TYPE STREQUAL "Release" OR CMAKE_BUILD_TYPE STREQUAL "MinSizeRel") ) add_executable(simutrans WIN32 MACOSX_BUNDLE) else () add_executable(simutrans)