Jonathan G Rennison
|
fc1c47cbd2
|
Merge branch 'master' into jgrpp
# Conflicts:
# cmake/CompileFlags.cmake
# src/crashlog.cpp
# src/crashlog.h
# src/date_type.h
# src/depot_type.h
# src/landscape.cpp
# src/openttd.cpp
# src/order_cmd.cpp
# src/order_gui.cpp
# src/os/macosx/crashlog_osx.cpp
# src/os/unix/crashlog_unix.cpp
# src/os/windows/crashlog_win.cpp
# src/pathfinder/npf/npf.cpp
# src/road_cmd.cpp
# src/script/api/script_infrastructure.cpp
# src/stdafx.h
# src/table/settings/gui_settings.ini
# src/table/settings/pathfinding_settings.ini
# src/tests/CMakeLists.txt
|
7 months ago |
Patric Stout
|
53af20910b
|
Fix: [MSVC] generate static libraries / executables correctly with vcpkg -static target (#11208)
|
10 months ago |
|
Jonathan G Rennison
|
6fa3620222
|
CMake: Change -ffile-prefix-map to be enabled by an option
Use in github release workflows
|
10 months ago |
|
Jonathan G Rennison
|
1e1ad66e90
|
CMake: Use -ffile-prefix-map to trim build directory from debug output
|
10 months ago |
Loïc Guilloux
|
ba95764f1c
|
Fix 57717a2: VS2022 optimisation bug is fixed with MSVC 19.37 (#11172)
|
10 months ago |
|
Loïc Guilloux
|
115241a052
|
Fix: disable "redundant move" warnings for GCC (#10803)
GCC warns about redundant std::move while clang warns when they are missing, so we silence the less harmful one
(cherry picked from commit 3c59b8e9ec)
|
1 year ago |
|
Loïc Guilloux
|
3c59b8e9ec
|
Fix: disable "redundant move" warnings for GCC (#10803)
GCC warns about redundant std::move while clang warns when they are missing, so we silence the less harmful one
|
1 year ago |
|
Jonathan G Rennison
|
21fe9efd3f
|
CMake: Suppress -Wdeprecated-builtins on Emscripten
Due to src/3rdparty/robin_hood
|
1 year ago |
|
Jonathan G Rennison
|
86979dd167
|
CMake: Add option to enable LTO
|
1 year ago |
|
Jonathan G Rennison
|
c1532107fc
|
CMake: Add option to compress debug sections using -gz if possible
|
1 year ago |
|
Jonathan G Rennison
|
5e76e6fb07
|
MacOS: Add workaround for std::variant
|
1 year ago |
|
Jonathan G Rennison
|
a1f6aaa58f
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/lang/korean.txt
# src/saveload/afterload.cpp
# src/saveload/ai_sl.cpp
# src/saveload/game_sl.cpp
# src/script/script_instance.cpp
|
1 year ago |
glx22
|
ffc1f7ce56
|
Fix 57717a2: [CMake] Don't apply 'cl' workaround to 'clang-cl'
|
1 year ago |
|
Jonathan G Rennison
|
aa4501747f
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/base_station_base.h
# src/lang/german.txt
# src/saveload/station_sl.cpp
# src/station.cpp
# src/station_cmd.cpp
|
2 years ago |
|
Loïc Guilloux
|
c294e8b19f
|
Codechange: [MinGW] use pe-bigobj-x86-64 format for x64 debug builds (#10142)
|
2 years ago |
|
Jonathan G Rennison
|
fb67adbd82
|
Fix assert macro on Apple/clang when using default cmake build
|
2 years ago |
|
Jonathan G Rennison
|
071ac374e8
|
Add assert macros for asserts not included in release builds
|
2 years ago |
|
Jonathan G Rennison
|
ece0a43146
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/newgrf_station.cpp
|
2 years ago |
|
Loïc Guilloux
|
57717a20d3
|
Fix #9966: workaround a VS2022 optimisation bug (#10029)
|
2 years ago |
|
Jonathan G Rennison
|
13557d868a
|
Disable uninitialised warnings for MSYS/MinGW CI build
|
2 years ago |
|
Jonathan G Rennison
|
2f8e63e954
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/gfx.cpp
# src/lang/traditional_chinese.txt
# src/station_cmd.cpp
|
2 years ago |
|
Jonathan G Rennison
|
2c3b502441
|
CMake: MSVC: Also change static runtime flags in C_FLAGS
|
2 years ago |
|
Jonathan G Rennison
|
9f6fd2bfeb
|
Only set -Wnon-virtual-dtor for C++ files
|
2 years ago |
|
Loïc Guilloux
|
c85557e553
|
Fix: [MinGW] Disable ASLR for x64 Debug builds (#9773)
|
2 years ago |
|
Jonathan G Rennison
|
fd605e3cf3
|
Merge branch 'master' into jgrpp-beta
# Conflicts:
# .github/workflows/commit-checker.yml
# src/company_cmd.cpp
# src/console_cmds.cpp
# src/crashlog.cpp
# src/lang/english.txt
# src/lang/german.txt
# src/lang/indonesian.txt
# src/lang/japanese.txt
# src/lang/korean.txt
# src/lang/swedish.txt
# src/linkgraph/linkgraphjob.cpp
# src/linkgraph/mcf.cpp
# src/network/core/tcp.cpp
# src/network/core/tcp.h
# src/network/core/tcp_game.h
# src/network/core/udp.h
# src/network/network.cpp
# src/network/network_admin.cpp
# src/network/network_admin.h
# src/network/network_chat_gui.cpp
# src/network/network_client.cpp
# src/network/network_client.h
# src/network/network_func.h
# src/network/network_internal.h
# src/network/network_server.cpp
# src/network/network_server.h
# src/newgrf.cpp
# src/newgrf_station.cpp
# src/order_gui.cpp
# src/rail_cmd.cpp
# src/saveload/saveload.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/settings_internal.h
# src/settings_type.h
# src/station_cmd.cpp
# src/stdafx.h
# src/table/currency_settings.ini
# src/table/misc_settings.ini
# src/table/settings.h.preamble
# src/table/settings.ini
# src/terraform_cmd.cpp
# src/timetable_gui.cpp
# src/train_cmd.cpp
# src/tree_cmd.cpp
# src/water_cmd.cpp
|
3 years ago |
|
Jonathan G Rennison
|
0b0d154788
|
Merge branch 'master' into jgrpp-beta
# Conflicts:
# .github/workflows/ci-build.yml
# src/lang/german.txt
# src/lang/romanian.txt
# src/lang/slovak.txt
# src/lang/turkish.txt
# src/network/core/address.cpp
# src/network/core/tcp.h
# src/network/core/udp.cpp
# src/network/network.cpp
# src/network/network_client.cpp
# src/network/network_server.cpp
# src/network/network_server.h
# src/network/network_udp.cpp
# src/openttd.cpp
# src/saveload/newgrf_sl.cpp
# src/tree_cmd.cpp
# src/video/video_driver.hpp
# src/window.cpp
# src/window_gui.h
|
3 years ago |
milek7
|
36bcd2956a
|
Fix: Building on Haiku
|
3 years ago |
|
Loïc Guilloux
|
c0a0d85d20
|
Fix: [Actions] Annotations not shown for MSVC (#9247)
|
3 years ago |
|
Jonathan G Rennison
|
227041008f
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/debug.cpp
# src/lang/russian.txt
# src/misc_gui.cpp
# src/os/windows/crashlog_win.cpp
# src/os/windows/font_win32.cpp
# src/os/windows/win32.cpp
# src/rail_cmd.cpp
# src/window_gui.h
|
3 years ago |
|
Loïc Guilloux
|
f306d65ea3
|
Fix: [CMake] Use the right run-time library depending on vcpkg triplet (#8964)
|
3 years ago |
|
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
|
3 years ago |
|
glx22
|
99448eedca
|
Fix: [CMake] os/windows/openttd.manifest is not a generated file
|
3 years ago |
|
Jonathan G Rennison
|
b7ddd486cf
|
Merge branch 'master' into jgrpp
# Conflicts:
# cmake/CompileFlags.cmake
# src/aircraft_cmd.cpp
# src/blitter/32bpp_anim.cpp
# src/cargopacket.cpp
# src/cheat_gui.cpp
# src/company_cmd.cpp
# src/company_gui.cpp
# src/core/pool_func.hpp
# src/date.cpp
# src/economy.cpp
# src/error_gui.cpp
# src/ground_vehicle.cpp
# src/ground_vehicle.hpp
# src/group_gui.cpp
# src/industry_cmd.cpp
# src/lang/dutch.txt
# src/lang/french.txt
# src/lang/german.txt
# src/linkgraph/linkgraph_gui.cpp
# src/linkgraph/mcf.cpp
# src/network/network_content.cpp
# src/network/network_server.cpp
# src/network/network_udp.cpp
# src/newgrf_engine.cpp
# src/newgrf_station.cpp
# src/order_cmd.cpp
# src/order_gui.cpp
# src/pathfinder/follow_track.hpp
# src/pathfinder/yapf/yapf_common.hpp
# src/saveload/saveload.cpp
# src/settings_gui.cpp
# src/station_cmd.cpp
# src/station_kdtree.h
# src/string_func.h
# src/table/settings.ini
# src/tgp.cpp
# src/timetable_cmd.cpp
# src/timetable_gui.cpp
# src/toolbar_gui.cpp
# src/town_cmd.cpp
# src/train_cmd.cpp
# src/train_gui.cpp
# src/tree_gui.cpp
# src/tunnelbridge_cmd.cpp
# src/vehicle.cpp
# src/vehicle_gui.cpp
# src/video/sdl2_v.cpp
# src/video/sdl_v.cpp
# src/video/win32_v.cpp
# src/viewport.cpp
# src/viewport_sprite_sorter_sse4.cpp
# src/window.cpp
|
3 years ago |
|
Jonathan G Rennison
|
6c3e5642f8
|
Merge branch 'master' into jgrpp
# Conflicts:
# cmake/CompileFlags.cmake
# src/crashlog.cpp
# src/fileio.cpp
# src/fileio_func.h
# src/fios_gui.cpp
# src/ini_load.cpp
# src/ini_type.h
# src/lang/english.txt
# src/lang/german.txt
# src/lang/korean.txt
# src/network/network_client.cpp
# src/order_base.h
# src/order_cmd.cpp
# src/os/windows/win32.cpp
# src/road_cmd.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/settings.cpp
# src/station_cmd.cpp
# src/stdafx.h
# src/table/settings.ini
# src/tree_cmd.cpp
# src/tree_gui.cpp
# src/vehicle_base.h
# src/video/cocoa/cocoa_v.mm
# src/video/cocoa/event.mm
# src/video/cocoa/wnd_quartz.mm
# src/viewport.cpp
# src/widgets/tree_widget.h
|
3 years ago |
Owen Rudge
|
bbc96fd37c
|
Fix: Don't add -mno-sse4 on arm64
|
3 years ago |
Michael Lutz
|
5b1fb94240
|
Codechange: [OSX] Prevent the compiler from using SSE4 instructions unless we want to.
This improves compatibility on older systems. We don't need to disable anything
older, as there are no SSE2-only Macs.
|
3 years ago |
|
Jonathan G Rennison
|
d85a529f87
|
Merge branch 'master' into jgrpp
|
4 years ago |
Charles Pigott
|
348c231e12
|
Codechange: Make codestyle for CMake files consistent for 'control' statements
|
4 years ago |
|
Jonathan G Rennison
|
aea747be08
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/hotkeys.cpp
|
4 years ago |
laikh
|
6358ae47de
|
Fix: Remove /MP flag and improve FindEditbin.cmake for Windows clang-cl build
|
4 years ago |
|
Jonathan G Rennison
|
737ced9f50
|
Merge branch 'master' into jgrpp
|
4 years ago |
|
Michael Lutz
|
de4dc792a9
|
Fix: [CMake] Re-enable multi-threaded compilation for MSVC project files.
|
4 years ago |
|
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
|
4 years ago |
Dan Villiom Podlaski Christiansen
|
241e3adae8
|
Fix: use proper flags for suppressing warnings in Clang
|
4 years ago |
|
Dan Villiom Podlaski Christiansen
|
0d46e20bd4
|
Add: add option for forcing coloured compiler output (useful for Ninja)
|
4 years ago |
|
Jonathan G Rennison
|
ecc9eb4df1
|
CMake: Set optimisation flags if no build type specified
|
4 years ago |
|
Jonathan G Rennison
|
4cee6f3d79
|
CMake: Remove disabling asserts for release builds
|
4 years ago |
|
Jonathan G Rennison
|
10626baaf2
|
CMake: Add -fno-stack-check for OSX
See: 0a027a27
|
4 years ago |
|
glx22
|
63d20c029b
|
Fix 887b912af: MinGW requires an extra link flag with _FORTIFY_SOURCE (#8246)
see #7860
|
4 years ago |
|
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
|
4 years ago |