Jonathan G Rennison
eab32e8861
Merge branch 'master' into jgrpp
...
# Conflicts:
# CMakeLists.txt
# src/blitter/32bpp_optimized.cpp
# src/lang/serbian.txt
4 years ago
glx22
349dc568ea
Fix: [CMake] Remove timestamps from regression output
4 years ago
Jonathan G Rennison
f4e29071be
Merge tag '1.11.0-beta2' into jgrpp
...
# Conflicts:
# .github/workflows/ci-build.yml
# .github/workflows/release.yml
# CMakeLists.txt
# src/blitter/32bpp_optimized.cpp
# src/debug.cpp
# src/gfx.cpp
# src/gfx_func.h
# src/lang/czech.txt
# src/lang/english.txt
# src/lang/italian.txt
# src/lang/swedish.txt
# src/lang/ukrainian.txt
# src/network/network_server.cpp
# src/os/windows/crashlog_win.cpp
# src/os/windows/win32.cpp
# src/pathfinder/follow_track.hpp
# src/screenshot.cpp
# src/settings_type.h
# src/spritecache.cpp
# src/vehicle_gui.cpp
# src/video/sdl2_v.cpp
# src/video/video_driver.cpp
# src/video/video_driver.hpp
# src/video/win32_v.cpp
4 years ago
Jonathan G Rennison
b9332ee62c
Zstd: Change package status to recommended
4 years ago
dP
b284d34277
Add: Support Zstandard(zstd) savegame compression
...
(cherry picked from commit 6f0aeaf2c5436550c93205e704624957e9abc969)
4 years ago
glx22
b67245d71e
Fix: [CMake] CMake may use || at the end of custom commands
4 years ago
glx22
ec9d1a6b8f
Fix: [CMake] CMAKE_SOURCE_DIR may contain regex commands
4 years ago
Michael Lutz
9a069faa01
Codechange: [Win32] Try to get an OpenGL 3.2+ context if possible.
4 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
4 years ago
Owen Rudge
395e015282
Change: Convert .md to .rtf for Windows/Mac packages
4 years ago
glx22
2cbfcd2327
Change: [CMake] Bump minimum version to 3.9
4 years ago
Patric Stout
9322b40df1
Fix: [CMake] our allegro drivers use v4, so skip v5 if found ( #8653 )
...
On some distros allegro v5 is called allegro-5, but on some others
it is not. So this should fix for all distros that allegro v5 is
not being picked up, and only v4 is.
4 years ago
glx22
99448eedca
Fix: [CMake] os/windows/openttd.manifest is not a generated file
4 years ago
Patric Stout
05df7996a4
Feature: [Actions / CMake] support for generic linux builds ( #8641 )
...
These bundles can be opened on any "modern" Linux machine with
a driver that SDL2 supports.
Machines needs at least glibc 2.15, which was released 10 years ago.
It is build with CentOS 7 as base, and only assumes the following
libraries are available on the system:
- libc
- libdl
- libgcc_s
- libpthread
- librt
- libstdc++
All other libraries the game depends on are bundled together with
the game, so users don't need any library installed to use this
bundle. The downside of course is that this increases the binary
size a bit: 30 MiB of libraries are in this bundle.
RPATH is used to make ld-linux find the folder libraries are
stored in; however, system libraries are always used before these,
in the assumption libraries on the user system are more up-to-date.
Using -DOPTION_PACKAGE_DEPENDENCIES=ON switches on packaging
of libraries in the "lib" folder. This requires CMake 3.16 to
be installed; otherwise it will fail.
4 years ago
Jonathan G Rennison
7154f8859d
Merge tag '1.11.0-beta1' into jgrpp
...
# Conflicts:
# src/console_cmds.cpp
# src/gfx_func.h
# src/industry.h
# src/lang/czech.txt
# src/lang/estonian.txt
# src/lang/german.txt
# src/lang/indonesian.txt
# src/lang/japanese.txt
# src/lang/norwegian_bokmal.txt
# src/lang/russian.txt
# src/lang/slovak.txt
# src/saveload/saveload.h
# src/station_gui.cpp
# src/town_gui.cpp
# src/vehicle_gui.cpp
# src/video/sdl2_v.cpp
# src/waypoint_gui.cpp
4 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
4 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
4 years ago
Jonathan G Rennison
39df1c49a1
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/fileio.cpp
# src/group_gui.cpp
# src/industry.h
# src/lang/korean.txt
# src/linkgraph/linkgraphjob.cpp
# src/linkgraph/linkgraphjob.h
# src/linkgraph/linkgraphschedule.cpp
# src/linkgraph/linkgraphschedule.h
# src/openttd.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/town_cmd.cpp
# src/vehicle_gui.cpp
# src/vehicle_gui_base.h
4 years ago
Jonathan G Rennison
cb69611248
Merge branch 'master' into jgrpp
...
# Conflicts:
# .github/changelog.sh
# cmake/PackageDeb.cmake
# src/network/network_client.cpp
# src/settings_gui.cpp
4 years ago
Jonathan G Rennison
43980639de
Merge branch 'master' into jgrpp
...
# Conflicts:
# .gitignore
# CMakeLists.txt
# src/3rdparty/optional/optional.hpp
# src/group_cmd.cpp
# src/industry_cmd.cpp
# src/misc_gui.cpp
# src/video/sdl2_v.cpp
4 years ago
Owen Rudge
a2bd0a14e1
Feature: [Actions] ARM64 builds for Windows
4 years ago
Owen Rudge
2d9e164ec4
Fix: [Actions] Give Universal Mac packages the "universal" suffix
4 years ago
Owen Rudge
0a129bc810
Change: Label Mac builds as "macos" instead of "macosx"
4 years ago
glx22
97d554feb1
Codechange: On regression failure, output the result in a file
4 years ago
Owen Rudge
bbc96fd37c
Fix: Don't add -mno-sse4 on arm64
4 years ago
Michael Lutz
21a45168bd
Codechange: [OSX] CMake source group for OSX files.
...
This separates the OSX specific files into a proper folder when generating
Xcode project files.
4 years ago
Charles Pigott
10090d0ac6
Add: [CMake] Explicitly support txz for Arch Linux
4 years ago
Charles Pigott
3dfee979a7
Codechange: Drop libxdg-basedir dependency in favour of finding the directories ourselves
4 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.
4 years ago
Jonathan G Rennison
483ed2f468
Merge branch 'master' into jgrpp
...
# Conflicts:
# .github/workflows/ci-build.yml
# .github/workflows/commit-checker.yml
# src/openttd.cpp
4 years ago
Patric Stout
0c3ddc5436
Fix: support non-ubuntu/debian Linux variants with LSB support ( #8408 )
...
This now generates a warning, as we would still like people to
make a Pull Request to support the target. But it does continue
with packing to a txz.
4 years ago
Patric Stout
2df182748c
Fix: [CMake] automatically detect dependencies for .deb packages
4 years ago
Patric Stout
6228dde3da
Fix: [bundle] postfix the distribution for Linux bundles
4 years ago
Patric Stout
b8217610ce
Fix: [bundle] postfix the architecture for Mac OS bundles
...
This in preparation for other architectures, like arm64.
4 years ago
Patric Stout
7cdf7c7ca0
Fix: [bundle] custom launch.sh is no longer required for Mac OS
...
Co-authored-by: Owen Rudge <owen@owenrudge.net>
4 years ago
Patric Stout
d15dc9f40f
Add: support for emscripten (play-OpenTTD-in-the-browser)
...
Emscripten compiles to WASM, which can be loaded via
HTML / JavaScript. This allows you to play OpenTTD inside a
browser.
Co-authored-by: milek7 <me@milek7.pl>
4 years ago
Owen Rudge
b14e3b9b9d
Feature: Switch to bzip2 compression for DMG files (supported by OS X 10.4+)
4 years ago
glx22
d1fa6b129c
Add: [CMake] Option to only build tools/docs
4 years ago
Michael Lutz
a660dce295
Fix: [CMake, MSVC] Don't copy regression exe's into a subfolder as they need have their lang files next to them.
4 years ago
glx22
6fae0b83d9
Add: [CMake] targets to generate documentation
4 years ago
Jonathan G Rennison
4da3cfcf56
Merge branch 'master' into jgrpp
...
# Conflicts:
# CMakeLists.txt
# src/bootstrap_gui.cpp
4 years ago
glx22
a06fe8e8a7
Fix: [CMake] cross-compiling requires native tools
4 years ago
Jonathan G Rennison
55fae045b1
Merge branch 'master' into jgrpp
4 years ago
Charles Pigott
0a9aed0522
Fix: [CMake] Don't detect XAudio2 if defines are missing
4 years ago
Jonathan G Rennison
940b5e7a2f
Merge branch 'master' into jgrpp
4 years ago
Jonathan G Rennison
fcb2f7087f
CMake: Fix inconsistent use of modified suffix in FindVersion
4 years ago
Jonathan G Rennison
381313aa8a
CMake: Use fixed commit hash abbreviation length in FindVersion
4 years ago
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
4 years ago
Jonathan G Rennison
d85a529f87
Merge branch 'master' into jgrpp
4 years ago
Charles Pigott
a0307652f3
Fix: Work around cmake bug by stripping link target strings
4 years ago