Jonathan G Rennison e95216b59d Merge branch 'master' into jgrpp ... # Conflicts: # src/company_cmd.cpp # src/core/geometry_func.cpp # src/date.cpp # src/genworld_gui.cpp # src/gfx.cpp # src/object_gui.cpp # src/openttd.cpp # src/settings_type.h # src/video/allegro_v.cpp # src/video/dedicated_v.cpp # src/video/null_v.cpp # src/video/sdl2_v.cpp # src/video/sdl_v.cpp # src/video/win32_v.cpp		2021-02-19 15:38:34 +00:00
..
scripts	Merge branch 'master' into jgrpp	2021-02-01 17:07:34 +00:00
AddCustomXXXTimestamp.cmake	Codechange: Make codestyle for CMake files consistent for 'control' statements	2020-09-25 14:43:13 +01:00
CompileFlags.cmake	Merge branch 'master' into jgrpp	2021-02-19 15:38:34 +00:00
CreateGrfCommand.cmake	Codechange: Make codestyle for CMake files consistent for 'control' statements	2020-09-25 14:43:13 +01:00
CreateRegression.cmake	Codechange: Make codestyle for CMake files consistent for 'control' statements	2020-09-25 14:43:13 +01:00
Endian.cmake	Codechange: Make codestyle for CMake files consistent for 'control' statements	2020-09-25 14:43:13 +01:00
FindAllegro.cmake	Fix: [CMake] our allegro drivers use v4, so skip v5 if found (#8653)	2021-02-07 12:54:02 +01:00
FindBFD.cmake	CMake: Enable debug line tables if BFD found	2020-06-30 22:30:29 +01:00
FindBuiltins.cmake	CMake: Add builtins	2020-06-28 21:57:02 +01:00
FindDbgHelp.cmake	CMake: Add DbgHelp define for MinGW	2020-07-01 00:25:50 +01:00
FindDemangle.cmake	CMake: Add libdl and demangle support	2020-06-28 21:57:02 +01:00
FindDL.cmake	CMake: Add libdl and demangle support	2020-06-28 21:57:02 +01:00
FindEditbin.cmake	Codechange: Make codestyle for CMake files consistent for 'control' statements	2020-09-25 14:43:13 +01:00
FindFluidsynth.cmake	Codechange: Make codestyle for CMake files consistent for 'control' statements	2020-09-25 14:43:13 +01:00
FindFontconfig.cmake	Codechange: Make codestyle for CMake files consistent for 'control' statements	2020-09-25 14:43:13 +01:00
FindGrfcodec.cmake	Add: introduce CMake for project management	2020-06-05 19:36:05 +02:00
FindIconv.cmake	Fix: remove remainining usages of FALSE in CMake files	2020-06-30 09:43:00 +01:00
FindICU.cmake	Change: [CMake] Bump minimum version to 3.9	2021-02-07 16:21:13 +01:00
FindLZO.cmake	Codechange: Make codestyle for CMake files consistent for 'control' statements	2020-09-25 14:43:13 +01:00
FindMacUcontext.cmake	CMake: Add ucontext on Mac/OSX	2020-06-28 21:57:02 +01:00
FindPandoc.cmake	Change: Convert .md to .rtf for Windows/Mac packages	2021-02-08 23:23:24 +00:00
FindSelfDbg.cmake	CMake: Add sigaction, sigaltstack, self dbg	2020-06-28 21:57:02 +01:00
FindSigaction.cmake	CMake: Add sigaction, sigaltstack, self dbg	2020-06-28 21:57:02 +01:00
FindSigaltstack.cmake	CMake: Add sigaction, sigaltstack, self dbg	2020-06-28 21:57:02 +01:00
FindSSE.cmake	Codechange: Make codestyle for CMake files consistent for 'control' statements	2020-09-25 14:43:13 +01:00
FindUcontext.cmake	CMake: Add ucontext	2020-06-28 21:57:02 +01:00
FindXaudio2.cmake	Fix: [CMake] Don't detect XAudio2 if defines are missing	2020-11-26 19:06:03 +00:00
InstallAndPackage.cmake	Merge branch 'master' into jgrpp	2021-02-19 15:38:34 +00:00
LinkPackage.cmake	Fix: Work around cmake bug by stripping link target strings	2020-10-03 16:17:11 +01:00
MSVCFilters.cmake	Codechange: [OSX] CMake source group for OSX files.	2021-01-03 13:25:32 +01:00
Options.cmake	Feature: [Actions / CMake] support for generic linux builds (#8641)	2021-02-05 12:31:27 +01:00
PackageBundle.cmake	Fix: [bundle] custom launch.sh is no longer required for Mac OS	2020-12-19 18:26:29 +01:00
PackageDeb.cmake	Merge branch 'master' into jgrpp	2021-01-29 18:27:36 +00:00
PackageNSIS.cmake	Add: create bundles via CPack	2020-06-05 19:36:05 +02:00
SourceList.cmake	Codechange: Make codestyle for CMake files consistent for 'control' statements	2020-09-25 14:43:13 +01:00
Static.cmake	Codechange: Make codestyle for CMake files consistent for 'control' statements	2020-09-25 14:43:13 +01:00