diff options
| author | Bignaux Ronan <ronan@aimao.org> | 2019-05-20 20:54:35 +0200 |
|---|---|---|
| committer | jkoan <jkoan@users.noreply.github.com> | 2019-05-20 21:29:43 +0200 |
| commit | b2205d39d2864f4ed7fd3d931b2e6b8f06a6b38b (patch) | |
| tree | 90a4d71b760b16b0b7864711eb3a9ebabde6622d | |
| parent | 6381e2cd7a1a22aace8da1e67c1ecb99c1879ec9 (diff) | |
| download | navit-b2205d39d2864f4ed7fd3d931b2e6b8f06a6b38b.tar.gz | |
fix
| -rw-r--r-- | scripts/build_win32.sh | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/scripts/build_win32.sh b/scripts/build_win32.sh index 7e39c3b8d..ce0ec0c07 100644 --- a/scripts/build_win32.sh +++ b/scripts/build_win32.sh @@ -1,24 +1,15 @@ #!/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 |