MINGW/MSYS2: Package libwinpthread-1.dll with builds so the binary di…

…stribution is now standalone (also copy all the other depdendencies in CI mingw like we do for MSVC)
Novum · Jun 29, 2024 · 7cf09be · 7cf09be
1 parent f5b0550
commit 7cf09be
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/.github/workflows/build-mingw.yml b/.github/workflows/build-mingw.yml
@@ -33,7 +33,7 @@ jobs:
       run: |
         set -eu
         parallel="$(getconf _NPROCESSORS_ONLN)"
-        make -j"${parallel}" -C Quake -f ${{ matrix.platform.makefile }}
+        make -j"${parallel}" -C Quake -f ${{ matrix.platform.makefile }} all
     - name: Upload vkQuake
       uses: actions/upload-artifact@v4
       with:

diff --git a/Quake/Makefile.w32 b/Quake/Makefile.w32
@@ -91,8 +91,9 @@ vkQuake.exe: $(SHADER_OBJS) $(OBJS) $(SYSOBJ_RES)
 	$(call DO_STRIP,$@)
 
 dll:
-	cp ../Windows/codecs/x64/*.dll .
-	cp ../Windows/SDL2/lib64/*.dll .
+	cp ../Windows/misc/x86/*.dll .
+	cp ../Windows/codecs/x86/*.dll .
+	cp ../Windows/SDL2/lib/*.dll .
 
 release: vkQuake.exe
 debug:

diff --git a/Quake/Makefile.w64 b/Quake/Makefile.w64
@@ -85,8 +85,9 @@ vkQuake.exe: $(SHADER_OBJS) $(OBJS) $(SYSOBJ_RES)
 	$(call DO_STRIP,$@)
 
 dll:
-	cp ../Windows/codecs/x86/*.dll .
-	cp ../Windows/SDL2/lib/*.dll .
+	cp ../Windows/misc/x64/*.dll .
+	cp ../Windows/codecs/x64/*.dll .
+	cp ../Windows/SDL2/lib64/*.dll .
 
 release: vkQuake.exe
 debug:

diff --git a/Windows/misc/x64/libwinpthread-1.dll b/Windows/misc/x64/libwinpthread-1.dll
diff --git a/Windows/misc/x86/libwinpthread-1.dll b/Windows/misc/x86/libwinpthread-1.dll