Add freetype support to android port.
authorDaniel G <giri@nwrk.biz>
Thu, 31 Jan 2019 00:42:44 +0000 (01:42 +0100)
committerDaniel G <giri@nwrk.biz>
Thu, 31 Jan 2019 00:42:44 +0000 (01:42 +0100)
_template/packages/allegro5.1.13/Makefile
_template/packages/nanox/config_android_arm
_template/src/Makefile

index f7889fe..4a5f1ba 100644 (file)
@@ -21,7 +21,10 @@ android_arm:
        . $(WORKDIR)/setenv.sh $(ANDROID_TARGET_VER) ; \
        mkdir -p ./buildandroid; \
        cd ./buildandroid; \
-       cmake ..  -DANDROID_NDK_TOOLCHAIN_ROOT=../android_toolchain -DWANT_ANDROID=on -DCMAKE_BUILD_TYPE=Release -DANDROID_TARGET=android-$(ANDROID_TARGET_VER) -DARM_TARGETS=armeabi-v7a -DSHARED=true -DWANT_MONOLITH=ON -DWANT_EXAMPLES=false -DWANT_DEMO=false  -DWANT_TESTS=false; \
+       cmake ..  -DANDROID_NDK_TOOLCHAIN_ROOT=../android_toolchain -DWANT_ANDROID=on \
+       -DWANT_TTF=ON -DFREETYPE_INCLUDE_DIRS=$(WORKDIR)/../../include/ -DFREETYPE_LIBRARY=$(WORKDIR)/../../lib/android_arm/libfreetype.a \
+       -DCMAKE_BUILD_TYPE=Release -DANDROID_TARGET=android-$(ANDROID_TARGET_VER) -DARM_TARGETS=armeabi-v7a \
+       -DSHARED=true -DWANT_MONOLITH=ON -DWANT_EXAMPLES=false -DWANT_DEMO=false  -DWANT_TESTS=false; \
        make -j4 -i
        mkdir -p $(WORKDIR)/../../include
        mkdir -p $(WORKDIR)/../../lib/android_arm
index 2dec950..a8a3df6 100644 (file)
@@ -169,19 +169,19 @@ LIBTIFF                  = -ltiff
 # PCF font support - .pcf/.pcf.gz loadable fonts
 ####################################################################
 HAVE_PCF_SUPPORT         = Y
-HAVE_PCFGZ_SUPPORT       = N
+HAVE_PCFGZ_SUPPORT       = Y
 PCF_FONT_DIR             = "fonts/pcf"
 
 ####################################################################
 # Truetype fonts - .ttf loadable fonts thru Freetype 2.x
 ####################################################################
-HAVE_FREETYPE_2_SUPPORT  = N
+HAVE_FREETYPE_2_SUPPORT  = Y
 INCFT2LIB                = /usr/include
 ifneq ($(ARCH),ANDROID)
 LIBFT2LIB                = -lfreetype
 FREETYPE_FONT_DIR        = "fonts/truetype"
 else
-LIBFT2LIB                = -lfreetype-android
+LIBFT2LIB                = -lfreetype
 FREETYPE_FONT_DIR        = "/system/fonts"
 endif
 
index 60886fb..2a2442b 100644 (file)
@@ -118,7 +118,7 @@ LIBDIR_ANDROID += -L$(ANDROID_NDK_ROOT)/sources/cxx-stl/llvm-libc++/libs/$(ANDRO
 CFLAGS_ANDROID  = $(CFLAGS) --sysroot=$(ANDROID_NDK_ROOT)/platforms/$(ANDROID_PLATORM)/arch-$(ANDROID_ARCH) -D_ANDROID
 RESINC_ANDROID =
 LDFLAGS_ANDROID  =  $(LDFLAGS) -shared --sysroot=$(ANDROID_NDK_ROOT)/platforms/$(ANDROID_PLATORM)/arch-$(ANDROID_ARCH)
-LIB_ANDROID  = $(LIB) -lc++ -lNX11 -lnano-X -lm -Wl,-Bdynamic -lallegro
+LIB_ANDROID  = $(LIB) -lc++ -lNX11 -lnano-X -lfreetype -lm -Wl,-Bdynamic -lallegro
 
 ###################################
 #RELEASE LINUX32 SETTINGS | EDIT: 7/14