dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/cheat_gui.cpp
#	src/main_gui.cpp
#	src/network/network_gui.cpp
#	src/saveload/saveload.h
#	src/smallmap_gui.cpp
#	src/station_cmd.cpp
#	src/timetable_cmd.cpp
#	src/toolbar_gui.cpp
#	src/widget.cpp
#	src/widget_type.h
#	src/widgets/dropdown_type.h
This commit is contained in:
Jonathan G Rennison
2023-11-25 14:02:04 +00:00
parent 7fb369c732 2d3fef3113
commit 21b49a213e
100 changed files with 450 additions and 655 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/release-linux.yml vendored
View File

@@ -103,6 +103,9 @@ jobs:
cd /vcpkg
./bootstrap-vcpkg.sh -disableMetrics
# Once installed (and cached) a package will never be upgraded unless we do it ourselves.
./vcpkg upgrade --no-dry-run
# Make Python3 available for other packages.
./vcpkg install python3
ln -sf $(pwd)/installed/x64-linux/tools/python3/python3.[0-9][0-9] /usr/bin/python3