diff options
| author | jandegr <jandegr@users.noreply.github.com> | 2016-10-22 13:58:48 +0200 |
|---|---|---|
| committer | jandegr <jandegr@users.noreply.github.com> | 2016-10-22 13:58:48 +0200 |
| commit | b08785acced9e9c8fe6c5dda61108a8a2e1b7440 (patch) | |
| tree | 390809c63739ddaf3c6827245ad25d9ae21f0dcd | |
| parent | ff638450080d1eda32430759caea116bc8ec9ca3 (diff) | |
| download | navit-b08785acced9e9c8fe6c5dda61108a8a2e1b7440.tar.gz | |
cleanup
| -rw-r--r-- | ci/build_tomtom_plugin.sh (renamed from ci/build_tomtom.sh) | 33 | ||||
| -rw-r--r-- | circle.yml | 3 |
2 files changed, 4 insertions, 32 deletions
diff --git a/ci/build_tomtom.sh b/ci/build_tomtom_plugin.sh index fe9178a3f..93dcce3dd 100644 --- a/ci/build_tomtom.sh +++ b/ci/build_tomtom_plugin.sh @@ -1,5 +1,5 @@ #!/bin/sh - +# this builds a plugin for tomtom # in case you want to build a standalone system # https://github.com/george-hopkins/opentom # https://github.com/gefin/opentom @@ -32,6 +32,7 @@ JOBS=`getconf _NPROCESSORS_ONLN` echo "Jobs" echo $JOBS +mkdir -p ~/tomtom_assets if ! [ -e "~/tomtom_assets/toolchain_redhat_gcc-3.3.4_glibc-2.3.2-20060131a.tar.gz" ] then @@ -199,18 +200,7 @@ cd libpng-1.6.25/ ./configure --prefix=$PREFIX --host=$ARCH make -j$JOBS make install - -# libjpeg -# if ! test -f "$PREFIX/include/jpeglib.h" -# then -# cd /tmp -# wget -c http://www.ijg.org/files/jpegsrc.v9b.tar.gz -# tar xzf jpegsrc.v9b.tar.gz -# cd jpeg-9b -# ./configure --prefix=$PREFIX --host=$ARCH -# make -j$JOBS -# make install -#fi + cd /tmp wget -c http://download.savannah.gnu.org/releases/freetype/freetype-2.5.0.tar.gz @@ -290,23 +280,6 @@ cd SDL_image-1.2.12 make -j$JOBS make install -# sdl ttf -# cd /tmp -# wget -c http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-2.0.11.tar.gz -# tar xzf SDL_ttf-2.0.11.tar.gz -# cd SDL_ttf-2.0.11 -# ./configure --prefix=$PREFIX --host=$ARCH --with-sdl-prefix=$PREFIX -# make -j$JOBS -# make install - -# flite -# cd /tmp -# wget -c www.festvox.org/flite/packed/flite-2.0/flite-2.0.0-release.tar.bz2 -# tar jxvf flite-2.0.0-release.tar.bz2 -# cd flite-2.0.0-release -# ./configure --prefix=$PREFIX --host=$ARCH -# make -j$JOBS -# make install # in the end we only want Navit locale rm -r $PREFIX/share/locale diff --git a/circle.yml b/circle.yml index 283ea2faa..b0675ef57 100644 --- a/circle.yml +++ b/circle.yml @@ -10,7 +10,6 @@ dependencies: pre: - "[ -d ~/assets ] || mkdir ~/assets" - "[ -d ~/android ] || mkdir ~/android" - - "[ -d ~/tomtom_assets ] || mkdir ~/tomtom_assets" - wget -c -O ~/assets/cov-analysis-linux64-7.6.0.tar.gz http://sd-55475.dedibox.fr/cov-analysis-linux64-7.6.0.tar.gz - sudo apt-get update - sudo apt-get install cmake @@ -33,7 +32,7 @@ dependencies: - bash ci/build_android.sh - bash ci/build_android_x86.sh # Tomtom build - - bash ci/build_tomtom.sh + - bash ci/build_tomtom_plugin.sh # Windows build - sudo apt-get install mingw32 mingw32-binutils mingw32-runtime - sudo apt-get install default-jdk nsis |