diff options
| author | Robin Watts <robin.watts@artifex.com> | 2013-06-21 15:16:39 +0100 |
|---|---|---|
| committer | Robin Watts <robin.watts@artifex.com> | 2013-06-21 15:23:36 +0100 |
| commit | 82131246a46ed4547c978b0081d4e0db9d6f3942 (patch) | |
| tree | debd12abf0e2f5c3ce977e3813db7c0f7238fa31 /platform/android/jni/ThirdParty.mk | |
| parent | e2673a829b61d77d7884ecabac2424fdb28309e8 (diff) | |
| download | mupdf-82131246a46ed4547c978b0081d4e0db9d6f3942.tar.xz | |
Fix Android builds.
Had to rejig the thumb entry/exit veneers to allow for NDK_PROFILER
operation, but this seems to have negated the need for Core2.mk, so
removed that here.
Diffstat (limited to 'platform/android/jni/ThirdParty.mk')
| -rw-r--r-- | platform/android/jni/ThirdParty.mk | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/platform/android/jni/ThirdParty.mk b/platform/android/jni/ThirdParty.mk index 1a104b4b..e4cd3d67 100644 --- a/platform/android/jni/ThirdParty.mk +++ b/platform/android/jni/ThirdParty.mk @@ -5,12 +5,12 @@ include $(CLEAR_VARS) MY_ROOT := ../.. LOCAL_C_INCLUDES := \ - ../thirdparty/jbig2dec \ - ../thirdparty/openjpeg/src/lib/openjp2 \ - ../thirdparty/jpeg \ - ../thirdparty/zlib \ - ../thirdparty/freetype/include \ - ../scripts + ../../thirdparty/jbig2dec \ + ../../thirdparty/openjpeg/src/lib/openjp2 \ + ../../thirdparty/jpeg \ + ../../thirdparty/zlib \ + ../../thirdparty/freetype/include \ + ../../scripts LOCAL_CFLAGS := \ -DFT2_BUILD_LIBRARY -DDARWIN_NO_CARBON -DHAVE_STDINT_H \ @@ -129,4 +129,6 @@ LOCAL_SRC_FILES := \ $(MY_ROOT)/thirdparty/freetype/src/truetype/truetype.c \ $(MY_ROOT)/thirdparty/freetype/src/type1/type1.c +LOCAL_SRC_FILES := $(addprefix ../, $(LOCAL_SRC_FILES)) + include $(BUILD_STATIC_LIBRARY) |