You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
OpenTTD-patches/cmake
Jonathan G Rennison 0d4d4a9cac Merge branch 'master' into jgrpp
# Conflicts:
#	cmake/CompileFlags.cmake
#	src/3rdparty/squirrel/squirrel/sqclosure.h
#	src/3rdparty/squirrel/squirrel/sqobject.h
#	src/3rdparty/squirrel/squirrel/sqvm.h
#	src/aircraft.h
#	src/airport_gui.cpp
#	src/blitter/32bpp_sse_func.hpp
#	src/blitter/null.hpp
#	src/bridge_gui.cpp
#	src/build_vehicle_gui.cpp
#	src/cargotype.h
#	src/cheat_gui.cpp
#	src/command.cpp
#	src/command_func.h
#	src/company_gui.cpp
#	src/console_gui.cpp
#	src/date_gui.cpp
#	src/depot_gui.cpp
#	src/dock_gui.cpp
#	src/economy.cpp
#	src/error_gui.cpp
#	src/fileio.cpp
#	src/fios.cpp
#	src/fios_gui.cpp
#	src/fontcache/spritefontcache.h
#	src/framerate_gui.cpp
#	src/game/game_text.cpp
#	src/gamelog.cpp
#	src/genworld_gui.cpp
#	src/gfx_layout_fallback.cpp
#	src/group_gui.cpp
#	src/highscore_gui.cpp
#	src/hotkeys.cpp
#	src/industry_cmd.cpp
#	src/industry_gui.cpp
#	src/landscape.cpp
#	src/main_gui.cpp
#	src/misc_cmd.cpp
#	src/misc_gui.cpp
#	src/network/core/tcp_game.cpp
#	src/network/core/udp.cpp
#	src/network/network_chat_gui.cpp
#	src/network/network_content_gui.cpp
#	src/network/network_gui.cpp
#	src/network/network_server.cpp
#	src/network/network_server.h
#	src/newgrf_airport.cpp
#	src/newgrf_airport.h
#	src/newgrf_airporttiles.cpp
#	src/newgrf_airporttiles.h
#	src/newgrf_animation_base.h
#	src/newgrf_canal.cpp
#	src/newgrf_commons.h
#	src/newgrf_config.cpp
#	src/newgrf_debug_gui.cpp
#	src/newgrf_engine.cpp
#	src/newgrf_engine.h
#	src/newgrf_generic.cpp
#	src/newgrf_gui.cpp
#	src/newgrf_house.cpp
#	src/newgrf_house.h
#	src/newgrf_industries.cpp
#	src/newgrf_industries.h
#	src/newgrf_industrytiles.cpp
#	src/newgrf_industrytiles.h
#	src/newgrf_object.cpp
#	src/newgrf_object.h
#	src/newgrf_railtype.cpp
#	src/newgrf_railtype.h
#	src/newgrf_roadstop.cpp
#	src/newgrf_roadstop.h
#	src/newgrf_roadtype.cpp
#	src/newgrf_roadtype.h
#	src/newgrf_spritegroup.cpp
#	src/newgrf_spritegroup.h
#	src/newgrf_station.cpp
#	src/newgrf_station.h
#	src/newgrf_town.cpp
#	src/newgrf_town.h
#	src/news_gui.cpp
#	src/object_gui.cpp
#	src/order_gui.cpp
#	src/os/macosx/crashlog_osx.cpp
#	src/os/unix/crashlog_unix.cpp
#	src/os/windows/crashlog_win.cpp
#	src/os/windows/win32.cpp
#	src/os/windows/win32_main.cpp
#	src/pathfinder/npf/npf.cpp
#	src/pathfinder/npf/queue.cpp
#	src/rail_cmd.cpp
#	src/rail_gui.cpp
#	src/road_gui.cpp
#	src/roadveh.h
#	src/saveload/saveload.cpp
#	src/screenshot.cpp
#	src/script/api/script_text.hpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/settings_internal.h
#	src/settings_table.cpp
#	src/signs_cmd.cpp
#	src/signs_gui.cpp
#	src/smallmap_gui.cpp
#	src/smallmap_gui.h
#	src/spriteloader/grf.hpp
#	src/station_cmd.cpp
#	src/station_gui.cpp
#	src/station_map.h
#	src/statusbar_gui.cpp
#	src/stdafx.h
#	src/strgen/strgen.cpp
#	src/table/newgrf_debug_data.h
#	src/terraform_gui.cpp
#	src/timer/timer_game_calendar.cpp
#	src/timer/timer_window.cpp
#	src/town.h
#	src/town_cmd.cpp
#	src/town_gui.cpp
#	src/train_gui.cpp
#	src/transparency_gui.cpp
#	src/vehicle_gui.cpp
#	src/water_cmd.cpp
#	src/waypoint_cmd.cpp
#	src/widget.cpp
#	src/widget_type.h
#	src/widgets/dropdown.cpp
#	src/widgets/rail_widget.h
#	src/widgets/terraform_widget.h
#	src/window.cpp
#	src/window_gui.h
6 months ago
..
scripts CMake: Fix findversion with git when build dir is not inside source dir 10 months ago
AddCustomXXXTimestamp.cmake Codechange: Make codestyle for CMake files consistent for 'control' statements 4 years ago
Catch.cmake Add: catch2 v2.13.10 9 months ago
CatchAddTests.cmake Add: catch2 v2.13.10 9 months ago
CheckAtomic.cmake Codechange: split building into a library and executable 1 year ago
CompileFlags.cmake Merge branch 'master' into jgrpp 6 months ago
CreateGrfCommand.cmake Fix: [CMake] Incorrect dependency checks for GRF 3 years ago
CreateRegression.cmake Fix: [CMake] CMAKE_SOURCE_DIR may contain regex commands 3 years ago
Endian.cmake Codechange: Make codestyle for CMake files consistent for 'control' statements 4 years ago
FindAllegro.cmake Fix: [CMake] our allegro drivers use v4, so skip v5 if found (#8653) 3 years ago
FindBFD.cmake CMake: Also add -g1/-gline-tables-only to linker options 1 year ago
FindBuiltins.cmake CMake: Add builtins 4 years ago
FindDL.cmake Crashlog: Unix: Use dladdr1 for symbol offset for addr2line 1 year ago
FindDbgHelp.cmake CMake: Add DbgHelp define for MinGW 4 years ago
FindDemangle.cmake CMake: Add libdl and demangle support 4 years ago
FindEditbin.cmake Codechange: Make codestyle for CMake files consistent for 'control' statements 4 years ago
FindFluidsynth.cmake Codechange: Make codestyle for CMake files consistent for 'control' statements 4 years ago
FindFontconfig.cmake Codechange: Make codestyle for CMake files consistent for 'control' statements 4 years ago
FindGrfcodec.cmake Add: introduce CMake for project management 4 years ago
FindHarfbuzz.cmake Feature: drop ICU-lx in favour of directly interfacing with harfbuzz 1 year ago
FindICU.cmake Feature: drop ICU-lx in favour of directly interfacing with harfbuzz 1 year ago
FindIconv.cmake Fix: remove remainining usages of FALSE in CMake files 4 years ago
FindLZO.cmake Add: use breakpad to create crash.dmp on MacOS / Linux too (#11202) 9 months ago
FindMacUcontext.cmake CMake: Add ucontext on Mac/OSX 4 years ago
FindPandoc.cmake Change: Convert .md to .rtf for Windows/Mac packages 3 years ago
FindSSE.cmake Codechange: Make codestyle for CMake files consistent for 'control' statements 4 years ago
FindSelfDbg.cmake CMake: Add sigaction, sigaltstack, self dbg 4 years ago
FindSigaction.cmake CMake: Add sigaction, sigaltstack, self dbg 4 years ago
FindSigaltstack.cmake Unix: Fix CMake detection and setup of sigaltstack 9 months ago
FindUcontext.cmake CMake: Add ucontext 4 years ago
FindXaudio2.cmake Fix: [CMake] Don't detect XAudio2 if defines are missing 4 years ago
FindZSTD.cmake Add: Support Zstandard(zstd) savegame compression 3 years ago
InstallAndPackage.cmake Merge branch 'master' into jgrpp 6 months ago
LinkPackage.cmake Add: use breakpad to create crash.dmp on MacOS / Linux too (#11202) 9 months ago
MSVCFilters.cmake Merge branch 'master' into jgrpp 2 years ago
Options.cmake Feature: opt-in survey when exiting a game 1 year ago
PackageBundle.cmake Fix: [bundle] custom launch.sh is no longer required for Mac OS 3 years ago
PackageDeb.cmake CPack: Change debian package name, mark as conflicting with openttd 3 years ago
PackageNSIS.cmake Add: create bundles via CPack 4 years ago
PackageRPM.cmake Add: [CMake] support rpm for fedora and rhel (#9861) 2 years ago
SourceList.cmake Merge branch 'master' into jgrpp 6 months ago
Static.cmake Codechange: Make codestyle for CMake files consistent for 'control' statements 4 years ago