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 |
|
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
|
2023-11-13 19:08:22 +00:00 |
|
Peter Nelson
|
890146fecb
|
Codechange: Add -Wsuggest-override compilation flag.
|
2023-09-25 21:27:45 +01:00 |
|
frosch
|
2ff4248032
|
Codechange: Enable more warnings.
|
2023-09-19 22:49:59 +02:00 |
|
Patric Stout
|
53af20910b
|
Fix: [MSVC] generate static libraries / executables correctly with vcpkg -static target (#11208)
|
2023-08-19 00:43:32 +02:00 |
|
Jonathan G Rennison
|
6fa3620222
|
CMake: Change -ffile-prefix-map to be enabled by an option
Use in github release workflows
|
2023-08-17 13:59:48 +01:00 |
|
Jonathan G Rennison
|
1e1ad66e90
|
CMake: Use -ffile-prefix-map to trim build directory from debug output
|
2023-08-16 16:33:11 +01:00 |
|
Loïc Guilloux
|
ba95764f1c
|
Fix 57717a2: VS2022 optimisation bug is fixed with MSVC 19.37 (#11172)
|
2023-08-09 21:43:34 +02:00 |
|
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)
|
2023-06-05 22:24:22 +01:00 |
|
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
|
2023-05-10 17:35:11 +00:00 |
|
Jonathan G Rennison
|
21fe9efd3f
|
CMake: Suppress -Wdeprecated-builtins on Emscripten
Due to src/3rdparty/robin_hood
|
2023-03-05 13:23:08 +00:00 |
|
Jonathan G Rennison
|
86979dd167
|
CMake: Add option to enable LTO
|
2023-02-20 21:11:55 +00:00 |
|
Jonathan G Rennison
|
c1532107fc
|
CMake: Add option to compress debug sections using -gz if possible
|
2023-02-20 21:11:55 +00:00 |
|
Jonathan G Rennison
|
5e76e6fb07
|
MacOS: Add workaround for std::variant
|
2023-01-02 19:15:37 +00:00 |
|
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
|
2022-12-31 18:17:24 +00:00 |
|
glx22
|
ffc1f7ce56
|
Fix 57717a2: [CMake] Don't apply 'cl' workaround to 'clang-cl'
|
2022-12-30 02:17:38 +01:00 |
|
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
|
2022-11-06 20:33:37 +00:00 |
|
Loïc Guilloux
|
c294e8b19f
|
Codechange: [MinGW] use pe-bigobj-x86-64 format for x64 debug builds (#10142)
|
2022-11-06 11:24:35 +01:00 |
|
Jonathan G Rennison
|
fb67adbd82
|
Fix assert macro on Apple/clang when using default cmake build
|
2022-11-03 19:00:25 +00:00 |
|
Jonathan G Rennison
|
071ac374e8
|
Add assert macros for asserts not included in release builds
|
2022-10-22 12:34:49 +01:00 |
|
Jonathan G Rennison
|
ece0a43146
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/newgrf_station.cpp
|
2022-09-14 19:43:12 +01:00 |
|
Loïc Guilloux
|
57717a20d3
|
Fix #9966: workaround a VS2022 optimisation bug (#10029)
|
2022-09-13 12:27:49 +02:00 |
|
Jonathan G Rennison
|
13557d868a
|
Disable uninitialised warnings for MSYS/MinGW CI build
|
2022-06-25 12:05:41 +01:00 |
|
Jonathan G Rennison
|
2f8e63e954
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/gfx.cpp
# src/lang/traditional_chinese.txt
# src/station_cmd.cpp
|
2022-01-04 17:42:36 +00:00 |
|
Jonathan G Rennison
|
2c3b502441
|
CMake: MSVC: Also change static runtime flags in C_FLAGS
|
2022-01-03 17:18:08 +00:00 |
|
Jonathan G Rennison
|
9f6fd2bfeb
|
Only set -Wnon-virtual-dtor for C++ files
|
2022-01-02 20:34:40 +00:00 |
|
Loïc Guilloux
|
c85557e553
|
Fix: [MinGW] Disable ASLR for x64 Debug builds (#9773)
|
2021-12-28 21:08:09 +01:00 |
|
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
|
2021-09-27 22:47:23 +01:00 |
|
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
|
2021-09-22 21:50:02 +01:00 |
|
milek7
|
36bcd2956a
|
Fix: Building on Haiku
|
2021-05-24 08:56:18 +02:00 |
|
Loïc Guilloux
|
c0a0d85d20
|
Fix: [Actions] Annotations not shown for MSVC (#9247)
|
2021-05-11 21:43:43 +02:00 |
|
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
|
2021-04-11 03:05:08 +01:00 |
|
Loïc Guilloux
|
f306d65ea3
|
Fix: [CMake] Use the right run-time library depending on vcpkg triplet (#8964)
|
2021-04-07 12:43:17 +02:00 |
|
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 |
|
glx22
|
99448eedca
|
Fix: [CMake] os/windows/openttd.manifest is not a generated file
|
2021-02-05 23:41:55 +01:00 |
|
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
|
2021-02-01 17:07:34 +00:00 |
|
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
|
2021-01-31 01:08:35 +00:00 |
|
Owen Rudge
|
bbc96fd37c
|
Fix: Don't add -mno-sse4 on arm64
|
2021-01-08 16:58:14 +00:00 |
|
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.
|
2021-01-02 01:26:26 +01:00 |
|
Jonathan G Rennison
|
d85a529f87
|
Merge branch 'master' into jgrpp
|
2020-10-14 17:38:23 +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
|
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 |
|
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
|
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
|
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 |
|