From b392052c375933f3133795d97effe4b8ffe79258 Mon Sep 17 00:00:00 2001
From: Michael Keller <github@ike.ch>
Date: Mon, 30 Sep 2024 22:53:49 +1300
Subject: [PATCH] CICD: Fix Windows Build.

Fix missing define introduced in #4343.

Signed-off-by: Michael Keller <github@ike.ch>
---
 packaging/windows/in-container-build.sh |  6 +++++-
 packaging/windows/mxe-based-build.sh    | 14 +++++++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/packaging/windows/in-container-build.sh b/packaging/windows/in-container-build.sh
index f11c2a582..c4601f118 100755
--- a/packaging/windows/in-container-build.sh
+++ b/packaging/windows/in-container-build.sh
@@ -13,7 +13,7 @@ set -e
 mkdir -p win32
 cd win32
 
-# build Subsurface and then smtk2ssrf
+# build Subsurface
 export MXEBUILDTYPE=x86_64-w64-mingw32.shared
 bash -ex ../subsurface/packaging/windows/mxe-based-build.sh installer
 
@@ -23,6 +23,10 @@ mv subsurface/subsurface.exe* ${OUTPUT_DIR}/
 fullname=$(cd subsurface ; ls subsurface-*.exe)
 mv subsurface/"$fullname" ${OUTPUT_DIR}/"${fullname%.exe}-installer.exe"
 
+# build Subsurface for smtk2ssrf
+
+bash -ex ../subsurface/packaging/windows/mxe-based-build.sh -noftdi -nolibraw subsurface
+
 bash -ex ../subsurface/packaging/windows/smtk2ssrf-mxe-build.sh -a -i
 
 # the strange two step move is in order to get predictable names to use
diff --git a/packaging/windows/mxe-based-build.sh b/packaging/windows/mxe-based-build.sh
index f55519006..9da78dec6 100755
--- a/packaging/windows/mxe-based-build.sh
+++ b/packaging/windows/mxe-based-build.sh
@@ -27,12 +27,16 @@
 #
 # now you can start the build
 #
-# make libxml2 libxslt libusb1 libzip libssh2 libftdi1 curl qt5 nsis
+# make libxml2 libxslt libusb1 libzip libssh2 libftdi1 libraw curl qt5 nsis
 #
 #     (if you intend to build Subsurface without user space FTDI support
 #      you can drop libftdi1 from that list and start this script with
 #      -noftdi )
 #
+#     (if you intend to build Subsurface without libraw support
+#      you can drop libraw from that list and start this script with
+#      -nolibraw )
+#
 # After quite a while (depending on your machine anywhere from 15-20
 # minutes to several hours) you should have a working MXE install in
 # ~/src/mxe
@@ -93,6 +97,13 @@ else
 	FTDI="ON"
 fi
 
+if [[ "$1" == "-nolibraw" ]] ; then
+	shift
+	LIBRAW="OFF"
+else
+	LIBRAW="ON"
+fi
+
 # this is run on a rather powerful machine - if you want less
 # build parallelism, please change this variable
 JOBS="-j4"
@@ -292,6 +303,7 @@ cd "$BUILDDIR"/subsurface
 	-DMAKE_TESTS=OFF \
 	-DBTSUPPORT=ON -DBLESUPPORT=ON \
 	-DFTDISUPPORT=$FTDI \
+	-DLIBRAW_SUPPORT=$LIBRAW \
 	-DLIBGIT2_FROM_PKGCONFIG=ON \
 	"$BASEDIR"/subsurface