diff options
| -rw-r--r-- | Android.mk | 8 | ||||
| -rw-r--r-- | include/freetype/config/ftoption.h | 2 |
2 files changed, 7 insertions, 3 deletions
@@ -37,13 +37,17 @@ LOCAL_SRC_FILES:= \ LOCAL_C_INCLUDES += \ $(LOCAL_PATH)/builds \ - $(LOCAL_PATH)/include + $(LOCAL_PATH)/include \ + external/libpng \ + external/zlib LOCAL_CFLAGS += -W -Wall LOCAL_CFLAGS += -fPIC -DPIC LOCAL_CFLAGS += "-DDARWIN_NO_CARBON" LOCAL_CFLAGS += "-DFT2_BUILD_LIBRARY" +LOCAL_SHARED_LIBRARIES += libpng libz + # the following is for testing only, and should not be used in final builds # of the product #LOCAL_CFLAGS += "-DTT_CONFIG_OPTION_BYTECODE_INTERPRETER" @@ -52,5 +56,5 @@ LOCAL_CFLAGS += -O2 LOCAL_MODULE:= libft2 -include $(BUILD_STATIC_LIBRARY) +include $(BUILD_SHARED_LIBRARY) endif diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h index 44e4fb0..bc239bf 100644 --- a/include/freetype/config/ftoption.h +++ b/include/freetype/config/ftoption.h @@ -225,7 +225,7 @@ FT_BEGIN_HEADER /* */ /* Define this macro if you want to enable this `feature'. */ /* */ -/* #define FT_CONFIG_OPTION_USE_PNG */ +#define FT_CONFIG_OPTION_USE_PNG /*************************************************************************/ |