From cddcf7850d148b9b790a58fed9275d02300dc981 Mon Sep 17 00:00:00 2001 From: Kelvie Wong Date: Tue, 31 Jan 2023 17:13:39 -0800 Subject: [PATCH] cross compile: build stonesense as well --- .github/workflows/build.yml | 2 +- build/build-win64-from-linux.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9b8892882..a271082c2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -145,7 +145,7 @@ jobs: - name: Cross-compile win64 artifacts run: | cd build - bash -x build-win64-from-linux.sh + env CMAKE_EXTRA_ARGS=-DBUILD_STONESENSE:BOOL=1 bash -x build-win64-from-linux.sh - name: Format artifact name id: artifactname run: | diff --git a/build/build-win64-from-linux.sh b/build/build-win64-from-linux.sh index 2ba053434..11f4dbbc5 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 $CMAKE_EXTRA_ARGS && dfhack-make -j$jobs install" \ ; then echo echo "Build failed"