diff options
Diffstat (limited to 'scripts/build_win32.sh')
| -rw-r--r-- | scripts/build_win32.sh | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/scripts/build_win32.sh b/scripts/build_win32.sh index 993c0273f..7e39c3b8d 100644 --- a/scripts/build_win32.sh +++ b/scripts/build_win32.sh @@ -1,17 +1,27 @@ #!/usr/bin/env bash set -e +<<<<<<< HEAD apt-get update && apt-get install -y mingw-w64 mingw-w64-tools \ default-jdk nsis libsaxonb-java curl +======= +>>>>>>> Refactoring:mingw:simplify toolchain mkdir win32 pushd win32 +<<<<<<< HEAD cmake -Dbinding/python:BOOL=FALSE -DSAMPLE_MAP=n -DBUILD_MAPTOOL=n \ -DXSLTS=windows -DCMAKE_TOOLCHAIN_FILE=../Toolchain/mingw32.cmake .. +======= +cmake -DTARGET_ARCH=i686-w64-mingw32 -DCMAKE_SYSTEM_NAME=Windows \ + -Dbinding/python:BOOL=FALSE -DSAMPLE_MAP=n -DBUILD_MAPTOOL=n \ + -DXSLTS=windows -DCMAKE_TOOLCHAIN_FILE=../Toolchain/mingw.cmake .. + +>>>>>>> Refactoring:mingw:simplify toolchain make -j $(nproc --all) make -j $(nproc --all) package popd -cp win32/*.exe $CIRCLE_ARTIFACTS/ +cp win32/*.exe $CIRCLE_ARTIFACTS/
\ No newline at end of file |