diff options
| author | Bignaux Ronan <ronan@aimao.org> | 2018-09-06 23:21:48 +0200 |
|---|---|---|
| committer | jkoan <jkoan@users.noreply.github.com> | 2019-05-20 21:29:43 +0200 |
| commit | 6381e2cd7a1a22aace8da1e67c1ecb99c1879ec9 (patch) | |
| tree | b0d547ff0282cfefbe4dbe88faf4b6d57dc827db /scripts | |
| parent | ed5477dd42f5ec94e0228e762192ceed8122b7d4 (diff) | |
| download | navit-6381e2cd7a1a22aace8da1e67c1ecb99c1879ec9.tar.gz | |
Refactoring:mingw:simplify toolchain
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/build_win32.sh | 12 | ||||
| -rw-r--r-- | scripts/build_wince.sh | 12 |
2 files changed, 20 insertions, 4 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 diff --git a/scripts/build_wince.sh b/scripts/build_wince.sh index 20eb5036e..f7950cc9e 100644 --- a/scripts/build_wince.sh +++ b/scripts/build_wince.sh @@ -1,8 +1,14 @@ -#!/bin/sh +#!/usr/bin/env bash set -e -mkdir -p wince && cd wince -cmake ../ -DCMAKE_TOOLCHAIN_FILE=Toolchain/arm-mingw32ce.cmake -DXSLTS=windows,wince -DCACHE_SIZE=10485760 -Dsvg2png_scaling:STRING=16,32 -Dsvg2png_scaling_nav:STRING=32 -Dsvg2png_scaling_flag=16 -DSAMPLE_MAP=n +mkdir -p wince +pushd wince +# +cmake \ + -DTARGET_ARCH=arm-mingw32ce -DCMAKE_SYSTEM_NAME=WindowsCEtest \ + -DCMAKE_TOOLCHAIN_FILE=../Toolchain/mingw.cmake \ + -DXSLTS=windows,wince -DCACHE_SIZE=10485760 -Dsvg2png_scaling:STRING=16,32 \ + -Dsvg2png_scaling_nav:STRING=32 -Dsvg2png_scaling_flag=16 -DSAMPLE_MAP=n .. make test -d output && rm -rf output |