Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-11 13:10:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,519 Commits 12 Branches 180 Tags 451 MiB
b9f7db9c7e
Commit Graph

52 Commits

Author SHA1 Message Date
Jonathan G Rennison
d85a529f87 Merge branch 'master' into jgrpp 2020-10-14 17:38:23 +01:00
Charles Pigott
a0307652f3 Fix: Work around cmake bug by stripping link target strings 2020-10-03 16:17:11 +01:00
Charles Pigott
348c231e12 Codechange: Make codestyle for CMake files consistent for 'control' statements 2020-09-25 14:43:13 +01:00
Jonathan G Rennison
aea747be08 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/hotkeys.cpp
 2020-09-21 02:14:30 +01:00
laikh
6358ae47de Fix: Remove /MP flag and improve FindEditbin.cmake for Windows clang-cl build 2020-09-01 09:45:48 +01:00
Jonathan G Rennison
5b78090a61 Merge branch 'master' into jgrpp 
# Conflicts:
#	CMakeLists.txt
#	src/saveload/town_sl.cpp
#	src/screenshot.h
#	src/script/api/ai/ai_date.hpp.sq
#	src/script/api/ai/ai_marine.hpp.sq
#	src/script/api/ai/ai_station.hpp.sq
#	src/script/api/game/game_date.hpp.sq
#	src/script/api/game/game_marine.hpp.sq
#	src/script/api/game/game_station.hpp.sq
#	src/script/api/game/game_window.hpp.sq
#	src/script/api/script_window.hpp
#	src/script/api/template/template_window.hpp.sq
#	src/signal.cpp
#	src/statusbar_gui.cpp
#	src/toolbar_gui.cpp
#	src/viewport.cpp
#	src/viewport_func.h
 2020-08-27 18:31:09 +01:00
Michael Lutz
7d66540af5 Fix: [CMake] Don't strip final newline from regression output. 
The expected regression output files all end with a newline. As such, we have to make sure we capture the output from OpenTTD with the last newline intact.
 2020-07-27 17:26:19 +01:00
glx
4079c47b6c Change: rewrote squirrel_export in CMake 2020-07-16 00:53:26 +02:00
glx
8794c61f25 Change: rewrote generate_widget in CMake 2020-07-16 00:53:26 +02:00
Jonathan G Rennison
dbdab67cda version_utils.sh: Fix getting current version 2020-07-12 12:59:24 +01:00
Jonathan G Rennison
7467051331 Merge branch 'master' into jgrpp 
# Conflicts:
#	.gitignore
#	src/network/network_server.cpp
#	src/vehicle_gui.cpp
 2020-07-12 12:29:28 +01:00
Michael Lutz
00eccbe298 Add: [CMake] Source group definitions to create file filters in generated project files (like the old MSVC projects). 2020-07-10 19:33:00 +02:00
Jonathan G Rennison
e8843cb979 Merge branch 'pr-169' into jgrpp 2020-07-09 17:41:32 +01:00
Alex Brooke
e0fb398bbd
Fix: debian package dependencies 2020-07-07 17:13:44 -04:00
Jonathan G Rennison
737ced9f50 Merge branch 'master' into jgrpp 2020-07-07 17:28:19 +01:00
Michael Lutz
de4dc792a9 Fix: [CMake] Re-enable multi-threaded compilation for MSVC project files. 2020-07-05 21:11:09 +02:00
glx22
97592c4093 Add: [CMake] Allow renaming of openttd binary 2020-07-02 21:18:14 +02:00
glx22
53de5b5c55 Fix: [CMake] Restore man file compression 2020-07-02 21:18:14 +02:00
Jonathan G Rennison
15d32bcd19 CMake: Disable stripping in bundle 2020-07-01 21:52:21 +01:00
Jonathan G Rennison
efaf935cbf CMake: Remove reference to empty bin/data dir 2020-07-01 00:36:10 +01:00
Jonathan G Rennison
1304d7c8b6 CMake: Add DbgHelp define for MinGW 2020-07-01 00:25:50 +01:00
Jonathan G Rennison
fa42151290 CMake: Enable debug line tables if BFD found 2020-06-30 22:30:29 +01:00
Jonathan G Rennison
3adeff1883 Merge branch 'master' into jgrpp 
# Conflicts:
#	CMakeLists.txt
#	cmake/CompileFlags.cmake
#	src/bridge_gui.cpp
#	src/saveload/afterload.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/saveload/town_sl.cpp
#	src/screenshot.cpp
#	src/screenshot.h
#	src/toolbar_gui.cpp
#	src/town.h
#	src/town_cmd.cpp
 2020-06-30 21:43:04 +01:00
Dan Villiom Podlaski Christiansen
e6be8be19d Fix: remove remainining usages of FALSE in CMake files 2020-06-30 09:43:00 +01:00
Dan Villiom Podlaski Christiansen
70905ee82e Fix: fix building release tags 
I tried building a tag, and got this error:

CMake Error at cmake/scripts/FindVersion.cmake:85 (string):
  string sub-command REGEX, mode REPLACE: regex "^[0-9.]*$" matched an empty
  string.
 2020-06-30 09:43:00 +01:00
Dan Villiom Podlaski Christiansen
241e3adae8 Fix: use proper flags for suppressing warnings in Clang 2020-06-30 09:43:00 +01:00
Dan Villiom Podlaski Christiansen
0d46e20bd4 Add: add option for forcing coloured compiler output (useful for Ninja) 2020-06-30 09:43:00 +01:00
Jonathan G Rennison
10aab3e3a3 CMake: Add BFD, support new BFD API 2020-06-28 21:57:02 +01:00
Jonathan G Rennison
ecc9eb4df1 CMake: Set optimisation flags if no build type specified 2020-06-28 21:57:02 +01:00
Jonathan G Rennison
4cee6f3d79 CMake: Remove disabling asserts for release builds 2020-06-28 21:57:02 +01:00
Jonathan G Rennison
73edc5aaba CMake: Add ucontext on Mac/OSX 2020-06-28 21:57:02 +01:00
Jonathan G Rennison
f1a9d0d056 CMake: Fix .ottdrev-vc read and write 2020-06-28 21:57:02 +01:00
Jonathan G Rennison
e05fa5c1c3 CMake: Add builtins 2020-06-28 21:57:02 +01:00
Jonathan G Rennison
39eaa94435 CMake: Add ucontext 2020-06-28 21:57:02 +01:00
Jonathan G Rennison
6b7668dc83 CMake: Add sigaction, sigaltstack, self dbg 2020-06-28 21:57:02 +01:00
Jonathan G Rennison
10626baaf2 CMake: Add -fno-stack-check for OSX 
See: 0a027a27
 2020-06-28 21:57:02 +01:00
Jonathan G Rennison
a8c3ceb3c9 CMake: Add libdl and demangle support 2020-06-28 21:57:02 +01:00
TechGeekNZ
cf8ea74733 Update: Merge branch 'jgrpp_master_cmake' into jgrpp_cmake 2020-06-28 21:56:43 +01:00
glx22
63d20c029b
Fix 887b912af: MinGW requires an extra link flag with _FORTIFY_SOURCE (#8246) 
see #7860
 2020-06-28 01:18:28 +02:00
Charles Pigott
887b912af1 Codechange: Only apply FORTIFY_SOURCE in non-debug builds 
It requires -O1 (or greater) and GCC spews out warnings if you try using it with -O0
 2020-06-27 14:51:14 +01:00
Dan Church
506598a80a Fix: [CMake] Fix install paths using GNUInstallDirs 2020-06-18 21:18:53 +01:00
glx22
8ef3d8f584 Revert f51e66f6: creating zip bundle fails for MacOS 2020-06-10 21:10:00 +02:00
glx22
0b86bd8b03 Fix: CMake option values should be ON/OFF 2020-06-08 09:49:26 +01:00
glx22
3d76677594 Fix: Generate windows installer only for stable releases 2020-06-08 09:49:26 +01:00
glx22
f51e66f697 Fix: Restore zip bundle for MacOS 2020-06-08 09:49:26 +01:00
glx
b145ee310c Fix: MacOS bundle creation 2020-06-06 19:23:54 +02:00
glx
877d196ef5 Fix: Incorrect REV_YEAR, and parsing of .ottdrev 2020-06-05 22:32:07 +02:00
Patric Stout
4218ebc932 Fix: [AzurePipelines] switch the CI / CD to CMake too 
This also means dropping Debian/jessie, as it has a CMake that is
too old (3.0), with no real path to upgrade.
 2020-06-05 19:36:05 +02:00
Patric Stout
b7643b1d36 Add: create bundles via CPack 
CPack works closely together with CMake to do the right thing in
terms of bundling (called 'package'). This generates all the
packaging we need, and some more.
 2020-06-05 19:36:05 +02:00
Patric Stout
56d54cf60e Add: introduce CMake for project management 
CMake works on all our supported platforms, like MSVC, Mingw, GCC,
Clang, and many more. It allows for a single way of doing things,
so no longer we need shell scripts and vbs scripts to work on all
our supported platforms.

Additionally, CMake allows to generate project files for like MSVC,
KDevelop, etc.

This heavily reduces the lines of code we need to support multiple
platforms from a project perspective.

Addtiionally, this heavily improves our detection of libraries, etc.
 2020-06-05 19:36:05 +02:00