diff options
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 55 |
1 files changed, 27 insertions, 28 deletions
@@ -1,10 +1,10 @@ # this is now the default FreeType build for Android # ifndef USE_FREETYPE -USE_FREETYPE := 2.4.2 +USE_FREETYPE := 2.6.0 endif -ifeq ($(USE_FREETYPE),2.4.2) +ifeq ($(USE_FREETYPE),2.6.0) LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) @@ -14,34 +14,33 @@ include $(CLEAR_VARS) LOCAL_ARM_MODE := arm LOCAL_SRC_FILES:= \ - src/base/ftbbox.c \ - src/base/ftbitmap.c \ - src/base/ftfstype.c \ - src/base/ftglyph.c \ - src/base/ftlcdfil.c \ - src/base/ftstroke.c \ - src/base/fttype1.c \ - src/base/ftxf86.c \ - src/base/ftbase.c \ - src/base/ftsystem.c \ - src/base/ftinit.c \ - src/base/ftgasp.c \ - src/base/ftmm.c \ - src/gzip/ftgzip.c \ - src/raster/raster.c \ - src/sfnt/sfnt.c \ - src/smooth/smooth.c \ - src/autofit/autofit.c \ - src/truetype/truetype.c \ - src/cff/cff.c \ - src/psnames/psnames.c \ - src/pshinter/pshinter.c + src/base/ftbbox.c \ + src/base/ftbitmap.c \ + src/base/ftfntfmt.c \ + src/base/ftfstype.c \ + src/base/ftglyph.c \ + src/base/ftlcdfil.c \ + src/base/ftstroke.c \ + src/base/fttype1.c \ + src/base/ftbase.c \ + src/base/ftsystem.c \ + src/base/ftinit.c \ + src/base/ftgasp.c \ + src/base/ftmm.c \ + src/gzip/ftgzip.c \ + src/raster/raster.c \ + src/sfnt/sfnt.c \ + src/smooth/smooth.c \ + src/autofit/autofit.c \ + src/truetype/truetype.c \ + src/cff/cff.c \ + src/psnames/psnames.c \ + src/pshinter/pshinter.c LOCAL_C_INCLUDES += \ - $(LOCAL_PATH)/builds \ - $(LOCAL_PATH)/include \ - external/libpng \ - external/zlib + $(LOCAL_PATH)/include \ + external/libpng \ + external/zlib LOCAL_CFLAGS += -W -Wall LOCAL_CFLAGS += -fPIC -DPIC |