wip

Oliver Marks · Oliver Marks · commit 15025b3018f0 · 2015-06-25T14:31:52.000+01:00
diff --git a/recipes/harfbuzz/recipe.sh b/recipes/harfbuzz/recipe.sh
@@ -21,11 +21,11 @@ function shouldbuild_harfbuzz() {
 function build_harfbuzz() {
     cd $BUILD_harfbuzz
     push_arm
-	export CFLAGS="$CFLAGS -I$BUILD_freetype/include"
-	export LDFLAGS="$LDFLAGS -L$LIBS_PATH"
-	#export LDSHARED="$LIBLINK"
+    export CFLAGS="$CFLAGS -I$BUILD_freetype/include"
+    export LDFLAGS="$LDFLAGS -L$LIBS_PATH"
+    #export LDSHARED="$LIBLINK"
     #try ./autogen.sh
-    try ./configure --build=i686-pc-linux-gnu  --without-icu --host=arm-linux-androideabi --prefix="$BUILD_PATH/python-install" --without-freetype --without-glib 
+    try ./configure --build=i686-pc-linux-gnu  --without-icu --host=arm-linux-androideabi --prefix="$BUILD_PATH/python-install" --without-freetype --without-glib  --enable-shared
     try make -j5
     pop_arm
     try cp -L $BUILD_harfbuzz/src/.libs/libharfbuzz.so $LIBS_PATH
@@ -40,12 +40,26 @@ function postbuild_harfbuzz() {
         export CFLAGS="$CFLAGS -I$BUILD_freetype/include"
         #export LDFLAGS="$LDFLAGS -L$LIBS_PATH"
         #export LDSHARED="$LIBLINK"
-        try ./configure --build=i686-pc-linux-gnu  --without-icu --host=arm-linux-androideabi --prefix="$BUILD_PATH/python-install" --without-glib 
+        try ./configure --build=i686-pc-linux-gnu  --without-icu --host=arm-linux-androideabi --prefix="$BUILD_PATH/python-install" --without-glib  --enable-shared
         try make -j5 -nostdinc 
         pop_arm
         echo $LIBS_PATH
         ls $BUILD_harfbuzz/src/.libs
         try cp -L $BUILD_harfbuzz/src/.libs/libharfbuzz.so $LIBS_PATH
+
+        cd $BUILD_freetype
+        push_arm
+        export HARFBUZZ_CFLAGS="-I$BUILD_harfbuzz/src/"
+        export HARFBUZZ_LIBS="-L$BUILD_harfbuzz/src/.libs/"
+        try ./configure --host=arm-linux-androideabi --prefix=$BUILD_freetype --without-zlib --with-png=no --with-harfbuzz=yes --enable-shared
+    
+        #-nostdinc is breaking but we probably want this
+        try make -j5
+        pop_arm
+
+        try cp $BUILD_freetype/objs/.libs/libfreetype.so $LIBS_PATH
+
+
     fi
 }
 
diff --git a/src/src/org/renpy/android/PythonService.java b/src/src/org/renpy/android/PythonService.java
@@ -90,6 +90,20 @@ public void run(){
         System.load(getFilesDir() + "/lib/python2.7/lib-dynload/_io.so");
         System.load(getFilesDir() + "/lib/python2.7/lib-dynload/unicodedata.so");
         
+        try {
+            System.load("/data/data/org.fabricad.fabricad/lib/libfreetype.so");
+        } catch(UnsatisfiedLinkError e) {
+            Log.e("JNI", "WARNING: Could not load libfreetype" + e);
+            System.exit(1);
+        }
+        
+        try {
+            System.load("/data/data/org.fabricad.fabricad/lib/libharfbuzz.so");
+        } catch(UnsatisfiedLinkError e) {
+            Log.e("JNI", "WARNING: Could not load libharfbuzz.so" + e);
+            System.exit(1);
+        }
+        //FreeLibrary();
         try {
             System.loadLibrary("ctypes");
             System.load(getFilesDir() + "/lib/python2.7/lib-dynload/_ctypes.so");
