.

toburger · Sep 30, 2017 · 655d070 · 655d070
1 parent c9d5f91
commit 655d070
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/build.sh b/build.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -x
 
-export BASE_DIR=`/home/matthijs/skiasharp-raspberry`
+export BASE_DIR="/home/matthijs/skiasharp-raspberry"
 
 export BUILD_DIR=$BASE_DIR/build
 export RPI_ROOT=$BASE_DIR/rpi
@@ -19,6 +19,7 @@ if true; then
     chroot $RPI_ROOT apt -q -y --force-yes install build-essential
     chroot $RPI_ROOT apt -q -y --force-yes install gcc-multilib g++-multilib
     chroot $RPI_ROOT apt -q -y --force-yes install libstdc++-4.8-dev
+    chroot $RPI_ROOT apt -q -y --force-yes install libfontconfig1-dev
 fi
 
 # clean build?
@@ -44,7 +45,7 @@ if true; then
     git apply $BASE_DIR/skia-build-script-changes.patch
 
 fi
-exit
+
 cd $BUILD_DIR/skia/externals/skia
 export PATH="$PATH:$BUILD_DIR/skia/externals/depot_tools"
 
@@ -75,8 +76,8 @@ if true; then
         "-mfpu=neon",
         "--sysroot=/home/matthijs/skiasharp-raspberry/rpi",
         "-I/home/matthijs/skiasharp-raspberry/rpi/usr/include/c++/4.9",
-        "-I/home/matthijs/skiasharp-raspberry/rpi/usr/include/arm-linux-gnueabi",
-        "-I/home/matthijs/skiasharp-raspberry/rpi/usr/include/arm-linux-gnueabi/c++/4.9",
+        "-I/home/matthijs/skiasharp-raspberry/rpi/usr/include/arm-linux-gnueabihf",
+        "-I/home/matthijs/skiasharp-raspberry/rpi/usr/include/arm-linux-gnueabihf/c++/4.9",
         "-I/home/matthijs/skiasharp-raspberry/rpi/usr/include/freetype2",
         "-DSKIA_C_DLL"
       ]
@@ -98,7 +99,7 @@ cd ../../native-builds/libSkiaSharp_linux
 
 make clean
 
-ARCH=arm SUPPORT_GPU=0 CXX=arm-linux-gnueabihf-g++ CC=arm-linux-gnueabihf-g++ LDFLAGS="-Wl,-L /root/rpi/usr/lib/arm-linux-gnueabihf -Wl,-g -Wl,-lfreetype" CXXFLAGS="-march=armv7-a -mthumb -mfpu=neon -mfloat-abi=hard" make
+ARCH=arm SUPPORT_GPU=0 CXX=arm-linux-gnueabihf-g++ CC=arm-linux-gnueabihf-g++ LDFLAGS="-Wl,-L /home/matthijs/skiasharp-raspberry/rpi/usr/lib/arm-linux-gnueabihf -Wl,-g -Wl,-lfreetype" CXXFLAGS="-march=armv7-a -mthumb -mfpu=neon -mfloat-abi=hard" make
 
 # ARCH=arm SUPPORT_GPU=0 CXX=clang++ CC=clang++ LDFLAGS="-target armv7a-linux -mfloat-abi=hard -mfpu=vfpv3 -Wl,-L /root/rpi/usr/lib/arm-linux-gnueabihf -Wl,-g -Wl,-lfreetype" CXXFLAGS="-target armv7a-linux -mfloat-abi=hard -mfpu=vfpv3 --sysroot=/root/rpi -std=c++11" make