From 50923a2d9da9023e846bacdf8cc5cc7961c17f7d Mon Sep 17 00:00:00 2001 From: Robin Watts Date: Fri, 27 Jan 2012 13:55:46 +0000 Subject: Android/Windows build fixes Update Android build for new thirdparty.zip. Small windows fix for pdf_xref -> pdf_document changes. --- android/jni/Core.mk | 4 +- android/jni/ThirdParty.mk | 174 +++++++++++++++++++++++----------------------- 2 files changed, 89 insertions(+), 89 deletions(-) (limited to 'android') diff --git a/android/jni/Core.mk b/android/jni/Core.mk index 0ed43751..84f21a25 100644 --- a/android/jni/Core.mk +++ b/android/jni/Core.mk @@ -9,9 +9,9 @@ LOCAL_CFLAGS += -DARCH_ARM -DARCH_THUMB -DARCH_ARM_CAN_LOAD_UNALIGNED LOCAL_C_INCLUDES := \ ../thirdparty/jbig2dec \ ../thirdparty/openjpeg-1.4/libopenjpeg \ - ../thirdparty/jpeg-8c \ + ../thirdparty/jpeg-8d \ ../thirdparty/zlib-1.2.5 \ - ../thirdparty/freetype-2.4.4/include \ + ../thirdparty/freetype-2.4.8/include \ ../draw \ ../fitz \ ../pdf \ diff --git a/android/jni/ThirdParty.mk b/android/jni/ThirdParty.mk index 0177d7f7..dcb7da2a 100644 --- a/android/jni/ThirdParty.mk +++ b/android/jni/ThirdParty.mk @@ -7,9 +7,9 @@ MY_ROOT := ../.. LOCAL_C_INCLUDES := \ ../thirdparty/jbig2dec \ ../thirdparty/openjpeg-1.4/libopenjpeg \ - ../thirdparty/jpeg-8c \ + ../thirdparty/jpeg-8d \ ../thirdparty/zlib-1.2.5 \ - ../thirdparty/freetype-2.4.4/include \ + ../thirdparty/freetype-2.4.8/include \ ../scripts LOCAL_CFLAGS := \ @@ -50,52 +50,52 @@ LOCAL_SRC_FILES := \ $(MY_ROOT)/thirdparty/openjpeg-1.4/libopenjpeg/t2.c \ $(MY_ROOT)/thirdparty/openjpeg-1.4/libopenjpeg/tcd.c \ $(MY_ROOT)/thirdparty/openjpeg-1.4/libopenjpeg/tgt.c \ - $(MY_ROOT)/thirdparty/jpeg-8c/jaricom.c \ - $(MY_ROOT)/thirdparty/jpeg-8c/jcapimin.c \ - $(MY_ROOT)/thirdparty/jpeg-8c/jcapistd.c \ - $(MY_ROOT)/thirdparty/jpeg-8c/jcarith.c \ - $(MY_ROOT)/thirdparty/jpeg-8c/jccoefct.c \ - $(MY_ROOT)/thirdparty/jpeg-8c/jccolor.c \ - $(MY_ROOT)/thirdparty/jpeg-8c/jcdctmgr.c \ - $(MY_ROOT)/thirdparty/jpeg-8c/jchuff.c \ - $(MY_ROOT)/thirdparty/jpeg-8c/jcinit.c \ - $(MY_ROOT)/thirdparty/jpeg-8c/jcmainct.c \ - $(MY_ROOT)/thirdparty/jpeg-8c/jcmarker.c \ - $(MY_ROOT)/thirdparty/jpeg-8c/jcmaster.c \ - $(MY_ROOT)/thirdparty/jpeg-8c/jcomapi.c \ - $(MY_ROOT)/thirdparty/jpeg-8c/jcparam.c \ - $(MY_ROOT)/thirdparty/jpeg-8c/jcprepct.c \ - $(MY_ROOT)/thirdparty/jpeg-8c/jcsample.c \ - $(MY_ROOT)/thirdparty/jpeg-8c/jctrans.c \ - $(MY_ROOT)/thirdparty/jpeg-8c/jdapimin.c \ - $(MY_ROOT)/thirdparty/jpeg-8c/jdapistd.c \ - $(MY_ROOT)/thirdparty/jpeg-8c/jdarith.c \ - $(MY_ROOT)/thirdparty/jpeg-8c/jdatadst.c \ - $(MY_ROOT)/thirdparty/jpeg-8c/jdatasrc.c \ - $(MY_ROOT)/thirdparty/jpeg-8c/jdcoefct.c \ - $(MY_ROOT)/thirdparty/jpeg-8c/jdcolor.c \ - $(MY_ROOT)/thirdparty/jpeg-8c/jddctmgr.c \ - $(MY_ROOT)/thirdparty/jpeg-8c/jdhuff.c \ - $(MY_ROOT)/thirdparty/jpeg-8c/jdinput.c \ - $(MY_ROOT)/thirdparty/jpeg-8c/jdmainct.c \ - $(MY_ROOT)/thirdparty/jpeg-8c/jdmarker.c \ - $(MY_ROOT)/thirdparty/jpeg-8c/jdmaster.c \ - $(MY_ROOT)/thirdparty/jpeg-8c/jdmerge.c \ - $(MY_ROOT)/thirdparty/jpeg-8c/jdpostct.c \ - $(MY_ROOT)/thirdparty/jpeg-8c/jdsample.c \ - $(MY_ROOT)/thirdparty/jpeg-8c/jdtrans.c \ - $(MY_ROOT)/thirdparty/jpeg-8c/jerror.c \ - $(MY_ROOT)/thirdparty/jpeg-8c/jfdctflt.c \ - $(MY_ROOT)/thirdparty/jpeg-8c/jfdctfst.c \ - $(MY_ROOT)/thirdparty/jpeg-8c/jfdctint.c \ - $(MY_ROOT)/thirdparty/jpeg-8c/jidctflt.c \ - $(MY_ROOT)/thirdparty/jpeg-8c/jidctfst.c \ - $(MY_ROOT)/thirdparty/jpeg-8c/jidctint.c \ - $(MY_ROOT)/thirdparty/jpeg-8c/jquant1.c \ - $(MY_ROOT)/thirdparty/jpeg-8c/jquant2.c \ - $(MY_ROOT)/thirdparty/jpeg-8c/jutils.c \ - $(MY_ROOT)/thirdparty/jpeg-8c/jmemmgr.c \ - $(MY_ROOT)/thirdparty/jpeg-8c/jmemnobs.c \ + $(MY_ROOT)/thirdparty/jpeg-8d/jaricom.c \ + $(MY_ROOT)/thirdparty/jpeg-8d/jcapimin.c \ + $(MY_ROOT)/thirdparty/jpeg-8d/jcapistd.c \ + $(MY_ROOT)/thirdparty/jpeg-8d/jcarith.c \ + $(MY_ROOT)/thirdparty/jpeg-8d/jccoefct.c \ + $(MY_ROOT)/thirdparty/jpeg-8d/jccolor.c \ + $(MY_ROOT)/thirdparty/jpeg-8d/jcdctmgr.c \ + $(MY_ROOT)/thirdparty/jpeg-8d/jchuff.c \ + $(MY_ROOT)/thirdparty/jpeg-8d/jcinit.c \ + $(MY_ROOT)/thirdparty/jpeg-8d/jcmainct.c \ + $(MY_ROOT)/thirdparty/jpeg-8d/jcmarker.c \ + $(MY_ROOT)/thirdparty/jpeg-8d/jcmaster.c \ + $(MY_ROOT)/thirdparty/jpeg-8d/jcomapi.c \ + $(MY_ROOT)/thirdparty/jpeg-8d/jcparam.c \ + $(MY_ROOT)/thirdparty/jpeg-8d/jcprepct.c \ + $(MY_ROOT)/thirdparty/jpeg-8d/jcsample.c \ + $(MY_ROOT)/thirdparty/jpeg-8d/jctrans.c \ + $(MY_ROOT)/thirdparty/jpeg-8d/jdapimin.c \ + $(MY_ROOT)/thirdparty/jpeg-8d/jdapistd.c \ + $(MY_ROOT)/thirdparty/jpeg-8d/jdarith.c \ + $(MY_ROOT)/thirdparty/jpeg-8d/jdatadst.c \ + $(MY_ROOT)/thirdparty/jpeg-8d/jdatasrc.c \ + $(MY_ROOT)/thirdparty/jpeg-8d/jdcoefct.c \ + $(MY_ROOT)/thirdparty/jpeg-8d/jdcolor.c \ + $(MY_ROOT)/thirdparty/jpeg-8d/jddctmgr.c \ + $(MY_ROOT)/thirdparty/jpeg-8d/jdhuff.c \ + $(MY_ROOT)/thirdparty/jpeg-8d/jdinput.c \ + $(MY_ROOT)/thirdparty/jpeg-8d/jdmainct.c \ + $(MY_ROOT)/thirdparty/jpeg-8d/jdmarker.c \ + $(MY_ROOT)/thirdparty/jpeg-8d/jdmaster.c \ + $(MY_ROOT)/thirdparty/jpeg-8d/jdmerge.c \ + $(MY_ROOT)/thirdparty/jpeg-8d/jdpostct.c \ + $(MY_ROOT)/thirdparty/jpeg-8d/jdsample.c \ + $(MY_ROOT)/thirdparty/jpeg-8d/jdtrans.c \ + $(MY_ROOT)/thirdparty/jpeg-8d/jerror.c \ + $(MY_ROOT)/thirdparty/jpeg-8d/jfdctflt.c \ + $(MY_ROOT)/thirdparty/jpeg-8d/jfdctfst.c \ + $(MY_ROOT)/thirdparty/jpeg-8d/jfdctint.c \ + $(MY_ROOT)/thirdparty/jpeg-8d/jidctflt.c \ + $(MY_ROOT)/thirdparty/jpeg-8d/jidctfst.c \ + $(MY_ROOT)/thirdparty/jpeg-8d/jidctint.c \ + $(MY_ROOT)/thirdparty/jpeg-8d/jquant1.c \ + $(MY_ROOT)/thirdparty/jpeg-8d/jquant2.c \ + $(MY_ROOT)/thirdparty/jpeg-8d/jutils.c \ + $(MY_ROOT)/thirdparty/jpeg-8d/jmemmgr.c \ + $(MY_ROOT)/thirdparty/jpeg-8d/jmemnobs.c \ $(MY_ROOT)/thirdparty/zlib-1.2.5/adler32.c \ $(MY_ROOT)/thirdparty/zlib-1.2.5/compress.c \ $(MY_ROOT)/thirdparty/zlib-1.2.5/crc32.c \ @@ -111,44 +111,44 @@ LOCAL_SRC_FILES := \ $(MY_ROOT)/thirdparty/zlib-1.2.5/trees.c \ $(MY_ROOT)/thirdparty/zlib-1.2.5/uncompr.c \ $(MY_ROOT)/thirdparty/zlib-1.2.5/zutil.c \ - $(MY_ROOT)/thirdparty/freetype-2.4.4/src/autofit/autofit.c \ - $(MY_ROOT)/thirdparty/freetype-2.4.4/src/base/ftbase.c \ - $(MY_ROOT)/thirdparty/freetype-2.4.4/src/base/ftbbox.c \ - $(MY_ROOT)/thirdparty/freetype-2.4.4/src/base/ftbdf.c \ - $(MY_ROOT)/thirdparty/freetype-2.4.4/src/base/ftbitmap.c \ - $(MY_ROOT)/thirdparty/freetype-2.4.4/src/base/ftdebug.c \ - $(MY_ROOT)/thirdparty/freetype-2.4.4/src/base/ftgasp.c \ - $(MY_ROOT)/thirdparty/freetype-2.4.4/src/base/ftglyph.c \ - $(MY_ROOT)/thirdparty/freetype-2.4.4/src/base/ftgxval.c \ - $(MY_ROOT)/thirdparty/freetype-2.4.4/src/base/ftinit.c \ - $(MY_ROOT)/thirdparty/freetype-2.4.4/src/base/ftlcdfil.c \ - $(MY_ROOT)/thirdparty/freetype-2.4.4/src/base/ftmm.c \ - $(MY_ROOT)/thirdparty/freetype-2.4.4/src/base/ftotval.c \ - $(MY_ROOT)/thirdparty/freetype-2.4.4/src/base/ftpfr.c \ - $(MY_ROOT)/thirdparty/freetype-2.4.4/src/base/ftstroke.c \ - $(MY_ROOT)/thirdparty/freetype-2.4.4/src/base/ftsynth.c \ - $(MY_ROOT)/thirdparty/freetype-2.4.4/src/base/ftsystem.c \ - $(MY_ROOT)/thirdparty/freetype-2.4.4/src/base/fttype1.c \ - $(MY_ROOT)/thirdparty/freetype-2.4.4/src/base/ftwinfnt.c \ - $(MY_ROOT)/thirdparty/freetype-2.4.4/src/base/ftxf86.c \ - $(MY_ROOT)/thirdparty/freetype-2.4.4/src/base/ftpatent.c \ - $(MY_ROOT)/thirdparty/freetype-2.4.4/src/bdf/bdf.c \ - $(MY_ROOT)/thirdparty/freetype-2.4.4/src/cache/ftcache.c \ - $(MY_ROOT)/thirdparty/freetype-2.4.4/src/cff/cff.c \ - $(MY_ROOT)/thirdparty/freetype-2.4.4/src/cid/type1cid.c \ - $(MY_ROOT)/thirdparty/freetype-2.4.4/src/gzip/ftgzip.c \ - $(MY_ROOT)/thirdparty/freetype-2.4.4/src/lzw/ftlzw.c \ - $(MY_ROOT)/thirdparty/freetype-2.4.4/src/pcf/pcf.c \ - $(MY_ROOT)/thirdparty/freetype-2.4.4/src/pfr/pfr.c \ - $(MY_ROOT)/thirdparty/freetype-2.4.4/src/psaux/psaux.c \ - $(MY_ROOT)/thirdparty/freetype-2.4.4/src/pshinter/pshinter.c \ - $(MY_ROOT)/thirdparty/freetype-2.4.4/src/psnames/psnames.c \ - $(MY_ROOT)/thirdparty/freetype-2.4.4/src/raster/raster.c \ - $(MY_ROOT)/thirdparty/freetype-2.4.4/src/smooth/smooth.c \ - $(MY_ROOT)/thirdparty/freetype-2.4.4/src/sfnt/sfnt.c \ - $(MY_ROOT)/thirdparty/freetype-2.4.4/src/truetype/truetype.c \ - $(MY_ROOT)/thirdparty/freetype-2.4.4/src/type1/type1.c \ - $(MY_ROOT)/thirdparty/freetype-2.4.4/src/type42/type42.c \ - $(MY_ROOT)/thirdparty/freetype-2.4.4/src/winfonts/winfnt.c + $(MY_ROOT)/thirdparty/freetype-2.4.8/src/autofit/autofit.c \ + $(MY_ROOT)/thirdparty/freetype-2.4.8/src/base/ftbase.c \ + $(MY_ROOT)/thirdparty/freetype-2.4.8/src/base/ftbbox.c \ + $(MY_ROOT)/thirdparty/freetype-2.4.8/src/base/ftbdf.c \ + $(MY_ROOT)/thirdparty/freetype-2.4.8/src/base/ftbitmap.c \ + $(MY_ROOT)/thirdparty/freetype-2.4.8/src/base/ftdebug.c \ + $(MY_ROOT)/thirdparty/freetype-2.4.8/src/base/ftgasp.c \ + $(MY_ROOT)/thirdparty/freetype-2.4.8/src/base/ftglyph.c \ + $(MY_ROOT)/thirdparty/freetype-2.4.8/src/base/ftgxval.c \ + $(MY_ROOT)/thirdparty/freetype-2.4.8/src/base/ftinit.c \ + $(MY_ROOT)/thirdparty/freetype-2.4.8/src/base/ftlcdfil.c \ + $(MY_ROOT)/thirdparty/freetype-2.4.8/src/base/ftmm.c \ + $(MY_ROOT)/thirdparty/freetype-2.4.8/src/base/ftotval.c \ + $(MY_ROOT)/thirdparty/freetype-2.4.8/src/base/ftpfr.c \ + $(MY_ROOT)/thirdparty/freetype-2.4.8/src/base/ftstroke.c \ + $(MY_ROOT)/thirdparty/freetype-2.4.8/src/base/ftsynth.c \ + $(MY_ROOT)/thirdparty/freetype-2.4.8/src/base/ftsystem.c \ + $(MY_ROOT)/thirdparty/freetype-2.4.8/src/base/fttype1.c \ + $(MY_ROOT)/thirdparty/freetype-2.4.8/src/base/ftwinfnt.c \ + $(MY_ROOT)/thirdparty/freetype-2.4.8/src/base/ftxf86.c \ + $(MY_ROOT)/thirdparty/freetype-2.4.8/src/base/ftpatent.c \ + $(MY_ROOT)/thirdparty/freetype-2.4.8/src/bdf/bdf.c \ + $(MY_ROOT)/thirdparty/freetype-2.4.8/src/cache/ftcache.c \ + $(MY_ROOT)/thirdparty/freetype-2.4.8/src/cff/cff.c \ + $(MY_ROOT)/thirdparty/freetype-2.4.8/src/cid/type1cid.c \ + $(MY_ROOT)/thirdparty/freetype-2.4.8/src/gzip/ftgzip.c \ + $(MY_ROOT)/thirdparty/freetype-2.4.8/src/lzw/ftlzw.c \ + $(MY_ROOT)/thirdparty/freetype-2.4.8/src/pcf/pcf.c \ + $(MY_ROOT)/thirdparty/freetype-2.4.8/src/pfr/pfr.c \ + $(MY_ROOT)/thirdparty/freetype-2.4.8/src/psaux/psaux.c \ + $(MY_ROOT)/thirdparty/freetype-2.4.8/src/pshinter/pshinter.c \ + $(MY_ROOT)/thirdparty/freetype-2.4.8/src/psnames/psnames.c \ + $(MY_ROOT)/thirdparty/freetype-2.4.8/src/raster/raster.c \ + $(MY_ROOT)/thirdparty/freetype-2.4.8/src/smooth/smooth.c \ + $(MY_ROOT)/thirdparty/freetype-2.4.8/src/sfnt/sfnt.c \ + $(MY_ROOT)/thirdparty/freetype-2.4.8/src/truetype/truetype.c \ + $(MY_ROOT)/thirdparty/freetype-2.4.8/src/type1/type1.c \ + $(MY_ROOT)/thirdparty/freetype-2.4.8/src/type42/type42.c \ + $(MY_ROOT)/thirdparty/freetype-2.4.8/src/winfonts/winfnt.c include $(BUILD_STATIC_LIBRARY) -- cgit v1.2.3