diff options
| -rw-r--r-- | android/jni/Core.mk | 2 | ||||
| -rw-r--r-- | android/jni/ThirdParty.mk | 80 | ||||
| -rw-r--r-- | android/local.properties | 3 | ||||
| -rw-r--r-- | win32/libmupdf.vcproj | 6 | ||||
| -rw-r--r-- | win32/libthirdparty.vcproj | 48 |
5 files changed, 69 insertions, 70 deletions
diff --git a/android/jni/Core.mk b/android/jni/Core.mk index a4127c67..dbe0e39d 100644 --- a/android/jni/Core.mk +++ b/android/jni/Core.mk @@ -11,7 +11,7 @@ LOCAL_C_INCLUDES := \ ../thirdparty/openjpeg-1.5.0/libopenjpeg \ ../thirdparty/jpeg-8d \ ../thirdparty/zlib-1.2.5 \ - ../thirdparty/freetype-2.4.8/include \ + ../thirdparty/freetype-2.4.9/include \ ../draw \ ../fitz \ ../pdf \ diff --git a/android/jni/ThirdParty.mk b/android/jni/ThirdParty.mk index 20e16cee..ef26d774 100644 --- a/android/jni/ThirdParty.mk +++ b/android/jni/ThirdParty.mk @@ -9,7 +9,7 @@ LOCAL_C_INCLUDES := \ ../thirdparty/openjpeg-1.5.0/libopenjpeg \ ../thirdparty/jpeg-8d \ ../thirdparty/zlib-1.2.5 \ - ../thirdparty/freetype-2.4.8/include \ + ../thirdparty/freetype-2.4.9/include \ ../scripts LOCAL_CFLAGS := \ @@ -116,44 +116,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.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 + $(MY_ROOT)/thirdparty/freetype-2.4.9/src/autofit/autofit.c \ + $(MY_ROOT)/thirdparty/freetype-2.4.9/src/base/ftbase.c \ + $(MY_ROOT)/thirdparty/freetype-2.4.9/src/base/ftbbox.c \ + $(MY_ROOT)/thirdparty/freetype-2.4.9/src/base/ftbdf.c \ + $(MY_ROOT)/thirdparty/freetype-2.4.9/src/base/ftbitmap.c \ + $(MY_ROOT)/thirdparty/freetype-2.4.9/src/base/ftdebug.c \ + $(MY_ROOT)/thirdparty/freetype-2.4.9/src/base/ftgasp.c \ + $(MY_ROOT)/thirdparty/freetype-2.4.9/src/base/ftglyph.c \ + $(MY_ROOT)/thirdparty/freetype-2.4.9/src/base/ftgxval.c \ + $(MY_ROOT)/thirdparty/freetype-2.4.9/src/base/ftinit.c \ + $(MY_ROOT)/thirdparty/freetype-2.4.9/src/base/ftlcdfil.c \ + $(MY_ROOT)/thirdparty/freetype-2.4.9/src/base/ftmm.c \ + $(MY_ROOT)/thirdparty/freetype-2.4.9/src/base/ftotval.c \ + $(MY_ROOT)/thirdparty/freetype-2.4.9/src/base/ftpfr.c \ + $(MY_ROOT)/thirdparty/freetype-2.4.9/src/base/ftstroke.c \ + $(MY_ROOT)/thirdparty/freetype-2.4.9/src/base/ftsynth.c \ + $(MY_ROOT)/thirdparty/freetype-2.4.9/src/base/ftsystem.c \ + $(MY_ROOT)/thirdparty/freetype-2.4.9/src/base/fttype1.c \ + $(MY_ROOT)/thirdparty/freetype-2.4.9/src/base/ftwinfnt.c \ + $(MY_ROOT)/thirdparty/freetype-2.4.9/src/base/ftxf86.c \ + $(MY_ROOT)/thirdparty/freetype-2.4.9/src/base/ftpatent.c \ + $(MY_ROOT)/thirdparty/freetype-2.4.9/src/bdf/bdf.c \ + $(MY_ROOT)/thirdparty/freetype-2.4.9/src/cache/ftcache.c \ + $(MY_ROOT)/thirdparty/freetype-2.4.9/src/cff/cff.c \ + $(MY_ROOT)/thirdparty/freetype-2.4.9/src/cid/type1cid.c \ + $(MY_ROOT)/thirdparty/freetype-2.4.9/src/gzip/ftgzip.c \ + $(MY_ROOT)/thirdparty/freetype-2.4.9/src/lzw/ftlzw.c \ + $(MY_ROOT)/thirdparty/freetype-2.4.9/src/pcf/pcf.c \ + $(MY_ROOT)/thirdparty/freetype-2.4.9/src/pfr/pfr.c \ + $(MY_ROOT)/thirdparty/freetype-2.4.9/src/psaux/psaux.c \ + $(MY_ROOT)/thirdparty/freetype-2.4.9/src/pshinter/pshinter.c \ + $(MY_ROOT)/thirdparty/freetype-2.4.9/src/psnames/psnames.c \ + $(MY_ROOT)/thirdparty/freetype-2.4.9/src/raster/raster.c \ + $(MY_ROOT)/thirdparty/freetype-2.4.9/src/smooth/smooth.c \ + $(MY_ROOT)/thirdparty/freetype-2.4.9/src/sfnt/sfnt.c \ + $(MY_ROOT)/thirdparty/freetype-2.4.9/src/truetype/truetype.c \ + $(MY_ROOT)/thirdparty/freetype-2.4.9/src/type1/type1.c \ + $(MY_ROOT)/thirdparty/freetype-2.4.9/src/type42/type42.c \ + $(MY_ROOT)/thirdparty/freetype-2.4.9/src/winfonts/winfnt.c include $(BUILD_STATIC_LIBRARY) diff --git a/android/local.properties b/android/local.properties index d0e1f0e6..90640498 100644 --- a/android/local.properties +++ b/android/local.properties @@ -1,2 +1 @@ -#sdk.dir=/Library/android-sdk-mac_x86 -sdk.dir=C:\\Program Files (x86)\\Android\\android-sdk +sdk.dir=/Users/tor/android-sdk-macosx diff --git a/win32/libmupdf.vcproj b/win32/libmupdf.vcproj index 543cac48..b984cc8f 100644 --- a/win32/libmupdf.vcproj +++ b/win32/libmupdf.vcproj @@ -41,7 +41,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\scripts;..\fitz;..\pdf;..\thirdparty\jbig2dec;..\thirdparty\jpeg-8d;..\thirdparty\openjpeg-1.5.0\libopenjpeg;..\thirdparty\zlib-1.2.5;..\thirdparty\freetype-2.4.8\include" + AdditionalIncludeDirectories="..\scripts;..\fitz;..\pdf;..\thirdparty\jbig2dec;..\thirdparty\jpeg-8d;..\thirdparty\openjpeg-1.5.0\libopenjpeg;..\thirdparty\zlib-1.2.5;..\thirdparty\freetype-2.4.9\include" PreprocessorDefinitions="DEBUG=1" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -106,7 +106,7 @@ Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="..\scripts;..\fitz;..\pdf;..\thirdparty\jbig2dec;..\thirdparty\jpeg-8d;..\thirdparty\openjpeg-1.5.0\libopenjpeg;..\thirdparty\zlib-1.2.5;..\thirdparty\freetype-2.4.8\include" + AdditionalIncludeDirectories="..\scripts;..\fitz;..\pdf;..\thirdparty\jbig2dec;..\thirdparty\jpeg-8d;..\thirdparty\openjpeg-1.5.0\libopenjpeg;..\thirdparty\zlib-1.2.5;..\thirdparty\freetype-2.4.9\include" RuntimeLibrary="0" EnableFunctionLevelLinking="true" WarningLevel="3" @@ -166,7 +166,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\scripts;..\fitz;..\pdf;..\thirdparty\jbig2dec;..\thirdparty\jpeg-8d;..\thirdparty\openjpeg-1.5.0\libopenjpeg;..\thirdparty\zlib-1.2.5;..\thirdparty\freetype-2.4.8\include" + AdditionalIncludeDirectories="..\scripts;..\fitz;..\pdf;..\thirdparty\jbig2dec;..\thirdparty\jpeg-8d;..\thirdparty\openjpeg-1.5.0\libopenjpeg;..\thirdparty\zlib-1.2.5;..\thirdparty\freetype-2.4.9\include" PreprocessorDefinitions="MEMENTO=1;DEBUG=1" MinimalRebuild="true" BasicRuntimeChecks="3" diff --git a/win32/libthirdparty.vcproj b/win32/libthirdparty.vcproj index e030d6be..4d892f02 100644 --- a/win32/libthirdparty.vcproj +++ b/win32/libthirdparty.vcproj @@ -39,7 +39,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\scripts;..\thirdparty\jbig2dec;..\thirdparty\jpeg-8d;..\thirdparty\openjpeg-1.5.0\libopenjpeg;..\thirdparty\zlib-1.2.5;..\thirdparty\freetype-2.4.8\include" + AdditionalIncludeDirectories="..\scripts;..\thirdparty\jbig2dec;..\thirdparty\jpeg-8d;..\thirdparty\openjpeg-1.5.0\libopenjpeg;..\thirdparty\zlib-1.2.5;..\thirdparty\freetype-2.4.9\include" PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;OPJ_STATIC;FT_CONFIG_MODULES_H=\"slimftmodules.h\";FT_CONFIG_OPTIONS_H=\"slimftoptions.h\";DEBUG=1;verbose=-1" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -102,7 +102,7 @@ Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="..\scripts;..\thirdparty\jbig2dec;..\thirdparty\jpeg-8d;..\thirdparty\openjpeg-1.5.0\libopenjpeg;..\thirdparty\zlib-1.2.5;..\thirdparty\freetype-2.4.8\include" + AdditionalIncludeDirectories="..\scripts;..\thirdparty\jbig2dec;..\thirdparty\jpeg-8d;..\thirdparty\openjpeg-1.5.0\libopenjpeg;..\thirdparty\zlib-1.2.5;..\thirdparty\freetype-2.4.9\include" PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;OPJ_STATIC;FT_CONFIG_MODULES_H=\"slimftmodules.h\";FT_CONFIG_OPTIONS_H=\"slimftoptions.h\";verbose=-1" RuntimeLibrary="0" EnableFunctionLevelLinking="true" @@ -162,7 +162,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\scripts;..\thirdparty\jbig2dec;..\thirdparty\jpeg-8d;..\thirdparty\openjpeg-1.5.0\libopenjpeg;..\thirdparty\zlib-1.2.5;..\thirdparty\freetype-2.4.8\include" + AdditionalIncludeDirectories="..\scripts;..\thirdparty\jbig2dec;..\thirdparty\jpeg-8d;..\thirdparty\openjpeg-1.5.0\libopenjpeg;..\thirdparty\zlib-1.2.5;..\thirdparty\freetype-2.4.9\include" PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;OPJ_STATIC;FT_CONFIG_MODULES_H=\"slimftmodules.h\";FT_CONFIG_OPTIONS_H=\"slimftoptions.h\";MEMENTO=1;DEBUG=1;verbose=-1" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -538,90 +538,90 @@ Name="libfreetype" > <File - RelativePath="..\thirdparty\freetype-2.4.8\src\cff\cff.c" + RelativePath="..\thirdparty\freetype-2.4.9\src\cff\cff.c" > </File> <File - RelativePath="..\thirdparty\freetype-2.4.8\src\psaux\psaux.c" + RelativePath="..\thirdparty\freetype-2.4.9\src\psaux\psaux.c" > </File> <File - RelativePath="..\thirdparty\freetype-2.4.8\src\pshinter\pshinter.c" + RelativePath="..\thirdparty\freetype-2.4.9\src\pshinter\pshinter.c" > </File> <File - RelativePath="..\thirdparty\freetype-2.4.8\src\psnames\psnames.c" + RelativePath="..\thirdparty\freetype-2.4.9\src\psnames\psnames.c" > </File> <File - RelativePath="..\thirdparty\freetype-2.4.8\src\raster\raster.c" + RelativePath="..\thirdparty\freetype-2.4.9\src\raster\raster.c" > </File> <File - RelativePath="..\thirdparty\freetype-2.4.8\src\sfnt\sfnt.c" + RelativePath="..\thirdparty\freetype-2.4.9\src\sfnt\sfnt.c" > </File> <File - RelativePath="..\thirdparty\freetype-2.4.8\src\smooth\smooth.c" + RelativePath="..\thirdparty\freetype-2.4.9\src\smooth\smooth.c" > </File> <File - RelativePath="..\thirdparty\freetype-2.4.8\src\truetype\truetype.c" + RelativePath="..\thirdparty\freetype-2.4.9\src\truetype\truetype.c" > </File> <File - RelativePath="..\thirdparty\freetype-2.4.8\src\type1\type1.c" + RelativePath="..\thirdparty\freetype-2.4.9\src\type1\type1.c" > </File> <File - RelativePath="..\thirdparty\freetype-2.4.8\src\cid\type1cid.c" + RelativePath="..\thirdparty\freetype-2.4.9\src\cid\type1cid.c" > </File> <Filter Name="base" > <File - RelativePath="..\thirdparty\freetype-2.4.8\src\base\ftbase.c" + RelativePath="..\thirdparty\freetype-2.4.9\src\base\ftbase.c" > </File> <File - RelativePath="..\thirdparty\freetype-2.4.8\src\base\ftbbox.c" + RelativePath="..\thirdparty\freetype-2.4.9\src\base\ftbbox.c" > </File> <File - RelativePath="..\thirdparty\freetype-2.4.8\src\base\ftbitmap.c" + RelativePath="..\thirdparty\freetype-2.4.9\src\base\ftbitmap.c" > </File> <File - RelativePath="..\thirdparty\freetype-2.4.8\src\base\ftgasp.c" + RelativePath="..\thirdparty\freetype-2.4.9\src\base\ftgasp.c" > </File> <File - RelativePath="..\thirdparty\freetype-2.4.8\src\base\ftglyph.c" + RelativePath="..\thirdparty\freetype-2.4.9\src\base\ftglyph.c" > </File> <File - RelativePath="..\thirdparty\freetype-2.4.8\src\base\ftinit.c" + RelativePath="..\thirdparty\freetype-2.4.9\src\base\ftinit.c" > </File> <File - RelativePath="..\thirdparty\freetype-2.4.8\src\base\ftstroke.c" + RelativePath="..\thirdparty\freetype-2.4.9\src\base\ftstroke.c" > </File> <File - RelativePath="..\thirdparty\freetype-2.4.8\src\base\ftsynth.c" + RelativePath="..\thirdparty\freetype-2.4.9\src\base\ftsynth.c" > </File> <File - RelativePath="..\thirdparty\freetype-2.4.8\src\base\ftsystem.c" + RelativePath="..\thirdparty\freetype-2.4.9\src\base\ftsystem.c" > </File> <File - RelativePath="..\thirdparty\freetype-2.4.8\src\base\fttype1.c" + RelativePath="..\thirdparty\freetype-2.4.9\src\base\fttype1.c" > </File> <File - RelativePath="..\thirdparty\freetype-2.4.8\src\base\ftxf86.c" + RelativePath="..\thirdparty\freetype-2.4.9\src\base\ftxf86.c" > </File> </Filter> |