Skip to content

Commit 60dbfa4

Browse files
committed
update circleci config for win32 (unrelated)
1 parent 98b9206 commit 60dbfa4

File tree

3 files changed

+4
-332
lines changed

3 files changed

+4
-332
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@
1010
/navit/android/cmake_plugin_settings.txt
1111
/nbproject/
1212
navit/android/checkstyle
13+
test.sh

scripts/build_android.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ pushd $BUILD_PATH
3333
echo Run CMake
3434
test -z "$PKG_CONFIG_LIBDIR" && export PKG_CONFIG_LIBDIR="" # Force cmake below to run ignore build host libraries when using pkgconfig.
3535
# Note: If you want to compile against specific target libraries that are searched using pkgconfig, please run this script with variable PKG_CONFIG_LIBDIR set to the appropriate path
36-
cmake ../ -Dvehicle/gpsd_dbus:BOOL=FALSE -Dsvg2png_scaling:STRING=-1,24,32,48,64,96,128,192,256 -Dsvg2png_scaling_nav:STRING=-1,24,32,48,64,96,128,192,256 -Dsvg2png_scaling_flag:STRING=-1,24,32,64,96 -DXSL_PROCESSING=y -DXSLTS=android -DANDROID=y -DDISABLE_CXX=y || exit 1
36+
cmake ../ -Dvehicle/gpsd_dbus:BOOL=FALSE -Dsvg2png_scaling:STRING=-1,24,32,48,64,96,128,192,256 -Dsvg2png_scaling_nav:STRING=-1,24,32,48,64,96,128,192,256 -Dsvg2png_scaling_flag:STRING=-1,24,32,64,96 -DXSL_PROCESSING=y -DXSLTS=android -DANDROID=y -DDISABLE_CXX=y -DDISABLE_QT=y || exit 1
3737

3838
echo Process icons
3939
pushd navit/icons
@@ -42,7 +42,7 @@ rm -rf ../../android/res/drawable-nodpi
4242
mkdir -p ../../android/res/drawable-nodpi
4343
cp ./*.png ../../android/res/drawable-nodpi
4444
pushd ../../android/res/drawable-nodpi
45-
rename -f 'y/A-Z/a-z/' ./*.png
45+
rename 'y/A-Z/a-z/' ./*.png
4646
popd
4747
popd
4848

@@ -53,7 +53,7 @@ rm -rf ../android/res/raw
5353
mkdir -p ../android/res/raw
5454
cp ./*.mo ../android/res/raw
5555
pushd ../android/res/raw
56-
rename -f 'y/A-Z/a-z/' ./*.mo
56+
rename 'y/A-Z/a-z/' ./*.mo
5757
popd
5858
popd
5959

scripts/menu.tsv

Lines changed: 0 additions & 329 deletions
This file was deleted.

0 commit comments

Comments
 (0)