From 868d35bc781fbc8245090c18d16c6c8bb4994024 Mon Sep 17 00:00:00 2001
From: Corey <synik4l@gmail.com>
Date: Sun, 29 Jan 2023 23:10:50 -0600
Subject: [PATCH 1/3] Always build stonesense

Stonesense was not being built by github actions
---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9b8892882..5bd5ae9f3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -87,7 +87,7 @@ jobs:
           -DBUILD_DEV_PLUGINS:BOOL=${{ matrix.plugins == 'all' }} \
           -DBUILD_SIZECHECK:BOOL=${{ matrix.plugins == 'all' }} \
           -DBUILD_SKELETON:BOOL=${{ matrix.plugins == 'all' }} \
-          -DBUILD_STONESENSE:BOOL=${{ matrix.plugins == 'all' }} \
+          -DBUILD_STONESENSE:BOOL=1 \
           -DBUILD_SUPPORTED:BOOL=1 \
           -DCMAKE_C_COMPILER_LAUNCHER=ccache \
           -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \

From 04f586b5c8a36a25e53740210621e4058bfa28ff Mon Sep 17 00:00:00 2001
From: Myk <myk.taylor@gmail.com>
Date: Fri, 3 Feb 2023 10:12:25 -0800
Subject: [PATCH 2/3] move stonesense flag to the cross compile action

---
 .github/workflows/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5bd5ae9f3..04b467af5 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -87,7 +87,7 @@ jobs:
           -DBUILD_DEV_PLUGINS:BOOL=${{ matrix.plugins == 'all' }} \
           -DBUILD_SIZECHECK:BOOL=${{ matrix.plugins == 'all' }} \
           -DBUILD_SKELETON:BOOL=${{ matrix.plugins == 'all' }} \
-          -DBUILD_STONESENSE:BOOL=1 \
+          -DBUILD_STONESENSE:BOOL=${{ matrix.plugins == 'all' }} \
           -DBUILD_SUPPORTED:BOOL=1 \
           -DCMAKE_C_COMPILER_LAUNCHER=ccache \
           -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
@@ -145,7 +145,7 @@ jobs:
       - name: Cross-compile win64 artifacts
         run: |
           cd build
-          bash -x build-win64-from-linux.sh
+          env EXTRA_CMAKE_ARGS="-DBUILD_STONESENSE:BOOL=1" bash -x build-win64-from-linux.sh
       - name: Format artifact name
         id: artifactname
         run: |

From d980c7bdefaa2d8c80f077d422248ae0a33bd851 Mon Sep 17 00:00:00 2001
From: Myk <myk.taylor@gmail.com>
Date: Fri, 3 Feb 2023 10:25:04 -0800
Subject: [PATCH 3/3] actually expand EXTRA_CMAKE_ARGS in the command

---
 build/build-win64-from-linux.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/build-win64-from-linux.sh b/build/build-win64-from-linux.sh
index 2ba053434..27249a15e 100755
--- a/build/build-win64-from-linux.sh
+++ b/build/build-win64-from-linux.sh
@@ -43,7 +43,7 @@ if ! docker run --rm -i -v "$srcdir":/src -v "$srcdir/build/win64-cross/":/src/b
     -e CCACHE_DIR=/src/build/ccache \
     --name dfhack-win \
     ghcr.io/dfhack/build-env:msvc \
-    bash -c "cd /src/build && dfhack-configure windows 64 Release -DCMAKE_INSTALL_PREFIX=/src/build/output cmake .. -DBUILD_DOCS=1 && dfhack-make -j$jobs install" \
+    bash -c "cd /src/build && dfhack-configure windows 64 Release -DCMAKE_INSTALL_PREFIX=/src/build/output cmake .. -DBUILD_DOCS=1 ${EXTRA_CMAKE_ARGS} && dfhack-make -j$jobs install" \
     ; then
     echo
     echo "Build failed"