From 4672c3c3d805df4a6781c2a1fa89bd41dc2c44b6 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Wed, 25 Jun 2025 15:50:30 +0200
Subject: [PATCH] ci.sh: Add x86_64 win cross build.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 .github/workflows/ports_windows.yml                | 11 ++++++++++-
 ports/windows/variants/standard/mpconfigvariant.mk |  5 +++++
 tools/ci.sh                                        |  6 ++++++
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ports_windows.yml b/.github/workflows/ports_windows.yml
index f33277d471..601c48d344 100644
--- a/.github/workflows/ports_windows.yml
+++ b/.github/workflows/ports_windows.yml
@@ -140,7 +140,7 @@ jobs:
       working-directory: tests
       run: python run-tests.py --print-failures
 
-  cross-build-on-linux:
+  cross-build-i386-win-on-linux:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
@@ -148,3 +148,12 @@ jobs:
       run: source tools/ci.sh && ci_windows_setup
     - name: Build
       run: source tools/ci.sh && ci_windows_build
+
+  cross-build-x86_64-win-on-linux:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - name: Install packages
+      run: source tools/ci.sh && ci_windows_setup
+    - name: Build
+      run: source tools/ci.sh && ci_windows64_build
diff --git a/ports/windows/variants/standard/mpconfigvariant.mk b/ports/windows/variants/standard/mpconfigvariant.mk
index a0d6712c55..65c8bec0dd 100644
--- a/ports/windows/variants/standard/mpconfigvariant.mk
+++ b/ports/windows/variants/standard/mpconfigvariant.mk
@@ -1 +1,6 @@
 # This is the default variant when you `make` the Windows port.
+
+ifneq ($(DISABLE_PLUGIN),1)
+# Enable format string checking
+include $(TOP)/py/fmtplugin.mk
+endif
diff --git a/tools/ci.sh b/tools/ci.sh
index d25ec07128..865ae90d7e 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -877,6 +877,12 @@ function ci_windows_build {
     make ${MAKEOPTS} -C ports/windows submodules
     make ${MAKEOPTS} -C ports/windows CROSS_COMPILE=i686-w64-mingw32-
 }
+function ci_windows64_build {
+    make ${MAKEOPTS} -C mpy-cross
+    make ${MAKEOPTS} -C ports/windows submodules
+    make ${MAKEOPTS} -C ports/windows CROSS_COMPILE=x86_64-w64-mingw32-
+}
+
 
 ########################################################################################
 # ports/zephyr