Fix #703 : Inclusion of libwinpthread depdends on the toolchains used

Novum · Jun 30, 2024 · cc8e0b6 · cc8e0b6
1 parent bd23bc1
commit cc8e0b6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/Quake/Makefile.w32 b/Quake/Makefile.w32
@@ -78,7 +78,7 @@ LIBS := $(COMMON_LIBS) $(NET_LIBS) $(CODEC_LINK) $(CODECLIBS) $(VULKAN_LINK) $(V
 
 SYSOBJ_RES = vkQuake.res
 
-MINGW_PATH = ${MINGW_PREFIX}
+LIBWINPTHREAD = $(MSYSTEM_PREFIX)/bin/libwinpthread-1.dll
 
 # ---------------------------
 # targets / rules
@@ -93,7 +93,9 @@ vkQuake.exe: $(SHADER_OBJS) $(OBJS) $(SYSOBJ_RES)
 	$(call DO_STRIP,$@)
 
 dll:
-	cp $(MINGW_PATH)/bin/libwinpthread-1.dll .
+	if [ -f $(LIBWINPTHREAD) ]; then \
+		cp $(LIBWINPTHREAD)  . ; \
+	fi
 	cp ../Windows/codecs/x86/*.dll .
 	cp ../Windows/SDL2/lib/*.dll .
 

diff --git a/Quake/Makefile.w64 b/Quake/Makefile.w64
@@ -72,7 +72,7 @@ LIBS := $(COMMON_LIBS) $(NET_LIBS) $(CODEC_LINK) $(CODECLIBS) $(VULKAN_LINK) $(V
 
 SYSOBJ_RES = vkQuake.res
 
-MINGW_PATH = ${MINGW_PREFIX}
+LIBWINPTHREAD = $(MSYSTEM_PREFIX)/bin/libwinpthread-1.dll
 
 # ---------------------------
 # targets / rules
@@ -87,7 +87,9 @@ vkQuake.exe: $(SHADER_OBJS) $(OBJS) $(SYSOBJ_RES)
 	$(call DO_STRIP,$@)
 
 dll:
-	cp $(MINGW_PATH)/bin/libwinpthread-1.dll .
+	if [ -f $(LIBWINPTHREAD) ]; then \
+		cp $(LIBWINPTHREAD)  . ; \
+	fi
 	cp ../Windows/codecs/x64/*.dll .
 	cp ../Windows/SDL2/lib64/*.dll .