From 9521632010a65e1803019b9de6534a1d92cd945f Mon Sep 17 00:00:00 2001
From: Le Philousophe <lephilousophe@users.noreply.github.com>
Date: Sun, 15 Mar 2026 15:44:24 +0000
Subject: [PATCH] MXE: curl now requires Vista

Build with it only for 64-bits builds
---
 buildbot-config/platforms.py                     | 12 ++++++++----
 toolchains/mxe/Dockerfile.m4                     |  2 +-
 toolchains/mxe/packages/curl-light/curl-light.mk |  4 ++--
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/buildbot-config/platforms.py b/buildbot-config/platforms.py
index 029d36a..f8e0e37 100644
--- a/buildbot-config/platforms.py
+++ b/buildbot-config/platforms.py
@@ -871,9 +871,13 @@ def windows_mxe(suffix, target, description=None):
     platform.env["PATH"] = [ "${PATH}", "${{MXE_PREFIX_DIR}}/{0}/bin".format(target)]
 
     platform.configureargs.append("--host={0}".format(target))
-    if suffix != 'x86':
+    if suffix == 'x86':
         platform.buildconfigureargs = {
-            builds.ScummVMBuild: [ "--enable-updates"],
+            builds.ScummVMBuild: [ "--disable-libcurl" ],
+        }
+    else:
+        platform.buildconfigureargs = {
+            builds.ScummVMBuild: [ "--enable-updates" ],
         }
     platform.strip_cmd = {
         # As we use an environment variable, we need to use string to spawn a shell
@@ -908,10 +912,10 @@ def windows_mxe(suffix, target, description=None):
 
 windows_mxe(suffix="x86",
         target="i686-w64-mingw32.static",
-        description="Windows (32\xa0bits)")
+        description="Windows XP+ (32\xa0bits)")
 windows_mxe(suffix="x86-64",
         target="x86_64-w64-mingw32.static",
-        description="Windows (64\xa0bits)")
+        description="Windows Vista+ (64\xa0bits)")
 
 def win9x():
     platform = Platform("win9x")
diff --git a/toolchains/mxe/Dockerfile.m4 b/toolchains/mxe/Dockerfile.m4
index e261cfe..3f6c17d 100644
--- a/toolchains/mxe/Dockerfile.m4
+++ b/toolchains/mxe/Dockerfile.m4
@@ -1,4 +1,4 @@
-m4_define(`MXE_VERSION',9e83f9c12e0f9e3de2d3f90bc2656cd7cce1cf0b)m4_dnl
+m4_define(`MXE_VERSION',cb91f5dcbbd7e7c229959d288284d21d2b92f08c)m4_dnl
 
 m4_include(`paths.m4')m4_dnl
 m4_include(`packages.m4')m4_dnl
diff --git a/toolchains/mxe/packages/curl-light/curl-light.mk b/toolchains/mxe/packages/curl-light/curl-light.mk
index bd99a23..12bb65c 100644
--- a/toolchains/mxe/packages/curl-light/curl-light.mk
+++ b/toolchains/mxe/packages/curl-light/curl-light.mk
@@ -20,10 +20,10 @@ endef
 
 define $(PKG)_BUILD
     cd '$(SOURCE_DIR)' && autoreconf -fi
-    cd '$(BUILD_DIR)' && $(SOURCE_DIR)/configure \
+    cd '$(BUILD_DIR)' && CPPFLAGS="-D_WIN32_WINNT=0x0600" $(SOURCE_DIR)/configure \
         $(MXE_CONFIGURE_OPTS) \
         --with-schannel \
-        --without-winidn \
+        --with-winidn \
         --without-libpsl \
         --enable-sspi \
         --enable-ipv6 \