diff options
| author | Robin Watts <robin.watts@artifex.com> | 2012-03-13 20:25:38 +0000 |
|---|---|---|
| committer | Robin Watts <robin.watts@artifex.com> | 2012-03-13 20:59:19 +0000 |
| commit | 3212863288c4ad6396482b8fdb14db2af27c123f (patch) | |
| tree | 9d7c7efe3a585c538f6e8d0edd5e3a77b5b8b6b5 /android/jni/Core.mk | |
| parent | b6e9b2f8fe172d7175cea3d14d89f986688639af (diff) | |
| parent | 33dc06b61c0816854193f006c35a9e797f098a22 (diff) | |
| download | mupdf-3212863288c4ad6396482b8fdb14db2af27c123f.tar.xz | |
Merge master and pg_android branches
Bring up to date with current APIs, including text device changes.
Diffstat (limited to 'android/jni/Core.mk')
| -rw-r--r-- | android/jni/Core.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/android/jni/Core.mk b/android/jni/Core.mk index 51908298..a4127c67 100644 --- a/android/jni/Core.mk +++ b/android/jni/Core.mk @@ -8,7 +8,7 @@ LOCAL_CFLAGS += -DARCH_ARM -DARCH_THUMB -DARCH_ARM_CAN_LOAD_UNALIGNED LOCAL_C_INCLUDES := \ ../thirdparty/jbig2dec \ - ../thirdparty/openjpeg-1.4/libopenjpeg \ + ../thirdparty/openjpeg-1.5.0/libopenjpeg \ ../thirdparty/jpeg-8d \ ../thirdparty/zlib-1.2.5 \ ../thirdparty/freetype-2.4.8/include \ @@ -28,7 +28,6 @@ LOCAL_SRC_FILES := \ $(MY_ROOT)/fitz/base_getopt.c \ $(MY_ROOT)/fitz/base_hash.c \ $(MY_ROOT)/fitz/base_memory.c \ - $(MY_ROOT)/fitz/base_object.c \ $(MY_ROOT)/fitz/base_string.c \ $(MY_ROOT)/fitz/base_time.c \ $(MY_ROOT)/fitz/crypt_aes.c \ @@ -74,6 +73,7 @@ LOCAL_SRC_FILES := \ $(MY_ROOT)/draw/draw_path.c \ $(MY_ROOT)/draw/draw_simple_scale.c \ $(MY_ROOT)/draw/draw_unpack.c \ + $(MY_ROOT)/pdf/base_object.c \ $(MY_ROOT)/pdf/pdf_annot.c \ $(MY_ROOT)/pdf/pdf_cmap.c \ $(MY_ROOT)/pdf/pdf_cmap_load.c \ @@ -97,6 +97,7 @@ LOCAL_SRC_FILES := \ $(MY_ROOT)/pdf/pdf_repair.c \ $(MY_ROOT)/pdf/pdf_shade.c \ $(MY_ROOT)/pdf/pdf_stream.c \ + $(MY_ROOT)/pdf/pdf_store.c \ $(MY_ROOT)/pdf/pdf_type3.c \ $(MY_ROOT)/pdf/pdf_unicode.c \ $(MY_ROOT)/pdf/pdf_xobject.c \ |