diff options
| author | Pierre GRANDIN <grandinp@altern.org> | 2015-07-21 09:37:07 -0700 |
|---|---|---|
| committer | Pierre GRANDIN <grandinp@altern.org> | 2015-07-21 09:37:07 -0700 |
| commit | c0195ac7ec6787790d9c51fcaf007c5108541bd1 (patch) | |
| tree | c89de7a28e49ecbe72b9fcdb647653edf6d9ce7e | |
| parent | a6ca1c10e4e6b701ede1e4f9b19143c7a36ad342 (diff) | |
| download | navit-c0195ac7ec6787790d9c51fcaf007c5108541bd1.tar.gz | |
Trying cmake without freetype for SDL
| -rwxr-xr-x | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | ci/build_tomtom.sh | 10 |
2 files changed, 5 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ab2b6ebdc..2ec4e39a1 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -274,7 +274,6 @@ else(FREETYPE_FOUND) set_with_reason(graphics/gd "FreeType library not found" FALSE) set_with_reason(graphics/gtk_drawing_area "FreeType library not found" FALSE) set_with_reason(graphics/opengl "FreeType library not found" FALSE) - set_with_reason(graphics/sdl "FreeType library not found" FALSE) endif(FREETYPE_FOUND) if(FONTCONFIG_FOUND) diff --git a/ci/build_tomtom.sh b/ci/build_tomtom.sh index a40162eea..6e7ca2d8e 100644 --- a/ci/build_tomtom.sh +++ b/ci/build_tomtom.sh @@ -213,11 +213,11 @@ if ! test -f "$PREFIX/bin/navit" then cd ~/navit sed -i "s|set ( TOMTOM_SDK_DIR /opt/tomtom-sdk )|set ( TOMTOM_SDK_DIR $TOMTOM_SDK_DIR )|g" /tmp/toolchain-$ARCH.cmake - # mkdir -p tomtom-build - # cd tomtom-build - # cmake .. -DCMAKE_INSTALL_PREFIX=$PREFIX -DCMAKE_TOOLCHAIN_FILE=/tmp/toolchain-$ARCH.cmake -DDISABLE_QT=ON -DSHARED_LIBNAVIT=ON - ./autogen.sh - ./configure --prefix=$PREFIX --build=i686-gnu-linux --target=$ARCH --host=$ARCH --enable-cache-size=1048576 --disable-postgresql --disable-fontconfig --disable-graphics-opengl --with-included-gettext --disable-binding-python --disable-binding-dbus --disable-nls --disable-rpath --disable-graphics-gtk-drawing-area --disable-graphics-qt-qpainter --disable-gui-gtk --disable-speech-android --disable-speech-speech-dispatcher --disable-vehicle-android --disable-vehicle-gypsy --disable-vehicle-maemo --disable-vehicle-null --disable-vehicle-wince --disable-binding-dbus-use-system-bus --disable-hildon --disable-osso --disable-maptool --disable-samplemap --disable-gmodule --disable-garmin --disable-map-mg --disable-graphics-null --disable-vehicle-demo --enable-svg2png-scaling=16,32,48 --enable-svg2png-scaling-flag=16 --enable-svg2png-scaling-nav=48 + mkdir -p tomtom-build + cd tomtom-build + cmake .. -DCMAKE_INSTALL_PREFIX=$PREFIX -DCMAKE_TOOLCHAIN_FILE=/tmp/toolchain-$ARCH.cmake -DDISABLE_QT=ON -DSHARED_LIBNAVIT=ON + # ./autogen.sh + # ./configure --prefix=$PREFIX --build=i686-gnu-linux --target=$ARCH --host=$ARCH --enable-cache-size=1048576 --disable-postgresql --disable-fontconfig --disable-graphics-opengl --with-included-gettext --disable-binding-python --disable-binding-dbus --disable-nls --disable-rpath --disable-graphics-gtk-drawing-area --disable-graphics-qt-qpainter --disable-gui-gtk --disable-speech-android --disable-speech-speech-dispatcher --disable-vehicle-android --disable-vehicle-gypsy --disable-vehicle-maemo --disable-vehicle-null --disable-vehicle-wince --disable-binding-dbus-use-system-bus --disable-hildon --disable-osso --disable-maptool --disable-samplemap --disable-gmodule --disable-garmin --disable-map-mg --disable-graphics-null --disable-vehicle-demo --enable-svg2png-scaling=16,32,48 --enable-svg2png-scaling-flag=16 --enable-svg2png-scaling-nav=48 make -j$JOBS make install cp navit/libnavit_core.so $PREFIX/lib |