Skip to content

Commit 8cd30f4

Browse files
streetpeastreetpea
committed
Add SDL3 compat for winx64 build
1 parent 9a2e3e0 commit 8cd30f4

File tree

4 files changed

+30
-4
lines changed

4 files changed

+30
-4
lines changed

‎.github/workflows/build-release.yaml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ jobs:
4343
vcpkg_baseline: 42bb0d9e8d4cf33485afb9ee2229150f79f61a1f
4444
dep_folder: deps
4545
libplacebo_tag: v7.349.0
46+
sdl2_compat_tag: 2.32.56
4647

4748
defaults:
4849
run:
@@ -100,6 +101,13 @@ jobs:
100101
Expand-Archive -LiteralPath "ffmpeg-n7.1-latest-win64-gpl-shared-7.1.zip" -DestinationPath "."
101102
Rename-Item "ffmpeg-n7.1-latest-win64-gpl-shared-7.1" "${{ env.dep_folder }}"
102103
104+
- name: Setup sdl2-compat
105+
run: |
106+
$ProgressPreference = 'SilentlyContinue'
107+
Invoke-WebRequest -UseBasicParsing -Uri https://github.com/libsdl-org/sdl2-compat/releases/download/release-${{ env.sdl2_compat_tag }}/sdl2-compat-${{ env.sdl2_compat_tag }}-win32-x64.zip -OutFile sdl2-compat-${{ env.sdl2_compat_tag }}-win32-x64.zip
108+
Expand-Archive -LiteralPath "sdl2-compat-${{ env.sdl2_compat_tag }}-win32-x64.zip" -DestinationPath "."
109+
Rename-Item "sdl2-compat-${{ env.sdl2_compat_tag }}-win32-x64" "${{ env.dep_folder }}"
110+
103111
- name: Build SPIRV-Cross
104112
run: |
105113
git clone https://github.com/KhronosGroup/SPIRV-Cross.git
@@ -180,7 +188,6 @@ jobs:
180188
cp scripts\qtwebengine_import.qml gui\src\qml\
181189
cp "${env:VCPKG_INSTALLED_DIR}\${{ env.triplet }}\bin\libcrypto-*-x64.dll" chiaki-ng-Win
182190
cp "${env:VCPKG_INSTALLED_DIR}\${{ env.triplet }}\bin\libssl-*-x64.dll" chiaki-ng-Win
183-
cp "${env:VCPKG_INSTALLED_DIR}\${{ env.triplet }}\bin\SDL2.dll" chiaki-ng-Win
184191
cp "${env:VCPKG_INSTALLED_DIR}\${{ env.triplet }}\bin\hidapi.dll" chiaki-ng-Win
185192
cp "${env:VCPKG_INSTALLED_DIR}\${{ env.triplet }}\bin\fftw3.dll" chiaki-ng-Win
186193
cp "${env:VCPKG_INSTALLED_DIR}\${{ env.triplet }}\bin\opus.dll" chiaki-ng-Win
@@ -195,6 +202,8 @@ jobs:
195202
cp "${{ github.workspace }}\${{ env.dep_folder }}\bin\libplacebo-*.dll" chiaki-ng-Win
196203
cp "${{ github.workspace }}\${{ env.dep_folder }}\bin\shaderc_shared.dll" chiaki-ng-Win
197204
cp "${{ github.workspace }}\${{ env.dep_folder }}\bin\spirv-cross-c-shared.dll" chiaki-ng-Win
205+
cp "${{ github.workspace }}\${{ env.dep_folder }}\bin\SDL2.dll" chiaki-ng-Win
206+
cp "${{ github.workspace }}\${{ env.dep_folder }}\bin\SDL3.dll" chiaki-ng-Win
198207
windeployqt.exe --no-translations --qmldir=gui\src\qml --release chiaki-ng-Win\chiaki.exe
199208
200209
- name: Package chiaki-ng

‎.github/workflows/build-weekly.yaml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ jobs:
5555
vcpkg_baseline: 42bb0d9e8d4cf33485afb9ee2229150f79f61a1f
5656
dep_folder: deps
5757
libplacebo_tag: v7.349.0
58+
sdl2_compat_tag: 2.32.56
5859

5960
defaults:
6061
run:
@@ -112,6 +113,13 @@ jobs:
112113
Expand-Archive -LiteralPath "ffmpeg-n7.1-latest-win64-gpl-shared-7.1.zip" -DestinationPath "."
113114
Rename-Item "ffmpeg-n7.1-latest-win64-gpl-shared-7.1" "${{ env.dep_folder }}"
114115
116+
- name: Setup sdl2-compat
117+
run: |
118+
$ProgressPreference = 'SilentlyContinue'
119+
Invoke-WebRequest -UseBasicParsing -Uri https://github.com/libsdl-org/sdl2-compat/releases/download/release-${{ env.sdl2_compat_tag }}/sdl2-compat-${{ env.sdl2_compat_tag }}-win32-x64.zip -OutFile sdl2-compat-${{ env.sdl2_compat_tag }}-win32-x64.zip
120+
Expand-Archive -LiteralPath "sdl2-compat-${{ env.sdl2_compat_tag }}-win32-x64.zip" -DestinationPath "."
121+
Rename-Item "sdl2-compat-${{ env.sdl2_compat_tag }}-win32-x64" "${{ env.dep_folder }}"
122+
115123
- name: Build SPIRV-Cross
116124
run: |
117125
git clone https://github.com/KhronosGroup/SPIRV-Cross.git
@@ -192,7 +200,6 @@ jobs:
192200
cp scripts\qtwebengine_import.qml gui\src\qml\
193201
cp "${env:VCPKG_INSTALLED_DIR}\${{ env.triplet }}\bin\libcrypto-*-x64.dll" chiaki-ng-Win
194202
cp "${env:VCPKG_INSTALLED_DIR}\${{ env.triplet }}\bin\libssl-*-x64.dll" chiaki-ng-Win
195-
cp "${env:VCPKG_INSTALLED_DIR}\${{ env.triplet }}\bin\SDL2.dll" chiaki-ng-Win
196203
cp "${env:VCPKG_INSTALLED_DIR}\${{ env.triplet }}\bin\hidapi.dll" chiaki-ng-Win
197204
cp "${env:VCPKG_INSTALLED_DIR}\${{ env.triplet }}\bin\fftw3.dll" chiaki-ng-Win
198205
cp "${env:VCPKG_INSTALLED_DIR}\${{ env.triplet }}\bin\opus.dll" chiaki-ng-Win
@@ -207,6 +214,8 @@ jobs:
207214
cp "${{ github.workspace }}\${{ env.dep_folder }}\bin\libplacebo-*.dll" chiaki-ng-Win
208215
cp "${{ github.workspace }}\${{ env.dep_folder }}\bin\shaderc_shared.dll" chiaki-ng-Win
209216
cp "${{ github.workspace }}\${{ env.dep_folder }}\bin\spirv-cross-c-shared.dll" chiaki-ng-Win
217+
cp "${{ github.workspace }}\${{ env.dep_folder }}\bin\SDL2.dll" chiaki-ng-Win
218+
cp "${{ github.workspace }}\${{ env.dep_folder }}\bin\SDL3.dll" chiaki-ng-Win
210219
windeployqt.exe --no-translations --qmldir=gui\src\qml --release chiaki-ng-Win\chiaki.exe
211220
212221
- name: Package chiaki-ng

‎.github/workflows/build-windows-x86.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ jobs:
1515
vcpkg_baseline: 42bb0d9e8d4cf33485afb9ee2229150f79f61a1f
1616
dep_folder: deps
1717
libplacebo_tag: v7.349.0
18+
sdl2_compat_tag: 2.32.56
1819

1920
defaults:
2021
run:
@@ -72,6 +73,13 @@ jobs:
7273
Expand-Archive -LiteralPath "ffmpeg-n7.1-latest-win64-gpl-shared-7.1.zip" -DestinationPath "."
7374
Rename-Item "ffmpeg-n7.1-latest-win64-gpl-shared-7.1" "${{ env.dep_folder }}"
7475
76+
- name: Setup sdl2-compat
77+
run: |
78+
$ProgressPreference = 'SilentlyContinue'
79+
Invoke-WebRequest -UseBasicParsing -Uri https://github.com/libsdl-org/sdl2-compat/releases/download/release-${{ env.sdl2_compat_tag }}/sdl2-compat-${{ env.sdl2_compat_tag }}-win32-x64.zip -OutFile sdl2-compat-${{ env.sdl2_compat_tag }}-win32-x64.zip
80+
Expand-Archive -LiteralPath "sdl2-compat-${{ env.sdl2_compat_tag }}-win32-x64.zip" -DestinationPath "."
81+
Rename-Item "sdl2-compat-${{ env.sdl2_compat_tag }}-win32-x64" "${{ env.dep_folder }}"
82+
7583
- name: Build SPIRV-Cross
7684
run: |
7785
git clone https://github.com/KhronosGroup/SPIRV-Cross.git
@@ -156,7 +164,6 @@ jobs:
156164
cp scripts\qtwebengine_import.qml gui\src\qml\
157165
cp "${env:VCPKG_INSTALLED_DIR}\${{ env.triplet }}\bin\libcrypto-*-x64.dll" chiaki-ng-Win
158166
cp "${env:VCPKG_INSTALLED_DIR}\${{ env.triplet }}\bin\libssl-*-x64.dll" chiaki-ng-Win
159-
cp "${env:VCPKG_INSTALLED_DIR}\${{ env.triplet }}\bin\SDL2.dll" chiaki-ng-Win
160167
cp "${env:VCPKG_INSTALLED_DIR}\${{ env.triplet }}\bin\hidapi.dll" chiaki-ng-Win
161168
cp "${env:VCPKG_INSTALLED_DIR}\${{ env.triplet }}\bin\fftw3.dll" chiaki-ng-Win
162169
cp "${env:VCPKG_INSTALLED_DIR}\${{ env.triplet }}\bin\opus.dll" chiaki-ng-Win
@@ -171,6 +178,8 @@ jobs:
171178
cp "${{ github.workspace }}\${{ env.dep_folder }}\bin\libplacebo-*.dll" chiaki-ng-Win
172179
cp "${{ github.workspace }}\${{ env.dep_folder }}\bin\shaderc_shared.dll" chiaki-ng-Win
173180
cp "${{ github.workspace }}\${{ env.dep_folder }}\bin\spirv-cross-c-shared.dll" chiaki-ng-Win
181+
cp "${{ github.workspace }}\${{ env.dep_folder }}\bin\SDL2.dll" chiaki-ng-Win
182+
cp "${{ github.workspace }}\${{ env.dep_folder }}\bin\SDL3.dll" chiaki-ng-Win
174183
windeployqt.exe --no-translations --qmldir=gui\src\qml --release chiaki-ng-Win\chiaki.exe
175184
176185
- name: Package chiaki-ng

‎vcpkg.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
"version": "1.9.8",
44
"dependencies": [
55
"pkgconf",
6-
"sdl2",
76
"protobuf",
87
"openssl",
98
"hidapi",

0 commit comments

Comments
 (0)