diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | .gitmodules | 15 | ||||
| -rw-r--r-- | Makethird | 38 | ||||
| -rw-r--r-- | thirdparty/README | 15 | ||||
| m--------- | thirdparty/freetype | 0 | ||||
| m--------- | thirdparty/jbig2dec | 0 | ||||
| m--------- | thirdparty/jpeg | 0 | ||||
| m--------- | thirdparty/openjpeg | 0 | ||||
| m--------- | thirdparty/zlib | 0 | ||||
| -rw-r--r-- | win32/libmupdf-v8.vcproj | 6 | ||||
| -rw-r--r-- | win32/libmupdf.vcproj | 6 | ||||
| -rw-r--r-- | win32/libthirdparty.vcproj | 176 |
12 files changed, 146 insertions, 111 deletions
@@ -3,7 +3,6 @@ build DerivedData generated -thirdparty cscope.* tags TAGS diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..fe4637d9 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,15 @@ +[submodule "thirdparty/jbig2dec"] + path = thirdparty/jbig2dec + url = git://git.ghostscript.com/jbig2dec.git +[submodule "thirdparty/freetype"] + path = thirdparty/freetype + url = git://git.ghostscript.com/thirdparty/freetype.git +[submodule "thirdparty/jpeg"] + path = thirdparty/jpeg + url = git://git.ghostscript.com/thirdparty/jpeg.git +[submodule "thirdparty/openjpeg"] + path = thirdparty/openjpeg + url = git://git.ghostscript.com/thirdparty/openjpeg.git +[submodule "thirdparty/zlib"] + path = thirdparty/zlib + url = git://git.ghostscript.com/thirdparty/zlib.git @@ -1,17 +1,23 @@ # GNU Makefile for third party libraries used by MuPDF # # If thirdparty libraries are supplied, they will be built as -# static libraries. Download and unzip the the mupdf-thirdparty.zip -# archive in the source directory. - -FREETYPE_DIR := $(wildcard thirdparty/freetype*) -JBIG2DEC_DIR := $(wildcard thirdparty/jbig2dec*) -JPEG_DIR := $(wildcard thirdparty/jpeg*) -OPENJPEG_DIR := $(wildcard thirdparty/openjpeg*/libopenjpeg) -ZLIB_DIR := $(wildcard thirdparty/zlib*) -V8_DIR := $(wildcard thirdparty/v8*) +# static libraries. +# +# Use 'git submodule init' and 'git submodule update' to check +# out the thirdparty libraries from git. + +FREETYPE_DIR := thirdparty/freetype +JBIG2DEC_DIR := thirdparty/jbig2dec +JPEG_DIR := thirdparty/jpeg +OPENJPEG_DIR := thirdparty/openjpeg +ZLIB_DIR := thirdparty/zlib # --- V8 --- +# +# V8 is too big to be used as a submodule. +# + +V8_DIR := $(wildcard thirdparty/v8*) ifneq "$(V8_DIR)" "" @@ -41,7 +47,7 @@ endif # --- FreeType 2 --- -ifneq "$(FREETYPE_DIR)" "" +ifneq "$(wildcard $(FREETYPE_DIR)/README)" "" CFLAGS += -I$(FREETYPE_DIR)/include LIBS := $(filter-out -lfreetype, $(LIBS)) FREETYPE_LIB := $(OUT)/libfreetype.a @@ -104,7 +110,7 @@ endif # --- JBIG2DEC --- -ifneq "$(JBIG2DEC_DIR)" "" +ifneq "$(wildcard $(JBIG2DEC_DIR)/README)" "" CFLAGS += -I$(JBIG2DEC_DIR) LIBS := $(filter-out -ljbig2dec, $(LIBS)) JBIG2DEC_LIB := $(OUT)/libjbig2dec.a @@ -133,7 +139,7 @@ endif # --- JPEG library from IJG --- -ifneq "$(JPEG_DIR)" "" +ifneq "$(wildcard $(JPEG_DIR)/README)" "" CFLAGS += -I$(JPEG_DIR) LIBS := $(filter-out -ljpeg, $(LIBS)) JPEG_LIB := $(OUT)/libjpeg.a @@ -178,8 +184,8 @@ endif # --- OpenJPEG --- -ifneq "$(OPENJPEG_DIR)" "" -CFLAGS += -I$(OPENJPEG_DIR) +ifneq "$(wildcard $(OPENJPEG_DIR)/README)" "" +CFLAGS += -I$(OPENJPEG_DIR)/libopenjpeg LIBS := $(filter-out -lopenjpeg, $(LIBS)) OPENJPEG_LIB := $(OUT)/libopenjpeg.a @@ -209,13 +215,13 @@ OPENJPEG_SRC := \ tpix_manager.c \ $(OPENJPEG_LIB): $(addprefix $(OUT)/opj_, $(OPENJPEG_SRC:%.c=%.o)) -$(OUT)/opj_%.o: $(OPENJPEG_DIR)/%.c | $(OUT) +$(OUT)/opj_%.o: $(OPENJPEG_DIR)/libopenjpeg/%.c | $(OUT) $(CC_CMD) -DOPJ_STATIC endif # --- ZLIB --- -ifneq "$(ZLIB_DIR)" "" +ifneq "$(wildcard $(ZLIB_DIR)/README)" "" CFLAGS += -I$(ZLIB_DIR) -Dverbose=-1 LIBS := $(filter-out -lz, $(LIBS)) ZLIB_LIB := $(OUT)/libz.a diff --git a/thirdparty/README b/thirdparty/README new file mode 100644 index 00000000..efd375d2 --- /dev/null +++ b/thirdparty/README @@ -0,0 +1,15 @@ +This directory holds third party libraries as git submodules. + +If the directories are empty, the makefile based build will try +to use system libraries instead. + +To set up the third party modules for building from git: + + $ git submodule init + $ git submodule update + +Then after each pull (to make sure they're up to date): + + $ git submodule update + +Do NOT edit files in the submodule checkouts unless you know what you're doing. diff --git a/thirdparty/freetype b/thirdparty/freetype new file mode 160000 +Subproject 320613eeb83d0cd704de3e6adfb13dce787861b diff --git a/thirdparty/jbig2dec b/thirdparty/jbig2dec new file mode 160000 +Subproject 7a82fc0abd135e08875ec4941ba43e832bc1b7f diff --git a/thirdparty/jpeg b/thirdparty/jpeg new file mode 160000 +Subproject 219d59dcfd0e6ce8a3d8c5510e29237f0b5078e diff --git a/thirdparty/openjpeg b/thirdparty/openjpeg new file mode 160000 +Subproject d456e768044bb956142342aa2a51374239e2b36 diff --git a/thirdparty/zlib b/thirdparty/zlib new file mode 160000 +Subproject c16b1b18ddaaf090caf321af831bccac6381a38 diff --git a/win32/libmupdf-v8.vcproj b/win32/libmupdf-v8.vcproj index 45f7f7b9..2899fe59 100644 --- a/win32/libmupdf-v8.vcproj +++ b/win32/libmupdf-v8.vcproj @@ -41,7 +41,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\scripts;..\fitz;..\pdf;..\thirdparty\jbig2dec;"..\thirdparty\jpeg-9";"..\thirdparty\openjpeg-1.5.0-patched\libopenjpeg";"..\thirdparty\zlib-1.2.7";"..\thirdparty\freetype-2.4.10\include";"..\thirdparty\v8-3.9\include"" + AdditionalIncludeDirectories="..\scripts;..\fitz;..\pdf;..\thirdparty\jbig2dec;"..\thirdparty\jpeg";"..\thirdparty\openjpeg\libopenjpeg";"..\thirdparty\zlib";"..\thirdparty\freetype\include";"..\thirdparty\v8-3.9\include"" PreprocessorDefinitions="DEBUG=1" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -107,7 +107,7 @@ Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="..\scripts;..\fitz;..\pdf;..\thirdparty\jbig2dec;..\thirdparty\jpeg-8d;..\thirdparty\openjpeg-1.5.0-patched\libopenjpeg;..\thirdparty\zlib-1.2.7;..\thirdparty\freetype-2.4.10\include;"..\thirdparty\v8-3.9\include"" + AdditionalIncludeDirectories="..\scripts;..\fitz;..\pdf;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\libopenjpeg;..\thirdparty\zlib;..\thirdparty\freetype\include;"..\thirdparty\v8-3.9\include"" RuntimeLibrary="0" EnableFunctionLevelLinking="true" WarningLevel="3" @@ -167,7 +167,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\scripts;..\fitz;..\pdf;..\thirdparty\jbig2dec;..\thirdparty\jpeg-8d;..\thirdparty\openjpeg-1.5.0-patched\libopenjpeg;..\thirdparty\zlib-1.2.7;..\thirdparty\freetype-2.4.10\include;"..\thirdparty\v8-3.9\include"" + AdditionalIncludeDirectories="..\scripts;..\fitz;..\pdf;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\libopenjpeg;..\thirdparty\zlib;..\thirdparty\freetype\include;"..\thirdparty\v8-3.9\include"" PreprocessorDefinitions="MEMENTO=1;DEBUG=1" MinimalRebuild="true" BasicRuntimeChecks="3" diff --git a/win32/libmupdf.vcproj b/win32/libmupdf.vcproj index f8f14908..e7d189d3 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-9;..\thirdparty\openjpeg-1.5.0-patched\libopenjpeg;..\thirdparty\zlib-1.2.7;..\thirdparty\freetype-2.4.10\include" + AdditionalIncludeDirectories="..\scripts;..\fitz;..\pdf;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\libopenjpeg;..\thirdparty\zlib;..\thirdparty\freetype\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-9;..\thirdparty\openjpeg-1.5.0-patched\libopenjpeg;..\thirdparty\zlib-1.2.7;..\thirdparty\freetype-2.4.10\include" + AdditionalIncludeDirectories="..\scripts;..\fitz;..\pdf;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\libopenjpeg;..\thirdparty\zlib;..\thirdparty\freetype\include" RuntimeLibrary="0" EnableFunctionLevelLinking="true" WarningLevel="3" @@ -166,7 +166,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\scripts;..\fitz;..\pdf;..\thirdparty\jbig2dec;..\thirdparty\jpeg-9;..\thirdparty\openjpeg-1.5.0-patched\libopenjpeg;..\thirdparty\zlib-1.2.7;..\thirdparty\freetype-2.4.10\include" + AdditionalIncludeDirectories="..\scripts;..\fitz;..\pdf;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\libopenjpeg;..\thirdparty\zlib;..\thirdparty\freetype\include" PreprocessorDefinitions="MEMENTO=1;DEBUG=1" MinimalRebuild="true" BasicRuntimeChecks="3" diff --git a/win32/libthirdparty.vcproj b/win32/libthirdparty.vcproj index 794fa16d..eadc828d 100644 --- a/win32/libthirdparty.vcproj +++ b/win32/libthirdparty.vcproj @@ -39,7 +39,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\scripts;..\thirdparty\jbig2dec;..\thirdparty\jpeg-9;..\thirdparty\openjpeg-1.5.0-patched\libopenjpeg;..\thirdparty\zlib-1.2.7;..\thirdparty\freetype-2.4.10\include" + AdditionalIncludeDirectories="..\scripts;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\libopenjpeg;..\thirdparty\zlib;..\thirdparty\freetype\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-9;..\thirdparty\openjpeg-1.5.0-patched\libopenjpeg;..\thirdparty\zlib-1.2.7;..\thirdparty\freetype-2.4.10\include" + AdditionalIncludeDirectories="..\scripts;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\libopenjpeg;..\thirdparty\zlib;..\thirdparty\freetype\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-9;..\thirdparty\openjpeg-1.5.0-patched\libopenjpeg;..\thirdparty\zlib-1.2.7;..\thirdparty\freetype-2.4.10\include" + AdditionalIncludeDirectories="..\scripts;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\libopenjpeg;..\thirdparty\zlib;..\thirdparty\freetype\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" @@ -206,127 +206,127 @@ Name="libjpeg" > <File - RelativePath="..\thirdparty\jpeg-9\jaricom.c" + RelativePath="..\thirdparty\jpeg\jaricom.c" > </File> <File - RelativePath="..\thirdparty\jpeg-9\jcomapi.c" + RelativePath="..\thirdparty\jpeg\jcomapi.c" > </File> <File - RelativePath="..\thirdparty\jpeg-9\jdapimin.c" + RelativePath="..\thirdparty\jpeg\jdapimin.c" > </File> <File - RelativePath="..\thirdparty\jpeg-9\jdapistd.c" + RelativePath="..\thirdparty\jpeg\jdapistd.c" > </File> <File - RelativePath="..\thirdparty\jpeg-9\jdarith.c" + RelativePath="..\thirdparty\jpeg\jdarith.c" > </File> <File - RelativePath="..\thirdparty\jpeg-9\jdatadst.c" + RelativePath="..\thirdparty\jpeg\jdatadst.c" > </File> <File - RelativePath="..\thirdparty\jpeg-9\jdatasrc.c" + RelativePath="..\thirdparty\jpeg\jdatasrc.c" > </File> <File - RelativePath="..\thirdparty\jpeg-9\jdcoefct.c" + RelativePath="..\thirdparty\jpeg\jdcoefct.c" > </File> <File - RelativePath="..\thirdparty\jpeg-9\jdcolor.c" + RelativePath="..\thirdparty\jpeg\jdcolor.c" > </File> <File - RelativePath="..\thirdparty\jpeg-9\jddctmgr.c" + RelativePath="..\thirdparty\jpeg\jddctmgr.c" > </File> <File - RelativePath="..\thirdparty\jpeg-9\jdhuff.c" + RelativePath="..\thirdparty\jpeg\jdhuff.c" > </File> <File - RelativePath="..\thirdparty\jpeg-9\jdinput.c" + RelativePath="..\thirdparty\jpeg\jdinput.c" > </File> <File - RelativePath="..\thirdparty\jpeg-9\jdmainct.c" + RelativePath="..\thirdparty\jpeg\jdmainct.c" > </File> <File - RelativePath="..\thirdparty\jpeg-9\jdmarker.c" + RelativePath="..\thirdparty\jpeg\jdmarker.c" > </File> <File - RelativePath="..\thirdparty\jpeg-9\jdmaster.c" + RelativePath="..\thirdparty\jpeg\jdmaster.c" > </File> <File - RelativePath="..\thirdparty\jpeg-9\jdmerge.c" + RelativePath="..\thirdparty\jpeg\jdmerge.c" > </File> <File - RelativePath="..\thirdparty\jpeg-9\jdpostct.c" + RelativePath="..\thirdparty\jpeg\jdpostct.c" > </File> <File - RelativePath="..\thirdparty\jpeg-9\jdsample.c" + RelativePath="..\thirdparty\jpeg\jdsample.c" > </File> <File - RelativePath="..\thirdparty\jpeg-9\jdtrans.c" + RelativePath="..\thirdparty\jpeg\jdtrans.c" > </File> <File - RelativePath="..\thirdparty\jpeg-9\jerror.c" + RelativePath="..\thirdparty\jpeg\jerror.c" > </File> <File - RelativePath="..\thirdparty\jpeg-9\jfdctflt.c" + RelativePath="..\thirdparty\jpeg\jfdctflt.c" > </File> <File - RelativePath="..\thirdparty\jpeg-9\jfdctfst.c" + RelativePath="..\thirdparty\jpeg\jfdctfst.c" > </File> <File - RelativePath="..\thirdparty\jpeg-9\jfdctint.c" + RelativePath="..\thirdparty\jpeg\jfdctint.c" > </File> <File - RelativePath="..\thirdparty\jpeg-9\jidctflt.c" + RelativePath="..\thirdparty\jpeg\jidctflt.c" > </File> <File - RelativePath="..\thirdparty\jpeg-9\jidctfst.c" + RelativePath="..\thirdparty\jpeg\jidctfst.c" > </File> <File - RelativePath="..\thirdparty\jpeg-9\jidctint.c" + RelativePath="..\thirdparty\jpeg\jidctint.c" > </File> <File - RelativePath="..\thirdparty\jpeg-9\jmemmgr.c" + RelativePath="..\thirdparty\jpeg\jmemmgr.c" > </File> <File - RelativePath="..\thirdparty\jpeg-9\jmemnobs.c" + RelativePath="..\thirdparty\jpeg\jmemnobs.c" > </File> <File - RelativePath="..\thirdparty\jpeg-9\jquant1.c" + RelativePath="..\thirdparty\jpeg\jquant1.c" > </File> <File - RelativePath="..\thirdparty\jpeg-9\jquant2.c" + RelativePath="..\thirdparty\jpeg\jquant2.c" > </File> <File - RelativePath="..\thirdparty\jpeg-9\jutils.c" + RelativePath="..\thirdparty\jpeg\jutils.c" > </File> </Filter> @@ -398,43 +398,43 @@ Name="libz" > <File - RelativePath="..\thirdparty\zlib-1.2.7\adler32.c" + RelativePath="..\thirdparty\zlib\adler32.c" > </File> <File - RelativePath="..\thirdparty\zlib-1.2.7\compress.c" + RelativePath="..\thirdparty\zlib\compress.c" > </File> <File - RelativePath="..\thirdparty\zlib-1.2.7\crc32.c" + RelativePath="..\thirdparty\zlib\crc32.c" > </File> <File - RelativePath="..\thirdparty\zlib-1.2.7\deflate.c" + RelativePath="..\thirdparty\zlib\deflate.c" > </File> <File - RelativePath="..\thirdparty\zlib-1.2.7\inffast.c" + RelativePath="..\thirdparty\zlib\inffast.c" > </File> <File - RelativePath="..\thirdparty\zlib-1.2.7\inflate.c" + RelativePath="..\thirdparty\zlib\inflate.c" > </File> <File - RelativePath="..\thirdparty\zlib-1.2.7\inftrees.c" + RelativePath="..\thirdparty\zlib\inftrees.c" > </File> <File - RelativePath="..\thirdparty\zlib-1.2.7\trees.c" + RelativePath="..\thirdparty\zlib\trees.c" > </File> <File - RelativePath="..\thirdparty\zlib-1.2.7\uncompr.c" + RelativePath="..\thirdparty\zlib\uncompr.c" > </File> <File - RelativePath="..\thirdparty\zlib-1.2.7\zutil.c" + RelativePath="..\thirdparty\zlib\zutil.c" > </File> </Filter> @@ -442,95 +442,95 @@ Name="libopenjpeg" > <File - RelativePath="..\thirdparty\openjpeg-1.5.0-patched\libopenjpeg\bio.c" + RelativePath="..\thirdparty\openjpeg\libopenjpeg\bio.c" > </File> <File - RelativePath="..\thirdparty\openjpeg-1.5.0-patched\libopenjpeg\cidx_manager.c" + RelativePath="..\thirdparty\openjpeg\libopenjpeg\cidx_manager.c" > </File> <File - RelativePath="..\thirdparty\openjpeg-1.5.0-patched\libopenjpeg\cio.c" + RelativePath="..\thirdparty\openjpeg\libopenjpeg\cio.c" > </File> <File - RelativePath="..\thirdparty\openjpeg-1.5.0-patched\libopenjpeg\dwt.c" + RelativePath="..\thirdparty\openjpeg\libopenjpeg\dwt.c" > </File> <File - RelativePath="..\thirdparty\openjpeg-1.5.0-patched\libopenjpeg\event.c" + RelativePath="..\thirdparty\openjpeg\libopenjpeg\event.c" > </File> <File - RelativePath="..\thirdparty\openjpeg-1.5.0-patched\libopenjpeg\image.c" + RelativePath="..\thirdparty\openjpeg\libopenjpeg\image.c" > </File> <File - RelativePath="..\thirdparty\openjpeg-1.5.0-patched\libopenjpeg\j2k.c" + RelativePath="..\thirdparty\openjpeg\libopenjpeg\j2k.c" > </File> <File - RelativePath="..\thirdparty\openjpeg-1.5.0-patched\libopenjpeg\j2k_lib.c" + RelativePath="..\thirdparty\openjpeg\libopenjpeg\j2k_lib.c" > </File> <File - RelativePath="..\thirdparty\openjpeg-1.5.0-patched\libopenjpeg\jp2.c" + RelativePath="..\thirdparty\openjpeg\libopenjpeg\jp2.c" > </File> <File - RelativePath="..\thirdparty\openjpeg-1.5.0-patched\libopenjpeg\jpt.c" + RelativePath="..\thirdparty\openjpeg\libopenjpeg\jpt.c" > </File> <File - RelativePath="..\thirdparty\openjpeg-1.5.0-patched\libopenjpeg\mct.c" + RelativePath="..\thirdparty\openjpeg\libopenjpeg\mct.c" > </File> <File - RelativePath="..\thirdparty\openjpeg-1.5.0-patched\libopenjpeg\mqc.c" + RelativePath="..\thirdparty\openjpeg\libopenjpeg\mqc.c" > </File> <File - RelativePath="..\thirdparty\openjpeg-1.5.0-patched\libopenjpeg\openjpeg.c" + RelativePath="..\thirdparty\openjpeg\libopenjpeg\openjpeg.c" > </File> <File - RelativePath="..\thirdparty\openjpeg-1.5.0-patched\libopenjpeg\phix_manager.c" + RelativePath="..\thirdparty\openjpeg\libopenjpeg\phix_manager.c" > </File> <File - RelativePath="..\thirdparty\openjpeg-1.5.0-patched\libopenjpeg\pi.c" + RelativePath="..\thirdparty\openjpeg\libopenjpeg\pi.c" > </File> <File - RelativePath="..\thirdparty\openjpeg-1.5.0-patched\libopenjpeg\ppix_manager.c" + RelativePath="..\thirdparty\openjpeg\libopenjpeg\ppix_manager.c" > </File> <File - RelativePath="..\thirdparty\openjpeg-1.5.0-patched\libopenjpeg\raw.c" + RelativePath="..\thirdparty\openjpeg\libopenjpeg\raw.c" > </File> <File - RelativePath="..\thirdparty\openjpeg-1.5.0-patched\libopenjpeg\t1.c" + RelativePath="..\thirdparty\openjpeg\libopenjpeg\t1.c" > </File> <File - RelativePath="..\thirdparty\openjpeg-1.5.0-patched\libopenjpeg\t2.c" + RelativePath="..\thirdparty\openjpeg\libopenjpeg\t2.c" > </File> <File - RelativePath="..\thirdparty\openjpeg-1.5.0-patched\libopenjpeg\tcd.c" + RelativePath="..\thirdparty\openjpeg\libopenjpeg\tcd.c" > </File> <File - RelativePath="..\thirdparty\openjpeg-1.5.0-patched\libopenjpeg\tgt.c" + RelativePath="..\thirdparty\openjpeg\libopenjpeg\tgt.c" > </File> <File - RelativePath="..\thirdparty\openjpeg-1.5.0-patched\libopenjpeg\thix_manager.c" + RelativePath="..\thirdparty\openjpeg\libopenjpeg\thix_manager.c" > </File> <File - RelativePath="..\thirdparty\openjpeg-1.5.0-patched\libopenjpeg\tpix_manager.c" + RelativePath="..\thirdparty\openjpeg\libopenjpeg\tpix_manager.c" > </File> </Filter> @@ -538,90 +538,90 @@ Name="libfreetype" > <File - RelativePath="..\thirdparty\freetype-2.4.10\src\cff\cff.c" + RelativePath="..\thirdparty\freetype\src\cff\cff.c" > </File> <File - RelativePath="..\thirdparty\freetype-2.4.10\src\psaux\psaux.c" + RelativePath="..\thirdparty\freetype\src\psaux\psaux.c" > </File> <File - RelativePath="..\thirdparty\freetype-2.4.10\src\pshinter\pshinter.c" + RelativePath="..\thirdparty\freetype\src\pshinter\pshinter.c" > </File> <File - RelativePath="..\thirdparty\freetype-2.4.10\src\psnames\psnames.c" + RelativePath="..\thirdparty\freetype\src\psnames\psnames.c" > </File> <File - RelativePath="..\thirdparty\freetype-2.4.10\src\raster\raster.c" + RelativePath="..\thirdparty\freetype\src\raster\raster.c" > </File> <File - RelativePath="..\thirdparty\freetype-2.4.10\src\sfnt\sfnt.c" + RelativePath="..\thirdparty\freetype\src\sfnt\sfnt.c" > </File> <File - RelativePath="..\thirdparty\freetype-2.4.10\src\smooth\smooth.c" + RelativePath="..\thirdparty\freetype\src\smooth\smooth.c" > </File> <File - RelativePath="..\thirdparty\freetype-2.4.10\src\truetype\truetype.c" + RelativePath="..\thirdparty\freetype\src\truetype\truetype.c" > </File> <File - RelativePath="..\thirdparty\freetype-2.4.10\src\type1\type1.c" + RelativePath="..\thirdparty\freetype\src\type1\type1.c" > </File> <File - RelativePath="..\thirdparty\freetype-2.4.10\src\cid\type1cid.c" + RelativePath="..\thirdparty\freetype\src\cid\type1cid.c" > </File> <Filter Name="base" > <File - RelativePath="..\thirdparty\freetype-2.4.10\src\base\ftbase.c" + RelativePath="..\thirdparty\freetype\src\base\ftbase.c" > </File> <File - RelativePath="..\thirdparty\freetype-2.4.10\src\base\ftbbox.c" + RelativePath="..\thirdparty\freetype\src\base\ftbbox.c" > </File> <File - RelativePath="..\thirdparty\freetype-2.4.10\src\base\ftbitmap.c" + RelativePath="..\thirdparty\freetype\src\base\ftbitmap.c" > </File> <File - RelativePath="..\thirdparty\freetype-2.4.10\src\base\ftgasp.c" + RelativePath="..\thirdparty\freetype\src\base\ftgasp.c" > </File> <File - RelativePath="..\thirdparty\freetype-2.4.10\src\base\ftglyph.c" + RelativePath="..\thirdparty\freetype\src\base\ftglyph.c" > </File> <File - RelativePath="..\thirdparty\freetype-2.4.10\src\base\ftinit.c" + RelativePath="..\thirdparty\freetype\src\base\ftinit.c" > </File> <File - RelativePath="..\thirdparty\freetype-2.4.10\src\base\ftstroke.c" + RelativePath="..\thirdparty\freetype\src\base\ftstroke.c" > </File> <File - RelativePath="..\thirdparty\freetype-2.4.10\src\base\ftsynth.c" + RelativePath="..\thirdparty\freetype\src\base\ftsynth.c" > </File> <File - RelativePath="..\thirdparty\freetype-2.4.10\src\base\ftsystem.c" + RelativePath="..\thirdparty\freetype\src\base\ftsystem.c" > </File> <File - RelativePath="..\thirdparty\freetype-2.4.10\src\base\fttype1.c" + RelativePath="..\thirdparty\freetype\src\base\fttype1.c" > </File> <File - RelativePath="..\thirdparty\freetype-2.4.10\src\base\ftxf86.c" + RelativePath="..\thirdparty\freetype\src\base\ftxf86.c" > </File> </Filter> |