MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2788 from kelvie/build-stonesense 

cross compile: build stonesense as well
develop
Myk 2023-02-03 10:29:43 -08:00 committed by GitHub
parent 9db9d06867 5b4e3bd607
commit 114014878e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build.yml vendored
Unescape Escape View File

@ -145,7 +145,7 @@ jobs:
- name: Cross-compile win64 artifacts - name: Cross-compile win64 artifacts
run: | run: |
cd build cd build
env EXTRA_CMAKE_ARGS="-DBUILD_STONESENSE:BOOL=1" 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 - name: Format artifact name
id: artifactname id: artifactname
run: | run: |

2
build/build-win64-from-linux.sh
Unescape Escape View File

@ -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 \ -e CCACHE_DIR=/src/build/ccache \
--name dfhack-win \ --name dfhack-win \
ghcr.io/dfhack/build-env:msvc \ 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 ${EXTRA_CMAKE_ARGS} && 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 ; then
echo echo
echo "Build failed" echo "Build failed"