Skip to content

Commit d6e6cf2

Browse files
committed
Switch windows exception model from sjlj to dw2
Forced by mingw64 bump. This may change again to seh again once we go 64-bit.
1 parent c31aa3c commit d6e6cf2

2 files changed

Lines changed: 8 additions & 7 deletions

File tree

.github/workflows/all.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ jobs:
382382
- name: Copy base runtime DLLs
383383
run: >
384384
cp
385-
/usr/lib/gcc/i686-w64-mingw32/*-posix/libgcc_s_sjlj-1.dll
385+
/usr/lib/gcc/i686-w64-mingw32/*-posix/libgcc_s_dw2-1.dll
386386
/usr/lib/gcc/i686-w64-mingw32/*-posix/libstdc++-6.dll
387387
/usr/i686-w64-mingw32/lib/libwinpthread-1.dll
388388
dist/windows
@@ -436,7 +436,7 @@ jobs:
436436
libp11-kit-0.dll
437437
libpcre-1.dll
438438
libplist.dll
439-
libprotobuf-17.dll
439+
libprotobuf-32.dll
440440
libpsl-5.dll
441441
libssl-1_1.dll
442442
libsoup-2.4-1.dll

dist/windows/clementine.nsi.in

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ Section "Delete old files" oldfiles
205205
Delete "$INSTDIR\avformat-52.dll"
206206
Delete "$INSTDIR\avutil-50.dll"
207207
Delete "$INSTDIR\libcdio-12.dll"
208-
Delete "$INSTDIR\libgcc_s_dw2-1.dll"
208+
Delete "$INSTDIR\libgcc_s_sjlj-1.dll"
209209

210210
; libimobiledevice removal
211211
Delete "$INSTDIR\libimobiledevice-1.dll"
@@ -276,6 +276,7 @@ Section "Delete old files" oldfiles
276276
Delete "$INSTDIR\libid3tag.dll"
277277
Delete "$INSTDIR\libgstcontroller-1.0-0.dll"
278278
Delete "$INSTDIR\libprotobuf-9.dll"
279+
Delete "$INSTDIR\libprotobuf-17.dll"
279280
Delete "$INSTDIR\libcdio-16.dll"
280281
Delete "$INSTDIR\libfaad.dll"
281282
Delete "$INSTDIR\libfaac.dll"
@@ -311,7 +312,7 @@ Section "Clementine" Clementine
311312
File "libffi-7.dll"
312313
File "libfftw3-3.dll"
313314
File "libFLAC-8.dll"
314-
File "libgcc_s_sjlj-1.dll"
315+
File "libgcc_s_dw2-1.dll"
315316
File "libgcrypt-20.dll"
316317
File "libgio-2.0-0.dll"
317318
File "libglib-2.0-0.dll"
@@ -350,7 +351,7 @@ Section "Clementine" Clementine
350351
File "libp11-kit-0.dll"
351352
File "libpcre-1.dll"
352353
File "libplist.dll"
353-
File "libprotobuf-17.dll"
354+
File "libprotobuf-32.dll"
354355
File "libpsl-5.dll"
355356
File "libsoup-2.4-1.dll"
356357
File "libspeex-1.dll"
@@ -1145,7 +1146,7 @@ Section "Uninstall"
11451146
Delete "$INSTDIR\libffi-7.dll"
11461147
Delete "$INSTDIR\libfftw3-3.dll"
11471148
Delete "$INSTDIR\libFLAC-8.dll"
1148-
Delete "$INSTDIR\libgcc_s_sjlj-1.dll"
1149+
Delete "$INSTDIR\libgcc_s_dw2-1.dll"
11491150
Delete "$INSTDIR\libgcrypt-20.dll"
11501151
Delete "$INSTDIR\libgio-2.0-0.dll"
11511152
Delete "$INSTDIR\libglib-2.0-0.dll"
@@ -1184,7 +1185,7 @@ Section "Uninstall"
11841185
Delete "$INSTDIR\libp11-kit-0.dll"
11851186
Delete "$INSTDIR\libpcre-1.dll"
11861187
Delete "$INSTDIR\libplist.dll"
1187-
Delete "$INSTDIR\libprotobuf-17.dll"
1188+
Delete "$INSTDIR\libprotobuf-32.dll"
11881189
Delete "$INSTDIR\libpsl-5.dll"
11891190
Delete "$INSTDIR\libsoup-2.4-1.dll"
11901191
Delete "$INSTDIR\libspeex-1.dll"

0 commit comments

Comments
 (0)