From c9cfd9e8cfc4d0931a99dbda4415d429060a8606 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 23 Nov 2023 17:16:53 +0900
Subject: [PATCH] Fix window build for recent config changes

And, more importantly get curl working in the mxe build.
---
 Makefile.am                            |  2 +-
 configure.ac                           | 65 +++++++++++++++++---------
 qw/source/cl_http.c                    |  5 ++
 tools/cross/mingw64/cross-configure.sh |  1 +
 4 files changed, 50 insertions(+), 23 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index b0f5d2f65..7817cffe3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,7 +26,7 @@ NOCONV_DIST= \
 
 BUILT_SOURCES = $(top_srcdir)/.version
 #AM_CFLAGS= @PREFER_NON_PIC@
-AM_CPPFLAGS= -I$(top_srcdir)/include $(PTHREAD_CFLAGS) $(FNM_FLAGS) $(NCURSES_CFLAGS) $(FREETYPE_CFLAGS) $(HARFBUZZ_CFLAGS) $(VULKAN_CPPFLAGS)
+AM_CPPFLAGS= -I$(top_srcdir)/include $(PTHREAD_CFLAGS) $(FNM_FLAGS) $(NCURSES_CFLAGS) $(FREETYPE_CFLAGS) $(HARFBUZZ_CFLAGS) $(VULKAN_CPPFLAGS) $(LIBCURL_CFLAGS)
 
 common_ldflags= -export-dynamic @STATIC@ @PTHREAD_LDFLAGS@
 
diff --git a/configure.ac b/configure.ac
index cd8f75f1a..052902f48 100644
--- a/configure.ac
+++ b/configure.ac
@@ -164,28 +164,49 @@ fi
 TOPSRC=`readlink -f ${srcdir}`
 AC_SUBST(TOPSRC)
 
-QF_REQUIRES([
-[libasound2-dev, HAVE_ALSA],
-[libjack-jackd2-dev, HAVE_JACK],
-[libsamplerate0-dev, HAVE_SAMPLERATE],
-[libflac-dev, HAVE_FLAC],
-[libogg-dev, HAVE_OGG],
-[libvorbis-dev, HAVE_VORBIS],
-[libpng-dev, HAVE_PNG],
-[zlib1g-dev, HAVE_ZLIB],
-[libcurl4-openssl-dev, HAVE_LIBCURL],
-[libncurses5-dev, HAVE_NCURSES],
-[libxext-dev, HAVE_X],
-[libxxf86dga-dev, HAVE_DGA],
-[libxxf86vm-dev, HAVE_VIDMODE],
-[libxi-dev, HAVE_XI2],
-[libxfixes-dev, HAVE_XFIXES],
-[libvulkan-dev, HAVE_VULKAN],
-[glslang-tools, HAVE_GLSLANG],
-[libfontconfig-dev, HAVE_FONTCONFIG],
-[libfreetype-dev, HAVE_FREETYPE],
-[libharfbuzz-dev, HAVE_HARFBUZZ],
-])
+case "${host}" in
+	i?86-*-mingw32*|x86_64-w64-mingw32*)
+		QF_REQUIRES([
+			[libsamplerate, HAVE_SAMPLERATE],
+			[flac, HAVE_FLAC],
+			[ogg, HAVE_OGG],
+			[vorbis, HAVE_VORBIS],
+			[libpng, HAVE_PNG],
+			[zlib, HAVE_ZLIB],
+			[curl, HAVE_LIBCURL],
+			[ncurses, HAVE_NCURSES],
+			[vulkan-dev, HAVE_VULKAN],
+			[glslang-tools, HAVE_GLSLANG],
+			[fontconfig, HAVE_FONTCONFIG],
+			[freetype, HAVE_FREETYPE],
+			[harfbuzz, HAVE_HARFBUZZ],
+		])
+	;;
+	*linux*)
+		QF_REQUIRES([
+			[libasound2-dev, HAVE_ALSA],
+			[libjack-jackd2-dev, HAVE_JACK],
+			[libsamplerate0-dev, HAVE_SAMPLERATE],
+			[libflac-dev, HAVE_FLAC],
+			[libogg-dev, HAVE_OGG],
+			[libvorbis-dev, HAVE_VORBIS],
+			[libpng-dev, HAVE_PNG],
+			[zlib1g-dev, HAVE_ZLIB],
+			[libcurl4-openssl-dev, HAVE_LIBCURL],
+			[libncurses5-dev, HAVE_NCURSES],
+			[libxext-dev, HAVE_X],
+			[libxxf86dga-dev, HAVE_DGA],
+			[libxxf86vm-dev, HAVE_VIDMODE],
+			[libxi-dev, HAVE_XI2],
+			[libxfixes-dev, HAVE_XFIXES],
+			[libvulkan-dev, HAVE_VULKAN],
+			[glslang-tools, HAVE_GLSLANG],
+			[libfontconfig-dev, HAVE_FONTCONFIG],
+			[libfreetype-dev, HAVE_FREETYPE],
+			[libharfbuzz-dev, HAVE_HARFBUZZ],
+		])
+	;;
+esac
 dnl[vulkan-validationlayers, HAVE_],
 
 dnl Output files
diff --git a/qw/source/cl_http.c b/qw/source/cl_http.c
index 6ee223943..a7e498ba4 100644
--- a/qw/source/cl_http.c
+++ b/qw/source/cl_http.c
@@ -35,6 +35,11 @@
 
 #include <curl/curl.h>
 
+#ifdef _WIN32
+//windows defines this, but of course it conflicts with progs
+#undef E_POINTER
+#endif
+
 #include "QF/dstring.h"
 #include "QF/sys.h"
 
diff --git a/tools/cross/mingw64/cross-configure.sh b/tools/cross/mingw64/cross-configure.sh
index f1945d685..5c890df11 100755
--- a/tools/cross/mingw64/cross-configure.sh
+++ b/tools/cross/mingw64/cross-configure.sh
@@ -17,6 +17,7 @@ export PKG_CONFIG_PATH=$MINGW_USR/local/lib/pkgconfig
 export PATH=$MINGW/usr/bin:$PATH
 export QCSYSPREFIX=$MINGW_USR
 ../../configure \
+	--enable-silent-rules \
 	--host=x86_64-w64-mingw32.static \
 	--disable-shared \
 	$*