Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-10-31 15:20:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
96d4538055
OpenTTD-patches/cmake
History
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
2023-11-20 22:27:05 +00:00
..
scripts CMake: Fix findversion with git when build dir is not inside source dir 2023-08-02 20:28:51 +01:00
AddCustomXXXTimestamp.cmake
Catch.cmake Add: catch2 v2.13.10 2023-08-19 10:18:31 +01:00
CatchAddTests.cmake Add: catch2 v2.13.10 2023-08-19 10:18:31 +01:00
CheckAtomic.cmake Codechange: split building into a library and executable 2023-04-16 18:58:21 +02:00
CompileFlags.cmake Merge branch 'master' into jgrpp 2023-11-20 22:27:05 +00:00
CreateGrfCommand.cmake
CreateRegression.cmake
Endian.cmake
FindAllegro.cmake
FindBFD.cmake CMake: Also add -g1/-gline-tables-only to linker options 2023-02-20 21:11:55 +00:00
FindBuiltins.cmake
FindDbgHelp.cmake
FindDemangle.cmake
FindDL.cmake Crashlog: Unix: Use dladdr1 for symbol offset for addr2line 2023-02-20 23:42:55 +00:00
FindEditbin.cmake
FindFluidsynth.cmake
FindFontconfig.cmake
FindGrfcodec.cmake
FindHarfbuzz.cmake Feature: drop ICU-lx in favour of directly interfacing with harfbuzz 2023-05-01 22:17:56 +02:00
FindIconv.cmake
FindICU.cmake Feature: drop ICU-lx in favour of directly interfacing with harfbuzz 2023-05-01 22:17:56 +02:00
FindLZO.cmake Add: use breakpad to create crash.dmp on MacOS / Linux too (#11202) 2023-08-20 17:16:08 +02:00
FindMacUcontext.cmake
FindPandoc.cmake
FindSelfDbg.cmake
FindSigaction.cmake
FindSigaltstack.cmake Unix: Fix CMake detection and setup of sigaltstack 2023-08-14 00:20:04 +01:00
FindSSE.cmake
FindUcontext.cmake
FindXaudio2.cmake
FindZSTD.cmake
InstallAndPackage.cmake Merge branch 'master' into jgrpp 2023-11-19 13:00:21 +00:00
LinkPackage.cmake Add: use breakpad to create crash.dmp on MacOS / Linux too (#11202) 2023-08-20 17:16:08 +02:00
MSVCFilters.cmake Merge branch 'master' into jgrpp 2022-10-03 20:32:26 +01:00
Options.cmake Feature: opt-in survey when exiting a game 2023-05-14 23:22:02 +02:00
PackageBundle.cmake
PackageDeb.cmake
PackageNSIS.cmake
PackageRPM.cmake Add: [CMake] support rpm for fedora and rhel (#9861) 2022-04-19 02:11:42 +02:00
SourceList.cmake Merge branch 'master' into jgrpp 2023-11-19 13:00:21 +00:00
Static.cmake