Index: SimutransInstall.cmake =================================================================== --- SimutransInstall.cmake (revision 11156) +++ SimutransInstall.cmake (revision 11272) @@ -16,7 +16,7 @@ set(SIMUTRANS_OUTPUT_DIR "${CMAKE_INSTALL_PREFIX}") install(FILES ${CMAKE_SOURCE_DIR}/src/simutrans/simutrans.svg DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps) - install(FILES ${CMAKE_SOURCE_DIR}/src/simutrans/.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications RENAME simutrans.desktop) + install(FILES ${CMAKE_SOURCE_DIR}/src/linux/simutrans.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications) else () # Portable installation set(SIMUTRANS_BASE_DIR "${CMAKE_BINARY_DIR}/simutrans") @@ -95,7 +95,7 @@ file(GET_RUNTIME_DEPENDENCIES RESOLVED_DEPENDENCIES_VAR DEPENDENCIES EXECUTABLES "${CMAKE_BINARY_DIR}/simutrans/simutrans" - PRE_EXCLUDE_REGEXES "libSDL2*|libz.so*|libfreetype*|libpng*|libglib*|libogg*|libpcre*|libvorbis*|libfontconfig*" + PRE_EXCLUDE_REGEXES "libSDL2*|libz.so*|libfreetype*|libpng*|libglib*|libogg*|libpcre*|libvorbis*|libfontconfig*|libsteam_api.so*" POST_EXCLUDE_REGEXES "ld-linux|libc.so|libdl.so|libm.so|libgcc_s.so|libpthread.so|libstdc...so|libgomp.so") ]]) else () @@ -114,3 +114,16 @@ FOLLOW_SYMLINK_CHAIN) ]]) endif () + +# +# Include steam library (for some reason it is not done automagically as others) +# +if (SIMUTRANS_STEAM_BUILT) + if(MSVC AND CMAKE_GENERATOR_PLATFORM MATCHES "Win32") + install(FILES ${CMAKE_SOURCE_DIR}/sdk/redistributable_bin/steam_api.dll DESTINATION ${CMAKE_BINARY_DIR}/simutrans) + elseif(MSVC AND CMAKE_GENERATOR_PLATFORM MATCHES "x64") + install(FILES ${CMAKE_SOURCE_DIR}/sdk/redistributable_bin/win64/steam_api64.dll DESTINATION ${CMAKE_BINARY_DIR}/simutrans) + elseif(UNIX AND NOT APPLE) # For Apple it was already done in MacBundle.cmake + install(FILES ${CMAKE_SOURCE_DIR}/sdk/redistributable_bin/linux64/libsteam_api.so DESTINATION ${CMAKE_BINARY_DIR}/simutrans/lib) + endif() +endif() \ No newline at end of file Index: SimutransSourceList.cmake =================================================================== --- SimutransSourceList.cmake (revision 11156) +++ SimutransSourceList.cmake (revision 11272) @@ -77,16 +77,6 @@ src/simutrans/ground/monorailboden.cc src/simutrans/ground/tunnelboden.cc src/simutrans/ground/wasser.cc - src/simutrans/gui/ai_option.cc - src/simutrans/gui/ai_selector.cc - src/simutrans/gui/banner.cc - src/simutrans/gui/base_info.cc - src/simutrans/gui/baum_edit.cc - src/simutrans/gui/city_info.cc - src/simutrans/gui/citybuilding_edit.cc - src/simutrans/gui/citylist_frame.cc - src/simutrans/gui/citylist_stats.cc - src/simutrans/gui/climates.cc src/simutrans/gui/components/gui_aligned_container.cc src/simutrans/gui/components/gui_building.cc src/simutrans/gui/components/gui_button.cc @@ -117,6 +107,17 @@ src/simutrans/gui/components/gui_timeinput.cc src/simutrans/gui/components/gui_waytype_tab_panel.cc src/simutrans/gui/components/gui_world_view.cc + src/simutrans/gui/ai_option.cc + src/simutrans/gui/ai_selector.cc + src/simutrans/gui/banner.cc + src/simutrans/gui/base_info.cc + src/simutrans/gui/baum_edit.cc + src/simutrans/gui/city_info.cc + src/simutrans/gui/citybuilding_edit.cc + src/simutrans/gui/citylist_frame.cc + src/simutrans/gui/citylist_stats.cc + src/simutrans/gui/climates.cc + src/simutrans/gui/chat_frame.cc src/simutrans/gui/convoi_detail.cc src/simutrans/gui/convoi_filter_frame.cc src/simutrans/gui/convoi_frame.cc @@ -170,6 +171,7 @@ src/simutrans/gui/pakselector.cc src/simutrans/gui/password_frame.cc src/simutrans/gui/player_frame.cc + src/simutrans/gui/player_ranking_frame.cc src/simutrans/gui/privatesign_info.cc src/simutrans/gui/savegame_frame.cc src/simutrans/gui/scenario_frame.cc @@ -277,6 +279,7 @@ src/simutrans/script/script.cc src/simutrans/script/script_loader.cc src/simutrans/script/script_tool_manager.cc + src/simutrans/simachievements.cc src/simutrans/simconvoi.cc src/simutrans/simdebug.cc src/simutrans/simevent.cc Index: MacBundle.cmake =================================================================== --- MacBundle.cmake (revision 11156) +++ MacBundle.cmake (revision 11272) @@ -28,6 +28,10 @@ # Change the install directory from /usr/local to the build directory, so it's easier to package. set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}) +if (SIMUTRANS_STEAM_BUILT) + install(FILES ${CMAKE_SOURCE_DIR}/sdk/redistributable_bin/osx/libsteam_api.dylib DESTINATION ${CMAKE_BINARY_DIR}/simutrans/simutrans.app/Contents/MacOS) +endif () + install(CODE " include(BundleUtilities) fixup_bundle(\"${CMAKE_BINARY_DIR}/simutrans/simutrans.app\" \"\" \"\") Index: SimutransBackend.cmake =================================================================== --- SimutransBackend.cmake (revision 11156) +++ SimutransBackend.cmake (revision 11272) @@ -4,12 +4,12 @@ # -if (SDL2_FOUND) +if (SDL2_FOUND AND Freetype_FOUND) list(APPEND AVAILABLE_BACKENDS "sdl2") mark_as_advanced(SDL2_DIR) -endif (SDL2_FOUND) +endif () -if (WIN32) +if (WIN32 AND Freetype_FOUND) list(APPEND AVAILABLE_BACKENDS "gdi") endif () Index: SimutransCompileOptions.cmake =================================================================== --- SimutransCompileOptions.cmake (revision 11156) +++ SimutransCompileOptions.cmake (revision 11272) @@ -23,10 +23,6 @@ option(SIMUTRANS_VALGRIND_SUPPORT "Add support for valgrind \"memcheck\" tool" OFF) -if (Freetype_FOUND) - option(SIMUTRANS_USE_FREETYPE "Enable TrueType font support using freetype library" ON) -endif (Freetype_FOUND) - if (MiniUPNP_FOUND) option(SIMUTRANS_USE_UPNP "Use MiniUPNP for easier server setup" ON) endif (MiniUPNP_FOUND) Index: SimutransVcpkgTriplet.cmake =================================================================== --- SimutransVcpkgTriplet.cmake (revision 11156) +++ SimutransVcpkgTriplet.cmake (revision 11272) @@ -50,14 +50,6 @@ else () message(FATAL_ERROR "Please specify VCPKG triplet!") endif () - else () - - # defined, but check if static - if (WIN32 AND NOT VCPKG_TARGET_TRIPLET MATCHES ".*-static") - string(CONCAT STATIC_TRIPLET ${VCPKG_TARGET_TRIPLET} "-static") - set(VCPKG_TARGET_TRIPLET ${STATIC_TRIPLET} CACHE STRING "Default target is static build" FORCE) - message( WARNING "Static build preferred on windows => make static target " ${STATIC_TRIPLET} ) - endif () endif () message( "-- VCPKG: triplet=" ${VCPKG_TARGET_TRIPLET} " platform=" ${CMAKE_GENERATOR_PLATFORM}) else ()