dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
49,660 Commits 1 Branch 0 Tags
207c79a736bb9d94ffded6955612c38559bb543b
Commit Graph

60 Commits

Author SHA1 Message Date
Jonathan G Rennison
4da3cfcf56 Merge branch 'master' into jgrpp 
# Conflicts:
#	CMakeLists.txt
#	src/bootstrap_gui.cpp
 2020-12-07 17:56:44 +00:00
glx22
a06fe8e8a7 Fix: [CMake] cross-compiling requires native tools 2020-12-04 09:49:31 +00:00
Jonathan G Rennison
55fae045b1 Merge branch 'master' into jgrpp 2020-11-28 11:23:35 +00:00
Charles Pigott
0a9aed0522 Fix: [CMake] Don't detect XAudio2 if defines are missing 2020-11-26 19:06:03 +00:00
Jonathan G Rennison
940b5e7a2f Merge branch 'master' into jgrpp 2020-11-04 17:55:00 +00:00
Jonathan G Rennison
fcb2f7087f CMake: Fix inconsistent use of modified suffix in FindVersion 2020-10-20 18:38:49 +01:00
Jonathan G Rennison
381313aa8a CMake: Use fixed commit hash abbreviation length in FindVersion 2020-10-20 18:18:14 +01:00
Jelle van der Waa
b6615b2cd4 Fix: make reproducible by not embedding timestamps 
By default gzip embeds a timestamps which makes building it twice
not reproducible, passing -n skips this embedding behaviour.

Motivation: https://reproducible-builds.org
 2020-10-15 22:01:12 +01:00
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