Skip to content

Commit 905f43a

Browse files
Vishrut2403Vishrut2403
authored
Merge branch 'PCSX2:master' into feature/vibration-osd
2 parents 19a5a7e + c1aa19c commit 905f43a

140 files changed

Lines changed: 1836 additions & 35885 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/scripts/linux/build-dependencies-qt.sh‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,14 @@ LIBJPEGTURBO=3.1.3
2929
LIBPNG=1.6.55
3030
LIBWEBP=1.6.0
3131
NVENC=13.0.19.0
32-
SDL=SDL3-3.4.2
32+
SDL=SDL3-3.4.4
3333
LZ4=1.10.0
3434
VULKAN=1.4.328.1
3535
ZSTD=1.5.7
3636
KDDOCKWIDGETS=2.4.0
3737
PLUTOVG=1.3.2
3838
PLUTOSVG=0.0.7
39+
RAPIDYAML=0.11.1
3940

4041
SHADERC=2026.1
4142
SHADERC_GLSLANG=f0bd0257c308b9a26562c1a30c4748a0219cc951
@@ -63,7 +64,7 @@ b2751fccb6cc4c77708113cd78b561059b6fa904b24162fa0be2d60273d27b8e ffmpeg-$FFMPEG
6364
075920b826834ac4ddf97661cc73491047855859affd671d52079c6867c1c6c0 libjpeg-turbo-$LIBJPEGTURBO.tar.gz
6465
d925722864837ad5ae2a82070d4b2e0603dc72af44bd457c3962298258b8e82d libpng-$LIBPNG.tar.xz
6566
e4ab7009bf0629fd11982d4c2aa83964cf244cffba7347ecd39019a9e38c4564 libwebp-$LIBWEBP.tar.gz
66-
ef39a2e3f9a8a78296c40da701967dd1b0d0d6e267e483863ce70f8a03b4050c $SDL.tar.gz
67+
ee712dbe6a89bb140bbfc2ce72358fb5ee5cc2240abeabd54855012db30b3864 $SDL.tar.gz
6768
017c06f75ffed25f6cda9b5369ec6da0ac35a6616adf7abe4222516a0237f37a libpng-$LIBPNG-apng.patch.gz
6869
537512904744b35e232912055ccf8ec66d768639ff3abe5788d90d792ec5f48b lz4-$LZ4.tar.gz
6970
13da39edb3a40ed9713ae390ca89faa2f1202c9dda869ef306a8d4383e242bee nv-codec-headers-$NVENC.tar.gz
@@ -72,6 +73,7 @@ eb33e51f49a15e023950cd7825ca74a4a2b43db8354825ac24fc1b7ee09e6fa3 zstd-$ZSTD.tar
7273
51dbf24fe72e43dd7cb9a289d3cab47112010f1a2ed69b6fc8ac0dff31991ed2 KDDockWidgets-$KDDOCKWIDGETS.tar.gz
7374
7bd4e79ce18b1d47517e7e91fbb7cf19d4f01942804a519bc7c0bf32b6325dd5 plutovg-$PLUTOVG.tar.gz
7475
78561b571ac224030cdc450ca2986b4de915c2ba7616004a6d71a379bffd15f3 plutosvg-$PLUTOSVG.tar.gz
76+
9d9938269adc25e9a9b84650338b87d130cf469d82685fffc028c325279619c1 rapidyaml-$RAPIDYAML-src.tgz
7577
7678
245002feccbe7f8361b223545a5654cea69780745886872d7efff50a38d96c66 shaderc-$SHADERC.tar.gz
7779
bd58dca4dac67dcf7640292d7d63e0416274d40ee2200f7301878cec11ac6647 shaderc-glslang-$SHADERC_GLSLANG.tar.gz
@@ -107,7 +109,8 @@ if ! shasum -sa 256 --check SHASUMS 2> /dev/null; then
107109
-O "https://github.com/KhronosGroup/SPIRV-Tools/archive/$SHADERC_SPIRVTOOLS/shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz" \
108110
-O "https://github.com/KDAB/KDDockWidgets/archive/v$KDDOCKWIDGETS/KDDockWidgets-$KDDOCKWIDGETS.tar.gz" \
109111
-O "https://github.com/sammycage/plutovg/archive/v$PLUTOVG/plutovg-$PLUTOVG.tar.gz" \
110-
-O "https://github.com/sammycage/plutosvg/archive/v$PLUTOSVG/plutosvg-$PLUTOSVG.tar.gz"
112+
-O "https://github.com/sammycage/plutosvg/archive/v$PLUTOSVG/plutosvg-$PLUTOSVG.tar.gz" \
113+
-O "https://github.com/biojppm/rapidyaml/releases/download/v$RAPIDYAML/rapidyaml-$RAPIDYAML-src.tgz"
111114
fi
112115

113116
shasum -a 256 --check --strict SHASUMS
@@ -236,7 +239,7 @@ echo "Building SDL..."
236239
rm -fr "$SDL"
237240
tar xf "$SDL.tar.gz"
238241
cd "$SDL"
239-
cmake -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -DSDL_SHARED=ON -DSDL_STATIC=OFF -DSDL_X11_XSCRNSAVER=OFF -DSDL_TESTS=OFF -G Ninja
242+
cmake -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -DSDL_SHARED=ON -DSDL_STATIC=OFF -DSDL_VIDEO=OFF -DSDL_POWER=OFF -DSDL_SENSOR=OFF -DSDL_DIALOG=OFF -DSDL_TRAY=OFF -DSDL_TEST_LIBRARY=OFF -DSDL_UNIX_CONSOLE_BUILD=ON -G Ninja
240243
cmake --build build --parallel
241244
ninja -C build install
242245
cd ..
@@ -349,6 +352,15 @@ cmake --build build --parallel
349352
ninja -C build install
350353
cd ..
351354

355+
echo "Building RapidYAML..."
356+
rm -fr "rapidyaml-$RAPIDYAML-src"
357+
tar xf "rapidyaml-$RAPIDYAML-src.tgz"
358+
cd "rapidyaml-$RAPIDYAML-src"
359+
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -B build -G Ninja
360+
cmake --build build --parallel
361+
ninja -C build install
362+
cd ..
363+
352364
echo "Building shaderc..."
353365
rm -fr "shaderc-$SHADERC"
354366
tar xf "shaderc-$SHADERC.tar.gz"

‎.github/workflows/scripts/linux/build-dependencies-runner.sh‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ LZ4=1.10.0
2424
ZSTD=1.5.7
2525
PLUTOVG=1.3.2
2626
PLUTOSVG=0.0.7
27+
RAPIDYAML=0.11.1
2728

2829
SHADERC=2025.4
2930
SHADERC_GLSLANG=7a47e2531cb334982b2a2dd8513dca0a3de4373d
@@ -49,6 +50,7 @@ c693867f10a7760ef1bcf85419d51783586768cc2c601d03841bc6a8b2554b9c shaderc-spirv-
4950
06b0a042f2e121e954badb4fd78c9e2d4bc7ed6087eceb26ab559c23cf94334f shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz
5051
7bd4e79ce18b1d47517e7e91fbb7cf19d4f01942804a519bc7c0bf32b6325dd5 plutovg-$PLUTOVG.tar.gz
5152
78561b571ac224030cdc450ca2986b4de915c2ba7616004a6d71a379bffd15f3 plutosvg-$PLUTOSVG.tar.gz
53+
9d9938269adc25e9a9b84650338b87d130cf469d82685fffc028c325279619c1 rapidyaml-$RAPIDYAML-src.tgz
5254
EOF
5355

5456
if ! shasum -sa 256 --check SHASUMS 2> /dev/null; then
@@ -67,7 +69,8 @@ if ! shasum -sa 256 --check SHASUMS 2> /dev/null; then
6769
-O "https://github.com/KhronosGroup/SPIRV-Headers/archive/$SHADERC_SPIRVHEADERS/shaderc-spirv-headers-$SHADERC_SPIRVHEADERS.tar.gz" \
6870
-O "https://github.com/KhronosGroup/SPIRV-Tools/archive/$SHADERC_SPIRVTOOLS/shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz" \
6971
-O "https://github.com/sammycage/plutovg/archive/v$PLUTOVG/plutovg-$PLUTOVG.tar.gz" \
70-
-O "https://github.com/sammycage/plutosvg/archive/v$PLUTOSVG/plutosvg-$PLUTOSVG.tar.gz"
72+
-O "https://github.com/sammycage/plutosvg/archive/v$PLUTOSVG/plutosvg-$PLUTOSVG.tar.gz" \
73+
-O "https://github.com/biojppm/rapidyaml/releases/download/v$RAPIDYAML/rapidyaml-$RAPIDYAML-src.tgz"
7174
fi
7275

7376
shasum -a 256 --check --strict SHASUMS
@@ -152,7 +155,7 @@ echo "Building SDL..."
152155
rm -fr "$SDL"
153156
tar xf "$SDL.tar.gz"
154157
cd "$SDL"
155-
cmake -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -DSDL_SHARED=ON -DSDL_STATIC=OFF -G Ninja
158+
cmake -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -DSDL_SHARED=ON -DSDL_STATIC=OFF -DSDL_VIDEO=OFF -DSDL_POWER=OFF -DSDL_SENSOR=OFF -DSDL_DIALOG=OFF -DSDL_TRAY=OFF -DSDL_TEST_LIBRARY=OFF -DSDL_UNIX_CONSOLE_BUILD=ON -G Ninja
156159
cmake --build build --parallel
157160
ninja -C build install
158161
cd ..
@@ -175,6 +178,15 @@ cmake --build build --parallel
175178
ninja -C build install
176179
cd ..
177180

181+
echo "Building RapidYAML..."
182+
rm -fr "rapidyaml-$RAPIDYAML-src"
183+
tar xf "rapidyaml-$RAPIDYAML-src.tgz"
184+
cd "rapidyaml-$RAPIDYAML-src"
185+
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -B build -G Ninja
186+
cmake --build build --parallel
187+
ninja -C build install
188+
cd ..
189+
178190
echo "Building shaderc..."
179191
rm -fr "shaderc-$SHADERC"
180192
tar xf "shaderc-$SHADERC.tar.gz"

‎.github/workflows/scripts/linux/flatpak/modules/20-sdl3.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
"sources": [
1515
{
1616
"type": "archive",
17-
"url": "https://libsdl.org/release/SDL3-3.4.2.tar.gz",
18-
"sha256": "ef39a2e3f9a8a78296c40da701967dd1b0d0d6e267e483863ce70f8a03b4050c"
17+
"url": "https://libsdl.org/release/SDL3-3.4.4.tar.gz",
18+
"sha256": "ee712dbe6a89bb140bbfc2ce72358fb5ee5cc2240abeabd54855012db30b3864"
1919
}
2020
],
2121
"cleanup": [

‎.github/workflows/scripts/linux/flatpak/modules/28-rapidyaml.json‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"name": "rapidyaml",
3+
"buildsystem": "cmake-ninja",
4+
"builddir": true,
5+
"config-opts": [
6+
"-DBUILD_SHARED_LIBS=ON"
7+
],
8+
"build-options": {
9+
"strip": true
10+
},
11+
"sources": [
12+
{
13+
"type": "git",
14+
"url": "https://github.com/biojppm/rapidyaml.git",
15+
"tag": "v0.11.1",
16+
"commit": "119b6042064d3828819e428e32e5a0f3035d5643"
17+
}
18+
],
19+
"cleanup": [
20+
"/include",
21+
"/lib/cmake"
22+
]
23+
}

‎.github/workflows/scripts/linux/flatpak/net.pcsx2.PCSX2.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
"modules/25-plutosvg.json",
3636
"modules/26-libpng.json",
3737
"modules/27-qtapng.json",
38+
"modules/28-rapidyaml.json",
3839
{
3940
"name": "pcsx2",
4041
"buildsystem": "cmake-ninja",
@@ -79,4 +80,3 @@
7980
}
8081
]
8182
}
82-

‎.github/workflows/scripts/macos/build-dependencies-universal.sh‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ QTAPNG=1.3.0
4848

4949
FREETYPE=2.14.1
5050
HARFBUZZ=13.0.0
51-
SDL=SDL3-3.4.2
51+
SDL=SDL3-3.4.4
5252
ZSTD=1.5.7
5353
LZ4=1.10.0
5454
LIBPNG=1.6.55
@@ -59,6 +59,7 @@ MOLTENVK=1.4.1
5959
KDDOCKWIDGETS=2.4.0
6060
PLUTOVG=1.3.2
6161
PLUTOSVG=0.0.7
62+
RAPIDYAML=0.11.1
6263

6364
SHADERC=2026.1
6465
SHADERC_GLSLANG=f0bd0257c308b9a26562c1a30c4748a0219cc951
@@ -93,7 +94,7 @@ f1d3be3489f758efe1a8f12118a212febbe611aa670af32e0159fa3c1feab2a6 QtApng-$QTAPNG
9394
9495
32427e8c471ac095853212a37aef816c60b42052d4d9e48230bab3bdf2936ccc freetype-$FREETYPE.tar.xz
9596
207f96964dc9475b13c1f66565bf145d2658089d65b4cf786d351da2857fc269 harfbuzz-$HARFBUZZ.tar.gz
96-
ef39a2e3f9a8a78296c40da701967dd1b0d0d6e267e483863ce70f8a03b4050c $SDL.tar.gz
97+
ee712dbe6a89bb140bbfc2ce72358fb5ee5cc2240abeabd54855012db30b3864 $SDL.tar.gz
9798
eb33e51f49a15e023950cd7825ca74a4a2b43db8354825ac24fc1b7ee09e6fa3 zstd-$ZSTD.tar.gz
9899
537512904744b35e232912055ccf8ec66d768639ff3abe5788d90d792ec5f48b lz4-$LZ4.tar.gz
99100
d925722864837ad5ae2a82070d4b2e0603dc72af44bd457c3962298258b8e82d libpng-$LIBPNG.tar.xz
@@ -105,6 +106,7 @@ b2751fccb6cc4c77708113cd78b561059b6fa904b24162fa0be2d60273d27b8e ffmpeg-$FFMPEG
105106
51dbf24fe72e43dd7cb9a289d3cab47112010f1a2ed69b6fc8ac0dff31991ed2 KDDockWidgets-$KDDOCKWIDGETS.tar.gz
106107
7bd4e79ce18b1d47517e7e91fbb7cf19d4f01942804a519bc7c0bf32b6325dd5 plutovg-$PLUTOVG.tar.gz
107108
78561b571ac224030cdc450ca2986b4de915c2ba7616004a6d71a379bffd15f3 plutosvg-$PLUTOSVG.tar.gz
109+
9d9938269adc25e9a9b84650338b87d130cf469d82685fffc028c325279619c1 rapidyaml-$RAPIDYAML-src.tgz
108110
109111
245002feccbe7f8361b223545a5654cea69780745886872d7efff50a38d96c66 shaderc-$SHADERC.tar.gz
110112
bd58dca4dac67dcf7640292d7d63e0416274d40ee2200f7301878cec11ac6647 shaderc-glslang-$SHADERC_GLSLANG.tar.gz
@@ -137,7 +139,8 @@ if ! shasum -sa 256 --check SHASUMS 2> /dev/null; then
137139
-O "https://github.com/KhronosGroup/SPIRV-Tools/archive/$SHADERC_SPIRVTOOLS/shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz" \
138140
-O "https://github.com/KDAB/KDDockWidgets/archive/v$KDDOCKWIDGETS/KDDockWidgets-$KDDOCKWIDGETS.tar.gz" \
139141
-O "https://github.com/sammycage/plutovg/archive/v$PLUTOVG/plutovg-$PLUTOVG.tar.gz" \
140-
-O "https://github.com/sammycage/plutosvg/archive/v$PLUTOSVG/plutosvg-$PLUTOSVG.tar.gz"
142+
-O "https://github.com/sammycage/plutosvg/archive/v$PLUTOSVG/plutosvg-$PLUTOSVG.tar.gz" \
143+
-O "https://github.com/biojppm/rapidyaml/releases/download/v$RAPIDYAML/rapidyaml-$RAPIDYAML-src.tgz"
141144
fi
142145

143146
shasum -a 256 --check --strict SHASUMS
@@ -146,7 +149,7 @@ echo "Installing SDL..."
146149
rm -fr "$SDL"
147150
tar xf "$SDL.tar.gz"
148151
cd "$SDL"
149-
cmake -B build "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL" -DSDL_X11=OFF -DBUILD_SHARED_LIBS=ON
152+
cmake -B build "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL" -DSDL_VIDEO=OFF -DSDL_POWER=OFF -DSDL_SENSOR=OFF -DSDL_DIALOG=OFF -DSDL_TRAY=OFF -DSDL_TEST_LIBRARY=OFF -DBUILD_SHARED_LIBS=ON
150153
make -C build "-j$NPROCS"
151154
make -C build install
152155
cd ..
@@ -427,6 +430,15 @@ make -C build "-j$NPROCS"
427430
make -C build install
428431
cd ..
429432

433+
echo "Building RapidYAML..."
434+
rm -fr "rapidyaml-$RAPIDYAML-src"
435+
tar xf "rapidyaml-$RAPIDYAML-src.tgz"
436+
cd "rapidyaml-$RAPIDYAML-src"
437+
cmake "${CMAKE_COMMON[@]}" -DBUILD_SHARED_LIBS=ON -B build
438+
make -C build "-j$NPROCS"
439+
make -C build install
440+
cd ..
441+
430442
echo "Cleaning up..."
431443
cd ..
432444
rm -rf deps-build

‎.github/workflows/scripts/macos/build-dependencies.sh‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ QTAPNG=1.3.0
2525

2626
FREETYPE=2.14.1
2727
HARFBUZZ=13.0.0
28-
SDL=SDL3-3.4.2
28+
SDL=SDL3-3.4.4
2929
ZSTD=1.5.7
3030
LZ4=1.10.0
3131
LIBPNG=1.6.55
@@ -36,6 +36,7 @@ MOLTENVK=1.4.1
3636
KDDOCKWIDGETS=2.4.0
3737
PLUTOVG=1.3.2
3838
PLUTOSVG=0.0.7
39+
RAPIDYAML=0.11.1
3940

4041
SHADERC=2026.1
4142
SHADERC_GLSLANG=f0bd0257c308b9a26562c1a30c4748a0219cc951
@@ -69,7 +70,7 @@ f1d3be3489f758efe1a8f12118a212febbe611aa670af32e0159fa3c1feab2a6 QtApng-$QTAPNG
6970
7071
32427e8c471ac095853212a37aef816c60b42052d4d9e48230bab3bdf2936ccc freetype-$FREETYPE.tar.xz
7172
207f96964dc9475b13c1f66565bf145d2658089d65b4cf786d351da2857fc269 harfbuzz-$HARFBUZZ.tar.gz
72-
ef39a2e3f9a8a78296c40da701967dd1b0d0d6e267e483863ce70f8a03b4050c $SDL.tar.gz
73+
ee712dbe6a89bb140bbfc2ce72358fb5ee5cc2240abeabd54855012db30b3864 $SDL.tar.gz
7374
eb33e51f49a15e023950cd7825ca74a4a2b43db8354825ac24fc1b7ee09e6fa3 zstd-$ZSTD.tar.gz
7475
537512904744b35e232912055ccf8ec66d768639ff3abe5788d90d792ec5f48b lz4-$LZ4.tar.gz
7576
d925722864837ad5ae2a82070d4b2e0603dc72af44bd457c3962298258b8e82d libpng-$LIBPNG.tar.xz
@@ -81,6 +82,7 @@ b2751fccb6cc4c77708113cd78b561059b6fa904b24162fa0be2d60273d27b8e ffmpeg-$FFMPEG
8182
51dbf24fe72e43dd7cb9a289d3cab47112010f1a2ed69b6fc8ac0dff31991ed2 KDDockWidgets-$KDDOCKWIDGETS.tar.gz
8283
7bd4e79ce18b1d47517e7e91fbb7cf19d4f01942804a519bc7c0bf32b6325dd5 plutovg-$PLUTOVG.tar.gz
8384
78561b571ac224030cdc450ca2986b4de915c2ba7616004a6d71a379bffd15f3 plutosvg-$PLUTOSVG.tar.gz
85+
9d9938269adc25e9a9b84650338b87d130cf469d82685fffc028c325279619c1 rapidyaml-$RAPIDYAML-src.tgz
8486
8587
245002feccbe7f8361b223545a5654cea69780745886872d7efff50a38d96c66 shaderc-$SHADERC.tar.gz
8688
bd58dca4dac67dcf7640292d7d63e0416274d40ee2200f7301878cec11ac6647 shaderc-glslang-$SHADERC_GLSLANG.tar.gz
@@ -113,7 +115,8 @@ if ! shasum -sa 256 --check SHASUMS 2> /dev/null; then
113115
-O "https://github.com/KhronosGroup/SPIRV-Tools/archive/$SHADERC_SPIRVTOOLS/shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz" \
114116
-O "https://github.com/KDAB/KDDockWidgets/archive/v$KDDOCKWIDGETS/KDDockWidgets-$KDDOCKWIDGETS.tar.gz" \
115117
-O "https://github.com/sammycage/plutovg/archive/v$PLUTOVG/plutovg-$PLUTOVG.tar.gz" \
116-
-O "https://github.com/sammycage/plutosvg/archive/v$PLUTOSVG/plutosvg-$PLUTOSVG.tar.gz"
118+
-O "https://github.com/sammycage/plutosvg/archive/v$PLUTOSVG/plutosvg-$PLUTOSVG.tar.gz" \
119+
-O "https://github.com/biojppm/rapidyaml/releases/download/v$RAPIDYAML/rapidyaml-$RAPIDYAML-src.tgz"
117120
fi
118121

119122
shasum -a 256 --check --strict SHASUMS
@@ -122,7 +125,7 @@ echo "Installing SDL..."
122125
rm -fr "$SDL"
123126
tar xf "$SDL.tar.gz"
124127
cd "$SDL"
125-
cmake -B build "${CMAKE_COMMON[@]}" -DSDL_X11=OFF -DBUILD_SHARED_LIBS=ON
128+
cmake -B build "${CMAKE_COMMON[@]}" -DSDL_VIDEO=OFF -DSDL_POWER=OFF -DSDL_SENSOR=OFF -DSDL_DIALOG=OFF -DSDL_TRAY=OFF -DSDL_TEST_LIBRARY=OFF -DBUILD_SHARED_LIBS=ON
126129
make -C build "-j$NPROCS"
127130
make -C build install
128131
cd ..
@@ -370,6 +373,15 @@ make -C build "-j$NPROCS"
370373
make -C build install
371374
cd ..
372375

376+
echo "Building RapidYAML..."
377+
rm -fr "rapidyaml-$RAPIDYAML-src"
378+
tar xf "rapidyaml-$RAPIDYAML-src.tgz"
379+
cd "rapidyaml-$RAPIDYAML-src"
380+
cmake "${CMAKE_COMMON[@]}" -DBUILD_SHARED_LIBS=ON -B build
381+
make -C build "-j$NPROCS"
382+
make -C build install
383+
cd ..
384+
373385
echo "Cleaning up..."
374386
cd ..
375387
rm -rf deps-build

‎.github/workflows/scripts/windows/build-dependencies-arm64.bat‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ set HARFBUZZ=13.0.0
6363
set LIBJPEGTURBO=3.1.3
6464
set LIBPNG=1655
6565
set LIBPNGLONG=1.6.55
66-
set SDL=SDL3-3.4.2
66+
set SDL=SDL3-3.4.4
6767
set LZ4=1.10.0
6868
set WEBP=1.6.0
6969
set ZLIB=1.3.2
@@ -72,6 +72,7 @@ set ZSTD=1.5.7
7272
set KDDOCKWIDGETS=2.4.0
7373
set PLUTOVG=1.3.2
7474
set PLUTOSVG=0.0.7
75+
set RAPIDYAML=0.11.1
7576

7677
set SHADERC=2026.1
7778
set SHADERC_GLSLANG=f0bd0257c308b9a26562c1a30c4748a0219cc951
@@ -93,14 +94,15 @@ call :downloadfile "lpng%LIBPNG%.zip" https://download.sourceforge.net/libpng/lp
9394
call :downloadfile "lpng%LIBPNG%-apng.patch.gz" https://download.sourceforge.net/libpng-apng/libpng-%LIBPNGLONG%-apng.patch.gz 452a1a290bd0cf18737fad0057dc17b7fdf10a73eda2d6d4f31ba04fda25ef2c || goto error
9495
call :downloadfile "libjpeg-turbo-%LIBJPEGTURBO%.tar.gz" "https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/%LIBJPEGTURBO%/libjpeg-turbo-%LIBJPEGTURBO%.tar.gz" 075920b826834ac4ddf97661cc73491047855859affd671d52079c6867c1c6c0 || goto error
9596
call :downloadfile "libwebp-%WEBP%.tar.gz" "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-%WEBP%.tar.gz" e4ab7009bf0629fd11982d4c2aa83964cf244cffba7347ecd39019a9e38c4564 || goto error
96-
call :downloadfile "%SDL%.zip" "https://libsdl.org/release/%SDL%.zip" 4954d436c95c42aa258d4eb3fb95f8ecc5d7a3dc411f0f41ac2692d34b9b9e9c || goto error
97+
call :downloadfile "%SDL%.zip" "https://libsdl.org/release/%SDL%.zip" 6bd4fbb665f77899a488b381c5b6e9681fc57c60b669738f985fea714f3456c5 || goto error
9798
call :downloadfile "lz4-%LZ4%.zip" "https://github.com/lz4/lz4/archive/refs/tags/v%LZ4%.zip" 3224b4c80f351f194984526ef396f6079bd6332dd9825c72ac0d7a37b3cdc565 || goto error
9899
call :downloadfile "zlib%ZLIBSHORT%.zip" "https://github.com/madler/zlib/releases/download/v%ZLIB%/zlib%ZLIBSHORT%.zip" e8bf55f3017aa181690990cb58a994e77885da140609fc8f94abe9b65d2cae28 || goto error
99100
call :downloadfile "zstd-%ZSTD%.zip" "https://github.com/facebook/zstd/archive/refs/tags/v%ZSTD%.zip" 7897bc5d620580d9b7cd3539c44b59d78f3657d33663fe97a145e07b4ebd69a4 || goto error
100101
call :downloadfile "KDDockWidgets-%KDDOCKWIDGETS%.zip" "https://github.com/KDAB/KDDockWidgets/archive/v%KDDOCKWIDGETS%.zip" 47ddb48197872055f0adf8e90a7235f8a3b795ca1ee3a28ac2c504c673ae3806 || goto error
101102
call :downloadfile "plutovg-%PLUTOVG%.zip" "https://github.com/sammycage/plutovg/archive/v%PLUTOVG%.zip" 4fe4e48f28aa80171b2166d45c0976ab0f21eecedb52cd4c3ef73b5afb48fac9 || goto error
102103
call :downloadfile "plutosvg-%PLUTOSVG%.zip" "https://github.com/sammycage/plutosvg/archive/v%PLUTOSVG%.zip" 82dee2c57ad712bdd6d6d81d3e76249d89caa4b5a4214353660fd5adff12201a || goto error
103104
call :downloadfile: "agility-sdk-%AGILITYSDK%.nupkg" "https://www.nuget.org/api/v2/package/Microsoft.Direct3D.D3D12/%AGILITYSDK%" 0027fc24f947c48dbded13ada7d280be221eb651644e23a8a476f0f1f0a079dd || goto error
105+
call :downloadfile "rapidyaml-%RAPIDYAML%-src.zip" "https://github.com/biojppm/rapidyaml/releases/download/v%RAPIDYAML%/rapidyaml-%RAPIDYAML%-src.zip" 30054b74abdf0ba35bf2cb435b6e49fcb6d62a8e78a240a018c36aa60dba765f || goto error
104106

105107
call :downloadfile "shaderc-%SHADERC%.zip" "https://github.com/google/shaderc/archive/refs/tags/v%SHADERC%.zip" 3ac59c8216d367ab7858684d39c8faf872a64150aeb139335f4e083c5f79dde0 || goto error
106108
call :downloadfile "shaderc-glslang-%SHADERC_GLSLANG%.zip" "https://github.com/KhronosGroup/glslang/archive/%SHADERC_GLSLANG%.zip" 42a30acca4a35955370ed8ff6e54b823b4d4a5a86571baec1203d3fce87da447 || goto error
@@ -205,7 +207,7 @@ echo Building SDL...
205207
rmdir /S /Q "%SDL%"
206208
%SEVENZIP% x "%SDL%.zip" || goto error
207209
cd "%SDL%" || goto error
208-
cmake -B build %ARM64TOOLCHAIN% -DCMAKE_BUILD_TYPE=Release %FORCEPDB% -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=ON -DSDL_SHARED=ON -DSDL_STATIC=OFF -G Ninja || goto error
210+
cmake -B build %ARM64TOOLCHAIN% -DCMAKE_BUILD_TYPE=Release %FORCEPDB% -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=ON -DSDL_SHARED=ON -DSDL_STATIC=OFF -DSDL_VIDEO=OFF -DSDL_POWER=OFF -DSDL_SENSOR=OFF -DSDL_DIALOG=OFF -DSDL_TRAY=OFF -DSDL_TEST_LIBRARY=OFF -G Ninja || goto error
209211
cmake --build build --parallel || goto error
210212
ninja -C build install || goto error
211213
copy build\SDL3.pdb "%INSTALLDIR%\bin" || goto error
@@ -322,6 +324,15 @@ cmake --build build --parallel || goto error
322324
ninja -C build install || goto error
323325
cd .. || goto error
324326

327+
echo "Building RapidYAML..."
328+
rmdir /S /Q "rapidyaml-%RAPIDYAML%-src"
329+
%SEVENZIP% x "rapidyaml-%RAPIDYAML%-src.zip" || goto error
330+
cd "rapidyaml-%RAPIDYAML%-src" || goto error
331+
cmake %ARM64TOOLCHAIN% -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=ON -B build -G Ninja || goto error
332+
cmake --build build --parallel || goto error
333+
ninja -C build install || goto error
334+
cd .. || goto error
335+
325336
echo Unpacking Agility SDK
326337
rmdir /S /Q "agility-sdk-%AGILITYSDK%"
327338
%SEVENZIP% x -o"agility-sdk-%AGILITYSDK%" "agility-sdk-%AGILITYSDK%.nupkg" || goto error

0 commit comments

Comments
 (0)