Skip to content

Commit 060d0f1

Browse files
Goober5000Goober5000
authored
Merge branch 'scp-fs2open:master' into master
2 parents 27d3375 + 8e64845 commit 060d0f1

714 files changed

Lines changed: 23210 additions & 23992 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/build-nightly.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
arch: arm64
2222
name: Linux
2323
runs-on: ${{ matrix.os }}
24-
container: ghcr.io/scp-fs2open/linux_build:sha-1ff82e8
24+
container: ghcr.io/scp-fs2open/linux_build:sha-71099c9
2525
steps:
2626
- uses: actions/checkout@v1
2727
name: Checkout
@@ -104,7 +104,7 @@ jobs:
104104
arch: [Win32, x64]
105105
simd: [SSE2]
106106
name: Windows
107-
runs-on: windows-2019
107+
runs-on: windows-2022
108108
steps:
109109
- uses: actions/checkout@v1
110110
name: Checkout
@@ -155,13 +155,13 @@ jobs:
155155
-DFSO_USE_VOICEREC="ON" -DFORCED_SIMD_INSTRUCTIONS="$SIMD" \
156156
-DFSO_BUILD_QTFRED=OFF -DFSO_BUILD_TESTS=ON \
157157
-DFSO_INSTALL_DEBUG_FILES="ON" -DFSO_BUILD_WITH_VULKAN="OFF" -A "$ARCHITECTURE" \
158-
-G "Visual Studio 16 2019" -T "v142" ..
158+
-G "Visual Studio 17 2022" -T "v143" -DCMAKE_BUILD_TYPE=$CONFIGURATION ..
159159
else
160160
cmake -DCMAKE_INSTALL_PREFIX="$(pwd)/install" -DFSO_USE_SPEECH="ON" \
161161
-DFSO_USE_VOICEREC="ON" -DFORCED_SIMD_INSTRUCTIONS="$SIMD" \
162162
-DFSO_BUILD_QTFRED=OFF -DFSO_BUILD_TESTS=ON \
163163
-DFSO_INSTALL_DEBUG_FILES="ON" -A "$ARCHITECTURE" \
164-
-G "Visual Studio 16 2019" -T "v142" ..
164+
-G "Visual Studio 17 2022" -T "v143" -DCMAKE_BUILD_TYPE=$CONFIGURATION ..
165165
fi
166166
- name: Compile
167167
working-directory: ./build

‎.github/workflows/build-release.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
name: Linux
5151
needs: create_release # Don't run this job until create_release is done and successful
5252
runs-on: ${{ matrix.os }}
53-
container: ghcr.io/scp-fs2open/linux_build:sha-1ff82e8
53+
container: ghcr.io/scp-fs2open/linux_build:sha-71099c9
5454
steps:
5555
- uses: actions/checkout@v1
5656
# checks-out your repository under $GITHUB_WORKSPACE, so your workflow can access it.
@@ -155,7 +155,7 @@ jobs:
155155
simd: [SSE2, AVX]
156156
needs: create_release
157157
name: Windows
158-
runs-on: windows-2019
158+
runs-on: windows-2022
159159
steps:
160160
- uses: actions/checkout@v1
161161
# Checkout repo
@@ -211,13 +211,13 @@ jobs:
211211
-DFSO_USE_VOICEREC="ON" -DFORCED_SIMD_INSTRUCTIONS="$SIMD" \
212212
-DFSO_BUILD_QTFRED=OFF -DFSO_BUILD_TESTS=ON \
213213
-DFSO_INSTALL_DEBUG_FILES="ON" -DFSO_BUILD_WITH_VULKAN="OFF" -A "$ARCHITECTURE" \
214-
-G "Visual Studio 16 2019" -T "v142" ..
214+
-G "Visual Studio 17 2022" -T "v143" -DCMAKE_BUILD_TYPE=$CONFIGURATION ..
215215
else
216216
cmake -DCMAKE_INSTALL_PREFIX="$(pwd)/install" -DFSO_USE_SPEECH="ON" \
217217
-DFSO_USE_VOICEREC="ON" -DFORCED_SIMD_INSTRUCTIONS="$SIMD" \
218218
-DFSO_BUILD_QTFRED=OFF -DFSO_BUILD_TESTS=ON \
219219
-DFSO_INSTALL_DEBUG_FILES="ON" -A "$ARCHITECTURE" \
220-
-G "Visual Studio 16 2019" -T "v142" ..
220+
-G "Visual Studio 17 2022" -T "v143" -DCMAKE_BUILD_TYPE=$CONFIGURATION ..
221221
fi
222222
- name: Compile
223223
working-directory: ./build

‎.github/workflows/build-test.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
configuration: [FastDebug, Release]
1616
name: Linux
1717
runs-on: ubuntu-latest
18-
container: ghcr.io/scp-fs2open/linux_build:sha-1ff82e8
18+
container: ghcr.io/scp-fs2open/linux_build:sha-71099c9
1919
steps:
2020
- uses: actions/checkout@v1
2121
name: Checkout
@@ -96,7 +96,7 @@ jobs:
9696
arch: [Win32, x64]
9797
simd: [SSE2]
9898
name: Windows
99-
runs-on: windows-2019
99+
runs-on: windows-2022
100100
steps:
101101
- uses: actions/checkout@v1
102102
name: Checkout
@@ -153,13 +153,13 @@ jobs:
153153
-DFSO_USE_VOICEREC="ON" -DFORCED_SIMD_INSTRUCTIONS="$SIMD" \
154154
-DFSO_BUILD_QTFRED=OFF -DFSO_BUILD_TESTS=ON \
155155
-DFSO_INSTALL_DEBUG_FILES="ON" -DFSO_BUILD_WITH_VULKAN="OFF" -A "$ARCHITECTURE" \
156-
-G "Visual Studio 16 2019" -T "v142" ..
156+
-G "Visual Studio 17 2022" -T "v143" -DCMAKE_BUILD_TYPE=$CONFIGURATION ..
157157
else
158158
cmake -DCMAKE_INSTALL_PREFIX="$(pwd)/install" -DFSO_USE_SPEECH="ON" \
159159
-DFSO_USE_VOICEREC="ON" -DFORCED_SIMD_INSTRUCTIONS="$SIMD" \
160160
-DFSO_BUILD_QTFRED=OFF -DFSO_BUILD_TESTS=ON \
161161
-DFSO_INSTALL_DEBUG_FILES="ON" -A "$ARCHITECTURE" \
162-
-G "Visual Studio 16 2019" -T "v142" ..
162+
-G "Visual Studio 17 2022" -T "v143" -DCMAKE_BUILD_TYPE=$CONFIGURATION ..
163163
fi
164164
- name: Compile
165165
working-directory: ./build

‎.github/workflows/cache-master.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
cmake_options: -DFSO_BUILD_WITH_OPENGL=OFF -DFSO_BUILD_WITH_VULKAN=OFF
2626
name: Linux
2727
runs-on: ubuntu-latest
28-
container: ghcr.io/scp-fs2open/linux_build:sha-1ff82e8
28+
container: ghcr.io/scp-fs2open/linux_build:sha-71099c9
2929
steps:
3030
- uses: actions/checkout@v1
3131
name: Checkout

‎.github/workflows/test-pull_request.yaml‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,15 @@ jobs:
2020
- configuration: Release
2121
compiler: gcc-13
2222
cmake_options: -DFSO_BUILD_WITH_OPENGL=OFF -DFSO_BUILD_WITH_VULKAN=OFF
23+
- configuration: Debug
24+
compiler: gcc-13
25+
cmake_options: -DFSO_BUILD_WITH_OPENGL=OFF -DFSO_BUILD_WITH_VULKAN=ON
26+
- configuration: Release
27+
compiler: gcc-13
28+
cmake_options: -DFSO_BUILD_WITH_OPENGL=OFF -DFSO_BUILD_WITH_VULKAN=ON
2329
name: Linux
2430
runs-on: ubuntu-latest
25-
container: ghcr.io/scp-fs2open/linux_build:sha-1ff82e8
31+
container: ghcr.io/scp-fs2open/linux_build:sha-71099c9
2632
steps:
2733
- uses: actions/checkout@v1
2834
name: Checkout
@@ -70,11 +76,11 @@ jobs:
7076
build_windows:
7177
strategy:
7278
matrix:
73-
configuration: [Debug, Release]
79+
configuration: [Debug, FastDebug, Release]
7480
compiler: [MSVC]
7581
arch: [Win32, x64]
7682
name: Windows
77-
runs-on: windows-2019
83+
runs-on: windows-2022
7884
steps:
7985
- name: Prepare Environment
8086
run: choco install ninja
@@ -133,12 +139,12 @@ jobs:
133139
else
134140
if [ "$ARCHITECTURE" = "Win32" ]; then
135141
cmake -DFSO_USE_SPEECH="ON" -DFSO_FATAL_WARNINGS="ON" -DFSO_USE_VOICEREC="OFF" -DFSO_BUILD_TESTS="ON" \
136-
-DFORCED_SIMD_INSTRUCTIONS=SSE2 -DFSO_BUILD_FRED2="ON" -DFSO_BUILD_WITH_VULKAN="OFF" -G "Visual Studio 16 2019" \
137-
-DFSO_BUILD_QTFRED=OFF -T "v142" -A "$ARCHITECTURE" ..
142+
-DFORCED_SIMD_INSTRUCTIONS=SSE2 -DFSO_BUILD_FRED2="ON" -DFSO_BUILD_WITH_VULKAN="OFF" -G "Visual Studio 17 2022" \
143+
-DFSO_BUILD_QTFRED=OFF -T "v143" -A "$ARCHITECTURE" -DCMAKE_BUILD_TYPE=$CONFIGURATION ..
138144
else
139145
cmake -DFSO_USE_SPEECH="ON" -DFSO_FATAL_WARNINGS="ON" -DFSO_USE_VOICEREC="OFF" -DFSO_BUILD_TESTS="ON" \
140-
-DFORCED_SIMD_INSTRUCTIONS=SSE2 -DFSO_BUILD_FRED2="ON" -G "Visual Studio 16 2019" \
141-
-DFSO_BUILD_QTFRED=OFF -T "v142" -A "$ARCHITECTURE" ..
146+
-DFORCED_SIMD_INSTRUCTIONS=SSE2 -DFSO_BUILD_FRED2="ON" -G "Visual Studio 17 2022" \
147+
-DFSO_BUILD_QTFRED=OFF -T "v143" -A "$ARCHITECTURE" -DCMAKE_BUILD_TYPE=$CONFIGURATION ..
142148
fi
143149
fi
144150
- name: Compile

‎.github/workflows/weekly-coverity-scan.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
name: Build FSO With Coverity Wrapper
2121
if: github.repository == 'scp-fs2open/fs2open.github.com'
2222
runs-on: ${{ matrix.config.os }}
23-
container: ghcr.io/scp-fs2open/linux_build:sha-1ff82e8
23+
container: ghcr.io/scp-fs2open/linux_build:sha-71099c9
2424
strategy:
2525
fail-fast: false
2626
matrix:

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ _ReSharper*/
4242

4343
#Project files
4444
[Bb]uild/
45+
[Oo]ut/
4546

4647
#Subversion files
4748
.svn

‎CMakeLists.txt‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
CMAKE_MINIMUM_REQUIRED(VERSION 3.9)
2+
CMAKE_MINIMUM_REQUIRED(VERSION 3.21)
33
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
44

55
# Make sure the source and binary directory are not the sample
@@ -8,12 +8,12 @@ if ("${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
88
endif()
99

1010
include(cmake/util.cmake)
11-
include(cmake/embed_file.cmake)
1211

1312
# Set a few policies
1413
set_policy(CMP0051 NEW)
1514
set_policy(CMP0053 NEW)
1615
set_policy(CMP0054 NEW)
16+
set_policy(CMP0091 NEW) # Enable use of CMAKE_MSVC_RUNTIME_LIBRARY
1717

1818
SET(FSO_PROJECT_DESCRIPTION "Open source project based on the original FreeSpace 2 source code.")
1919

@@ -47,11 +47,6 @@ endif()
4747

4848
PROJECT(FS2_Open LANGUAGES ${FSO_LANGUAGES})
4949

50-
IF(CMAKE_CROSSCOMPILING)
51-
SET(IMPORT_EXE_DIR "IMPORT_EXE_DIR-NOTFOUND" CACHE FILEPATH "Required for a cross compiling build, point to binary directory of a cmake build for the real OS")
52-
INCLUDE(${IMPORT_EXE_DIR}/ImportExecutables.cmake)
53-
ENDIF(CMAKE_CROSSCOMPILING)
54-
5550
# Check if the external modules exists
5651
IF(NOT IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/cmake/external/rpavlik-cmake-modules/launcher-templates")
5752
message(FATAL_ERROR "External submodules could not be found. Please make sure you have updated your submodules.")
@@ -62,6 +57,10 @@ LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/finder")
6257
LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/external/rpavlik-cmake-modules")
6358
LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/external/cotire")
6459

60+
INCLUDE(globals)
61+
INCLUDE(toolchain)
62+
include(embed_file)
63+
6564
IF(RESET_INSTALL_PREFIX)
6665
IF(NOT $ENV{FS2PATH} STREQUAL "")
6766
IF(NOT IS_DIRECTORY $ENV{FS2PATH})
@@ -161,11 +160,6 @@ mark_as_advanced(FORCE FSO_BUILD_WITH_VULKAN)
161160
mark_as_advanced(FORCE FSO_BUILD_WITH_OPENXR)
162161
mark_as_advanced(FORCE FSO_BUILD_WITH_OPENXR_DEBUG)
163162

164-
# Include cotire file from https://github.com/sakra/cotire/
165-
include(cotire)
166-
167-
INCLUDE(globals)
168-
INCLUDE(toolchain)
169163
INCLUDE(platforms)
170164
include(version)
171165

‎ci/linux/clang_tidy.sh‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,13 @@ fi
1818
# branch
1919
BASE_COMMIT=$(git merge-base $1 $2)
2020

21+
# Note: Manually passing in the Vulkan flags that are normally provided by cmake (but are not so, here), to ensure
22+
# that the source files are checked with the actual configuration used.
2123
echo "Running clang-tidy on changed files"
2224
git diff -U0 --no-color "$BASE_COMMIT..$2" | \
2325
$HERE/clang-tidy-diff.py -path "$(pwd)/build" -p1 \
24-
-regex '(code(?!((\/graphics\/shaders\/compiled)|(\/globalincs\/windebug)))|freespace2|qtfred|test|build|tools)\/.*\.(cpp|h)' \
26+
-extra-arg="-DWITH_VULKAN" \
27+
-extra-arg="-DVULKAN_HPP_DISPATCH_LOADER_DYNAMIC=1" \
28+
-extra-arg="-DVK_NO_PROTOTYPES" \
29+
-regex '(code(?!((\/graphics\/shaders\/compiled)|(\/globalincs\/windebug)))|freespace2|qtfred|test\/src|build|tools)\/.*\.(cpp|h)' \
2530
-clang-tidy-binary /usr/bin/clang-tidy-16 -j$(nproc) -export-fixes "$(pwd)/clang-fixes.yaml"

‎ci/post/requirements.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
Mako==1.2.2
2-
requests==2.32.0
2+
requests==2.32.4
33
semantic-version==2.8.5

0 commit comments

Comments
 (0)