diff options
| -rw-r--r-- | Makethird | 9 | ||||
| -rw-r--r-- | platform/win32/libmupdf.vcproj | 10 | ||||
| -rw-r--r-- | platform/win32/libthirdparty.vcproj | 23 | ||||
| -rw-r--r-- | source/fitz/load-jpx.c | 7 |
4 files changed, 7 insertions, 42 deletions
@@ -377,7 +377,6 @@ ifneq "$(wildcard $(OPENJPEG_DIR)/openjpeg.h)" "" OPENJPEG_OUT := $(OUT)/thirdparty/openjpeg OPENJPEG_SRC := \ bio.c \ - cidx_manager.c \ cio.c \ dwt.c \ event.c \ @@ -389,16 +388,12 @@ OPENJPEG_SRC := \ mct.c \ mqc.c \ openjpeg.c \ - phix_manager.c \ pi.c \ - ppix_manager.c \ raw.c \ t1.c \ t2.c \ tcd.c \ tgt.c \ - thix_manager.c \ - tpix_manager.c \ thread.c OPENJPEG_OBJ := $(addprefix $(OPENJPEG_OUT)/, $(OPENJPEG_SRC:%.c=%.o)) @@ -406,9 +401,9 @@ OPENJPEG_OBJ := $(addprefix $(OPENJPEG_OUT)/, $(OPENJPEG_SRC:%.c=%.o)) $(OPENJPEG_OUT): $(MKDIR_CMD) $(OPENJPEG_OUT)/%.o: $(OPENJPEG_DIR)/%.c | $(OPENJPEG_OUT) - $(CC_CMD) -DOPJ_STATIC -DOPJ_HAVE_STDINT_H -DOPJ_HAVE_INTTYPES_H -DUSE_JPIP + $(CC_CMD) $(OPENJPEG_CFLAGS) -OPENJPEG_CFLAGS += -I$(OPENJPEG_DIR) +OPENJPEG_CFLAGS += -I$(OPENJPEG_DIR) -DOPJ_STATIC -DOPJ_HAVE_STDINT_H -DOPJ_HAVE_INTTYPES_H else OPENJPEG_CFLAGS := $(SYS_OPENJPEG_CFLAGS) OPENJPEG_LIBS := $(SYS_OPENJPEG_LIBS) diff --git a/platform/win32/libmupdf.vcproj b/platform/win32/libmupdf.vcproj index f1860d78..b0bd5506 100644 --- a/platform/win32/libmupdf.vcproj +++ b/platform/win32/libmupdf.vcproj @@ -43,7 +43,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\libjpeg;..\..\include;..\..\thirdparty\jbig2dec;..\..\thirdparty\libjpeg;..\..\thirdparty\openjpeg/src/lib/openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\mujs;..\..\thirdparty\harfbuzz\src;..\..\thirdparty\lcms2\include" - PreprocessorDefinitions="WIN32;_DEBUG" + PreprocessorDefinitions="WIN32;_DEBUG;OPJ_STATIC" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -105,7 +105,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\libjpeg;..\..\include;..\..\thirdparty\jbig2dec;..\..\thirdparty\libjpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\mujs;..\..\thirdparty\harfbuzz\src;..\..\thirdparty\lcms2\include" - PreprocessorDefinitions="WIN64;_DEBUG" + PreprocessorDefinitions="WIN64;_DEBUG;OPJ_STATIC" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -171,7 +171,7 @@ EnableIntrinsicFunctions="true" WholeProgramOptimization="false" AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\libjpeg;..\..\include;..\..\thirdparty\jbig2dec;..\..\thirdparty\libjpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\mujs;..\..\thirdparty\harfbuzz\src;..\..\thirdparty\lcms2\include" - PreprocessorDefinitions="WIN32;NDEBUG" + PreprocessorDefinitions="WIN32;NDEBUG;OPJ_STATIC" RuntimeLibrary="0" EnableFunctionLevelLinking="true" WarningLevel="3" @@ -236,7 +236,7 @@ Optimization="2" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\libjpeg;..\..\include;..\..\thirdparty\jbig2dec;..\..\thirdparty\libjpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\mujs;..\..\thirdparty\harfbuzz\src;..\..\thirdparty\lcms2\include" - PreprocessorDefinitions="WIN64;NDEBUG" + PreprocessorDefinitions="WIN64;NDEBUG;OPJ_STATIC" RuntimeLibrary="0" EnableFunctionLevelLinking="true" WarningLevel="3" @@ -297,7 +297,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\libjpeg;..\..\include;..\..\thirdparty\jbig2dec;..\..\thirdparty\libjpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\mujs;..\..\thirdparty\harfbuzz\src;..\..\thirdparty\lcms2\include" - PreprocessorDefinitions="WIN32;_DEBUG;MEMENTO=1" + PreprocessorDefinitions="WIN32;_DEBUG;MEMENTO=1;;OPJ_STATIC" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" diff --git a/platform/win32/libthirdparty.vcproj b/platform/win32/libthirdparty.vcproj index ba0aba46..d58a0818 100644 --- a/platform/win32/libthirdparty.vcproj +++ b/platform/win32/libthirdparty.vcproj @@ -888,13 +888,6 @@ > </File> <File - RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\cidx_manager.c" - > - </File> - <File - RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\cidx_manager.h" - > - </File> <File RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\cio.c" > @@ -1024,10 +1017,6 @@ > </File> <File - RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\phix_manager.c" - > - </File> - <File RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\pi.c" > </File> @@ -1036,10 +1025,6 @@ > </File> <File - RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\ppix_manager.c" - > - </File> - <File RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\raw.c" > </File> @@ -1084,10 +1069,6 @@ > </File> <File - RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\thix_manager.c" - > - </File> - <File RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\thread.c" > </File> @@ -1099,10 +1080,6 @@ RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\tls_keys.h" > </File> - <File - RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\tpix_manager.c" - > - </File> </Filter> <Filter Name="libfreetype" diff --git a/source/fitz/load-jpx.c b/source/fitz/load-jpx.c index 40a0a8c7..a1c39f9f 100644 --- a/source/fitz/load-jpx.c +++ b/source/fitz/load-jpx.c @@ -445,13 +445,6 @@ fz_load_jpx_info(fz_context *ctx, const unsigned char *data, size_t size, int *w #else /* HAVE_LURATECH */ -#define OPJ_STATIC -#define OPJ_HAVE_INTTYPES_H -#if !defined(_MSC_VER) || _MSC_VER >= 1600 -#define OPJ_HAVE_STDINT_H -#endif -#define USE_JPIP - #include <openjpeg.h> struct fz_jpxd_s |