diff options
| -rw-r--r-- | .gitmodules | 2 | ||||
| -rw-r--r-- | Makethird | 8 | ||||
| -rw-r--r-- | platform/java/Android.mk | 68 | ||||
| -rw-r--r-- | platform/win32/libmupdf.vcproj | 44 | ||||
| -rw-r--r-- | platform/win32/libthirdparty.vcproj | 82 | ||||
| -rw-r--r-- | scripts/libjpeg/jconfig.h (renamed from scripts/jpeg/jconfig.h) | 0 | ||||
| m--------- | thirdparty/libjpeg (renamed from thirdparty/jpeg) | 0 |
7 files changed, 102 insertions, 102 deletions
diff --git a/.gitmodules b/.gitmodules index 86e59dcd..943bf948 100644 --- a/.gitmodules +++ b/.gitmodules @@ -11,7 +11,7 @@ path = thirdparty/harfbuzz url = ../thirdparty-harfbuzz.git [submodule "thirdparty/jpeg"] - path = thirdparty/jpeg + path = thirdparty/libjpeg url = ../thirdparty-libjpeg.git [submodule "thirdparty/openjpeg"] path = thirdparty/openjpeg @@ -9,12 +9,12 @@ FREETYPE_DIR := thirdparty/freetype HARFBUZZ_DIR := thirdparty/harfbuzz JBIG2DEC_DIR := thirdparty/jbig2dec -LIBJPEG_DIR := thirdparty/jpeg +JPEGXR_DIR := thirdparty/jpegxr +LIBJPEG_DIR := thirdparty/libjpeg +LURATECH_DIR := thirdparty/luratech MUJS_DIR := thirdparty/mujs OPENJPEG_DIR := thirdparty/openjpeg/src/lib/openjp2 ZLIB_DIR := thirdparty/zlib -LURATECH_DIR := thirdparty/luratech -JPEGXR_DIR := thirdparty/jpegxr CURL_DIR := thirdparty/curl GLFW_DIR := thirdparty/glfw @@ -458,7 +458,7 @@ $(LIBJPEG_OUT): $(LIBJPEG_OUT)/%.o: $(LIBJPEG_DIR)/%.c | $(LIBJPEG_OUT) $(CC_CMD) -Dmain=xxxmain -LIBJPEG_CFLAGS := -Iscripts/jpeg -I$(LIBJPEG_DIR) +LIBJPEG_CFLAGS := -Iscripts/libjpeg -I$(LIBJPEG_DIR) else LIBJPEG_CFLAGS := $(SYS_LIBJPEG_CFLAGS) -DSHARE_JPEG LIBJPEG_LIBS := $(SYS_LIBJPEG_LIBS) diff --git a/platform/java/Android.mk b/platform/java/Android.mk index ae43f869..1bd05045 100644 --- a/platform/java/Android.mk +++ b/platform/java/Android.mk @@ -42,11 +42,11 @@ LOCAL_C_INCLUDES := \ $(MUPDF_PATH)/include \ $(MUPDF_PATH)/generated \ $(MUPDF_PATH)/scripts/freetype \ - $(MUPDF_PATH)/scripts/jpeg \ + $(MUPDF_PATH)/scripts/libjpeg \ $(MUPDF_PATH)/thirdparty/freetype/include \ $(MUPDF_PATH)/thirdparty/harfbuzz/src \ $(MUPDF_PATH)/thirdparty/jbig2dec \ - $(MUPDF_PATH)/thirdparty/jpeg \ + $(MUPDF_PATH)/thirdparty/libjpeg \ $(MUPDF_PATH)/thirdparty/mujs \ $(MUPDF_PATH)/thirdparty/openjpeg/src/lib/openjp2 \ $(MUPDF_PATH)/thirdparty/zlib \ @@ -79,11 +79,11 @@ LOCAL_CPP_EXTENSION := .cc LOCAL_C_INCLUDES := \ $(MUPDF_PATH)/include \ $(MUPDF_PATH)/scripts/freetype \ - $(MUPDF_PATH)/scripts/jpeg \ + $(MUPDF_PATH)/scripts/libjpeg \ $(MUPDF_PATH)/thirdparty/freetype/include \ $(MUPDF_PATH)/thirdparty/harfbuzz/src \ $(MUPDF_PATH)/thirdparty/jbig2dec \ - $(MUPDF_PATH)/thirdparty/jpeg \ + $(MUPDF_PATH)/thirdparty/libjpeg \ $(MUPDF_PATH)/thirdparty/mujs \ $(MUPDF_PATH)/thirdparty/openjpeg/src/lib/openjp2 \ $(MUPDF_PATH)/thirdparty/zlib \ @@ -181,36 +181,36 @@ LOCAL_SRC_FILES += \ $(MUPDF_PATH)/thirdparty/jbig2dec/jbig2_text.c \ LOCAL_SRC_FILES += \ - $(MUPDF_PATH)/thirdparty/jpeg/jaricom.c \ - $(MUPDF_PATH)/thirdparty/jpeg/jcomapi.c \ - $(MUPDF_PATH)/thirdparty/jpeg/jdapimin.c \ - $(MUPDF_PATH)/thirdparty/jpeg/jdapistd.c \ - $(MUPDF_PATH)/thirdparty/jpeg/jdarith.c \ - $(MUPDF_PATH)/thirdparty/jpeg/jdatadst.c \ - $(MUPDF_PATH)/thirdparty/jpeg/jdatasrc.c \ - $(MUPDF_PATH)/thirdparty/jpeg/jdcoefct.c \ - $(MUPDF_PATH)/thirdparty/jpeg/jdcolor.c \ - $(MUPDF_PATH)/thirdparty/jpeg/jddctmgr.c \ - $(MUPDF_PATH)/thirdparty/jpeg/jdhuff.c \ - $(MUPDF_PATH)/thirdparty/jpeg/jdinput.c \ - $(MUPDF_PATH)/thirdparty/jpeg/jdmainct.c \ - $(MUPDF_PATH)/thirdparty/jpeg/jdmarker.c \ - $(MUPDF_PATH)/thirdparty/jpeg/jdmaster.c \ - $(MUPDF_PATH)/thirdparty/jpeg/jdmerge.c \ - $(MUPDF_PATH)/thirdparty/jpeg/jdpostct.c \ - $(MUPDF_PATH)/thirdparty/jpeg/jdsample.c \ - $(MUPDF_PATH)/thirdparty/jpeg/jdtrans.c \ - $(MUPDF_PATH)/thirdparty/jpeg/jerror.c \ - $(MUPDF_PATH)/thirdparty/jpeg/jfdctflt.c \ - $(MUPDF_PATH)/thirdparty/jpeg/jfdctfst.c \ - $(MUPDF_PATH)/thirdparty/jpeg/jfdctint.c \ - $(MUPDF_PATH)/thirdparty/jpeg/jidctflt.c \ - $(MUPDF_PATH)/thirdparty/jpeg/jidctfst.c \ - $(MUPDF_PATH)/thirdparty/jpeg/jidctint.c \ - $(MUPDF_PATH)/thirdparty/jpeg/jmemmgr.c \ - $(MUPDF_PATH)/thirdparty/jpeg/jquant1.c \ - $(MUPDF_PATH)/thirdparty/jpeg/jquant2.c \ - $(MUPDF_PATH)/thirdparty/jpeg/jutils.c \ + $(MUPDF_PATH)/thirdparty/libjpeg/jaricom.c \ + $(MUPDF_PATH)/thirdparty/libjpeg/jcomapi.c \ + $(MUPDF_PATH)/thirdparty/libjpeg/jdapimin.c \ + $(MUPDF_PATH)/thirdparty/libjpeg/jdapistd.c \ + $(MUPDF_PATH)/thirdparty/libjpeg/jdarith.c \ + $(MUPDF_PATH)/thirdparty/libjpeg/jdatadst.c \ + $(MUPDF_PATH)/thirdparty/libjpeg/jdatasrc.c \ + $(MUPDF_PATH)/thirdparty/libjpeg/jdcoefct.c \ + $(MUPDF_PATH)/thirdparty/libjpeg/jdcolor.c \ + $(MUPDF_PATH)/thirdparty/libjpeg/jddctmgr.c \ + $(MUPDF_PATH)/thirdparty/libjpeg/jdhuff.c \ + $(MUPDF_PATH)/thirdparty/libjpeg/jdinput.c \ + $(MUPDF_PATH)/thirdparty/libjpeg/jdmainct.c \ + $(MUPDF_PATH)/thirdparty/libjpeg/jdmarker.c \ + $(MUPDF_PATH)/thirdparty/libjpeg/jdmaster.c \ + $(MUPDF_PATH)/thirdparty/libjpeg/jdmerge.c \ + $(MUPDF_PATH)/thirdparty/libjpeg/jdpostct.c \ + $(MUPDF_PATH)/thirdparty/libjpeg/jdsample.c \ + $(MUPDF_PATH)/thirdparty/libjpeg/jdtrans.c \ + $(MUPDF_PATH)/thirdparty/libjpeg/jerror.c \ + $(MUPDF_PATH)/thirdparty/libjpeg/jfdctflt.c \ + $(MUPDF_PATH)/thirdparty/libjpeg/jfdctfst.c \ + $(MUPDF_PATH)/thirdparty/libjpeg/jfdctint.c \ + $(MUPDF_PATH)/thirdparty/libjpeg/jidctflt.c \ + $(MUPDF_PATH)/thirdparty/libjpeg/jidctfst.c \ + $(MUPDF_PATH)/thirdparty/libjpeg/jidctint.c \ + $(MUPDF_PATH)/thirdparty/libjpeg/jmemmgr.c \ + $(MUPDF_PATH)/thirdparty/libjpeg/jquant1.c \ + $(MUPDF_PATH)/thirdparty/libjpeg/jquant2.c \ + $(MUPDF_PATH)/thirdparty/libjpeg/jutils.c \ LOCAL_SRC_FILES += \ $(MUPDF_PATH)/thirdparty/mujs/one.c \ diff --git a/platform/win32/libmupdf.vcproj b/platform/win32/libmupdf.vcproj index fa8761af..09899f61 100644 --- a/platform/win32/libmupdf.vcproj +++ b/platform/win32/libmupdf.vcproj @@ -42,7 +42,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\jpeg;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg/src/lib/openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\mujs;..\..\thirdparty\harfbuzz\src" + AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\libjpeg;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\libjpeg;..\..\thirdparty\openjpeg/src/lib/openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\mujs;..\..\thirdparty\harfbuzz\src" PreprocessorDefinitions="WIN32;_DEBUG" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -104,7 +104,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\jpeg;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\mujs;..\..\thirdparty\harfbuzz\src" + AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\libjpeg;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\libjpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\mujs;..\..\thirdparty\harfbuzz\src" PreprocessorDefinitions="WIN64;_DEBUG" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -170,7 +170,7 @@ Optimization="2" EnableIntrinsicFunctions="true" WholeProgramOptimization="false" - AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\jpeg;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\mujs;..\..\thirdparty\harfbuzz\src" + AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\libjpeg;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\libjpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\mujs;..\..\thirdparty\harfbuzz\src" PreprocessorDefinitions="WIN32;NDEBUG" RuntimeLibrary="0" EnableFunctionLevelLinking="true" @@ -235,7 +235,7 @@ Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\jpeg;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\mujs;..\..\thirdparty\harfbuzz\src" + AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\libjpeg;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\libjpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\mujs;..\..\thirdparty\harfbuzz\src" PreprocessorDefinitions="WIN64;NDEBUG" RuntimeLibrary="0" EnableFunctionLevelLinking="true" @@ -296,7 +296,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\jpeg;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\mujs;..\..\thirdparty\harfbuzz\src" + AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\libjpeg;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\libjpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\mujs;..\..\thirdparty\harfbuzz\src" PreprocessorDefinitions="WIN32;_DEBUG;MEMENTO=1" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -359,7 +359,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\jpeg;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\mujs;..\..\thirdparty\harfbuzz\src" + AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\libjpeg;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\libjpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\mujs;..\..\thirdparty\harfbuzz\src" PreprocessorDefinitions="WIN64;_DEBUG;MEMENTO=1" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -421,7 +421,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\jpeg;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\openssl\include;..\..\thirdparty\mujs;..\..\thirdparty\harfbuzz\src" + AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\libjpeg;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\libjpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\openssl\include;..\..\thirdparty\mujs;..\..\thirdparty\harfbuzz\src" PreprocessorDefinitions="WIN32;_DEBUG;HAVE_LIBCRYPTO" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -484,7 +484,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\jpeg;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\openssl\include;..\..\thirdparty\mujs;..\..\thirdparty\harfbuzz\src;..\..\thirdparty\openssl\include" + AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\libjpeg;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\libjpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\openssl\include;..\..\thirdparty\mujs;..\..\thirdparty\harfbuzz\src;..\..\thirdparty\openssl\include" PreprocessorDefinitions="WIN64;_DEBUG;HAVE_LIBCRYPTO" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -549,7 +549,7 @@ Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\jpeg;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\mujs;..\..\thirdparty\harfbuzz\src;..\..\thirdparty\openssl\include" + AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\libjpeg;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\libjpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\mujs;..\..\thirdparty\harfbuzz\src;..\..\thirdparty\openssl\include" PreprocessorDefinitions="WIN32;NDEBUG;HAVE_LIBCRYPTO" RuntimeLibrary="0" EnableFunctionLevelLinking="true" @@ -614,7 +614,7 @@ Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\jpeg;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\mujs;..\..\thirdparty\harfbuzz\src;..\..\thirdparty\openssl\include" + AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\libjpeg;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\libjpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\mujs;..\..\thirdparty\harfbuzz\src;..\..\thirdparty\openssl\include" PreprocessorDefinitions="WIN64;NDEBUG;HAVE_LIBCRYPTO" RuntimeLibrary="0" EnableFunctionLevelLinking="true" @@ -675,7 +675,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\jpeg;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg/src/lib/openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\mujs;..\..\thirdparty\harfbuzz\src" + AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\libjpeg;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\libjpeg;..\..\thirdparty\openjpeg/src/lib/openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\mujs;..\..\thirdparty\harfbuzz\src" PreprocessorDefinitions="WIN32;_DEBUG;FZ_ENABLE_GPRF=1" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -738,7 +738,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\jpeg;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\mujs;..\..\thirdparty\harfbuzz\src" + AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\libjpeg;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\libjpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\mujs;..\..\thirdparty\harfbuzz\src" PreprocessorDefinitions="WIN64;_DEBUG;FZ_ENABLE_GPRF=1" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -800,7 +800,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\jpeg;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg/src/lib/openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\mujs;..\..\thirdparty\harfbuzz\src" + AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\libjpeg;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\libjpeg;..\..\thirdparty\openjpeg/src/lib/openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\mujs;..\..\thirdparty\harfbuzz\src" PreprocessorDefinitions="WIN32;_DEBUG" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -863,7 +863,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\jpeg;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\mujs;..\..\thirdparty\harfbuzz\src" + AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\libjpeg;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\libjpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\mujs;..\..\thirdparty\harfbuzz\src" PreprocessorDefinitions="WIN64;_DEBUG" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -929,7 +929,7 @@ Optimization="2" EnableIntrinsicFunctions="true" WholeProgramOptimization="false" - AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\jpeg;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\mujs;..\..\thirdparty\harfbuzz\src" + AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\libjpeg;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\libjpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\mujs;..\..\thirdparty\harfbuzz\src" PreprocessorDefinitions="WIN32;NDEBUG" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -994,7 +994,7 @@ Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\jpeg;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\mujs;..\..\thirdparty\harfbuzz\src" + AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\libjpeg;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\libjpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\mujs;..\..\thirdparty\harfbuzz\src" PreprocessorDefinitions="WIN64;NDEBUG" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -1055,7 +1055,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\jpeg;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\mujs;..\..\thirdparty\harfbuzz\src;..\..\thirdparty\luratech\ldf_jb2\source\common;..\..\thirdparty\luratech\ldf_jb2\source\libraries;..\..\thirdparty\luratech\ldf_jb2\source\compress;..\..\thirdparty\luratech\lwf_jp2\library\source" + AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\libjpeg;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\libjpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\mujs;..\..\thirdparty\harfbuzz\src;..\..\thirdparty\luratech\ldf_jb2\source\common;..\..\thirdparty\luratech\ldf_jb2\source\libraries;..\..\thirdparty\luratech\ldf_jb2\source\compress;..\..\thirdparty\luratech\lwf_jp2\library\source" PreprocessorDefinitions="WIN32;_DEBUG;MEMENTO=1;HAVE_LURATECH" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -1118,7 +1118,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\jpeg;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\mujs;..\..\thirdparty\harfbuzz\src;..\..\thirdparty\luratech\ldf_jb2\source\common;..\..\thirdparty\luratech\ldf_jb2\source\libraries;..\..\thirdparty\luratech\ldf_jb2\source\compress;..\..\thirdparty\luratech\lwf_jp2\library\source;..\..\thirdparty\luratech\lwf_jp2\library\source" + AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\libjpeg;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\libjpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\mujs;..\..\thirdparty\harfbuzz\src;..\..\thirdparty\luratech\ldf_jb2\source\common;..\..\thirdparty\luratech\ldf_jb2\source\libraries;..\..\thirdparty\luratech\ldf_jb2\source\compress;..\..\thirdparty\luratech\lwf_jp2\library\source;..\..\thirdparty\luratech\lwf_jp2\library\source" PreprocessorDefinitions="WIN64;_DEBUG;MEMENTO=1;HAVE_LURATECH" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -1180,7 +1180,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\jpeg;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg/src/lib/openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\mujs;..\..\thirdparty\harfbuzz\src;..\..\thirdparty\luratech\ldf_jb2\source\common;..\..\thirdparty\luratech\ldf_jb2\source\libraries;..\..\thirdparty\luratech\ldf_jb2\source\compress;..\..\thirdparty\luratech\lwf_jp2\library\source" + AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\libjpeg;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\libjpeg;..\..\thirdparty\openjpeg/src/lib/openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\mujs;..\..\thirdparty\harfbuzz\src;..\..\thirdparty\luratech\ldf_jb2\source\common;..\..\thirdparty\luratech\ldf_jb2\source\libraries;..\..\thirdparty\luratech\ldf_jb2\source\compress;..\..\thirdparty\luratech\lwf_jp2\library\source" PreprocessorDefinitions="WIN32;_DEBUG;HAVE_LURATECH" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -1243,7 +1243,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\jpeg;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\mujs;..\..\thirdparty\harfbuzz\src;..\..\thirdparty\luratech\ldf_jb2\source\common;..\..\thirdparty\luratech\ldf_jb2\source\libraries;..\..\thirdparty\luratech\ldf_jb2\source\compress;..\..\thirdparty\luratech\lwf_jp2\library\source" + AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\libjpeg;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\libjpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\mujs;..\..\thirdparty\harfbuzz\src;..\..\thirdparty\luratech\ldf_jb2\source\common;..\..\thirdparty\luratech\ldf_jb2\source\libraries;..\..\thirdparty\luratech\ldf_jb2\source\compress;..\..\thirdparty\luratech\lwf_jp2\library\source" PreprocessorDefinitions="WIN64;_DEBUG;HAVE_LURATECH" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -1309,7 +1309,7 @@ Optimization="2" EnableIntrinsicFunctions="true" WholeProgramOptimization="false" - AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\jpeg;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\mujs;..\..\thirdparty\harfbuzz\src;..\..\thirdparty\luratech\ldf_jb2\source\common;..\..\thirdparty\luratech\ldf_jb2\source\libraries;..\..\thirdparty\luratech\ldf_jb2\source\compress;..\..\thirdparty\luratech\lwf_jp2\library\source;..\..\thirdparty\luratech\lwf_jp2\library\source" + AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\libjpeg;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\libjpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\mujs;..\..\thirdparty\harfbuzz\src;..\..\thirdparty\luratech\ldf_jb2\source\common;..\..\thirdparty\luratech\ldf_jb2\source\libraries;..\..\thirdparty\luratech\ldf_jb2\source\compress;..\..\thirdparty\luratech\lwf_jp2\library\source;..\..\thirdparty\luratech\lwf_jp2\library\source" PreprocessorDefinitions="WIN32;NDEBUG;HAVE_LURATECH" RuntimeLibrary="0" EnableFunctionLevelLinking="true" @@ -1374,7 +1374,7 @@ Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\jpeg;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\mujs;..\..\thirdparty\harfbuzz\src;..\..\thirdparty\luratech\ldf_jb2\source\common;..\..\thirdparty\luratech\ldf_jb2\source\libraries;..\..\thirdparty\luratech\ldf_jb2\source\compress;..\..\thirdparty\luratech\lwf_jp2\library\source;..\..\thirdparty\luratech\lwf_jp2\library\source" + AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\libjpeg;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\libjpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\mujs;..\..\thirdparty\harfbuzz\src;..\..\thirdparty\luratech\ldf_jb2\source\common;..\..\thirdparty\luratech\ldf_jb2\source\libraries;..\..\thirdparty\luratech\ldf_jb2\source\compress;..\..\thirdparty\luratech\lwf_jp2\library\source;..\..\thirdparty\luratech\lwf_jp2\library\source" PreprocessorDefinitions="WIN64;NDEBUG;HAVE_LURATECH" RuntimeLibrary="0" EnableFunctionLevelLinking="true" diff --git a/platform/win32/libthirdparty.vcproj b/platform/win32/libthirdparty.vcproj index 585b9629..ef85358a 100644 --- a/platform/win32/libthirdparty.vcproj +++ b/platform/win32/libthirdparty.vcproj @@ -42,7 +42,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\jpeg;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\freetype\include\freetype;..\..\include\" + AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\libjpeg;..\..\thirdparty\jbig2dec;..\..\thirdparty\libjpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\freetype\include\freetype;..\..\include\" PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;OPJ_STATIC;USE_JPIP=1;FT_CONFIG_MODULES_H=\"slimftmodules.h\";FT_CONFIG_OPTIONS_H=\"slimftoptions.h\";verbose=-1;JBIG_EXTERNAL_MEMENTO_H=\"memento.h\";HAVE_OT;HAVE_UCDN;HB_NO_MT;hb_malloc_impl=hb_malloc;hb_calloc_impl=hb_calloc;hb_realloc_impl=hb_realloc;hb_free_impl=hb_free" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -104,7 +104,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\jpeg;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\freetype\include\freetype;..\..\include\" + AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\libjpeg;..\..\thirdparty\jbig2dec;..\..\thirdparty\libjpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\freetype\include\freetype;..\..\include\" PreprocessorDefinitions="WIN64;_DEBUG;_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;OPJ_STATIC;USE_JPIP=1;FT_CONFIG_MODULES_H=\"slimftmodules.h\";FT_CONFIG_OPTIONS_H=\"slimftoptions.h\";verbose=-1;HAVE_OT;HAVE_UCDN;HB_NO_MT;hb_malloc_impl=hb_malloc;hb_calloc_impl=hb_calloc;hb_realloc_impl=hb_realloc;hb_free_impl=hb_free" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -167,7 +167,7 @@ Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\jpeg;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\freetype\include\freetype;..\..\include\" + AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\libjpeg;..\..\thirdparty\jbig2dec;..\..\thirdparty\libjpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\freetype\include\freetype;..\..\include\" PreprocessorDefinitions="WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;OPJ_STATIC;USE_JPIP=1;FT_CONFIG_MODULES_H=\"slimftmodules.h\";FT_CONFIG_OPTIONS_H=\"slimftoptions.h\";verbose=-1;JBIG_EXTERNAL_MEMENTO_H=\"memento.h\";HAVE_OT;HAVE_UCDN;HB_NO_MT;hb_malloc_impl=hb_malloc;hb_calloc_impl=hb_calloc;hb_realloc_impl=hb_realloc;hb_free_impl=hb_free" RuntimeLibrary="0" EnableFunctionLevelLinking="true" @@ -230,7 +230,7 @@ Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\jpeg;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\freetype\include\freetype;..\..\include\" + AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\libjpeg;..\..\thirdparty\jbig2dec;..\..\thirdparty\libjpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\freetype\include\freetype;..\..\include\" PreprocessorDefinitions="WIN64;NDEBUG;_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;OPJ_STATIC;USE_JPIP=1;FT_CONFIG_MODULES_H=\"slimftmodules.h\";FT_CONFIG_OPTIONS_H=\"slimftoptions.h\";verbose=-1;HAVE_OT;HAVE_UCDN;HB_NO_MT;hb_malloc_impl=hb_malloc;hb_calloc_impl=hb_calloc;hb_realloc_impl=hb_realloc;hb_free_impl=hb_free" RuntimeLibrary="0" EnableFunctionLevelLinking="true" @@ -290,7 +290,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\jpeg;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\freetype\include\freetype;..\..\include\" + AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\libjpeg;..\..\thirdparty\jbig2dec;..\..\thirdparty\libjpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\freetype\include\freetype;..\..\include\" PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;OPJ_STATIC;USE_JPIP=1;FT_CONFIG_MODULES_H=\"slimftmodules.h\";FT_CONFIG_OPTIONS_H=\"slimftoptions.h\";MEMENTO=1;verbose=-1;JBIG_EXTERNAL_MEMENTO_H=\"memento.h\";HAVE_OT;HAVE_UCDN;HB_NO_MT;hb_malloc_impl=hb_malloc;hb_calloc_impl=hb_calloc;hb_realloc_impl=hb_realloc;hb_free_impl=hb_free" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -352,7 +352,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\jpeg;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\freetype\include\freetype;..\..\include\" + AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\libjpeg;..\..\thirdparty\jbig2dec;..\..\thirdparty\libjpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\freetype\include\freetype;..\..\include\" PreprocessorDefinitions="WIN64;_DEBUG;_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;OPJ_STATIC;USE_JPIP=1;FT_CONFIG_MODULES_H=\"slimftmodules.h\";FT_CONFIG_OPTIONS_H=\"slimftoptions.h\";MEMENTO=1;verbose=-1;HAVE_OT;HAVE_UCDN;HB_NO_MT;hb_malloc_impl=hb_malloc;hb_calloc_impl=hb_calloc;hb_realloc_impl=hb_realloc;hb_free_impl=hb_free" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -413,7 +413,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\jpeg;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\freetype\include\freetype;..\..\include\" + AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\libjpeg;..\..\thirdparty\jbig2dec;..\..\thirdparty\libjpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\freetype\include\freetype;..\..\include\" PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;OPJ_STATIC;USE_JPIP=1;FT_CONFIG_MODULES_H=\"slimftmodules.h\";FT_CONFIG_OPTIONS_H=\"slimftoptions.h\";verbose=-1;JBIG_EXTERNAL_MEMENTO_H=\"memento.h\";HAVE_OT;HAVE_UCDN;HB_NO_MT;hb_malloc_impl=hb_malloc;hb_calloc_impl=hb_calloc;hb_realloc_impl=hb_realloc;hb_free_impl=hb_free" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -475,7 +475,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\jpeg;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\freetype\include\freetype;..\..\include\" + AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\libjpeg;..\..\thirdparty\jbig2dec;..\..\thirdparty\libjpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\freetype\include\freetype;..\..\include\" PreprocessorDefinitions="WIN64;_DEBUG;_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;OPJ_STATIC;USE_JPIP=1;FT_CONFIG_MODULES_H=\"slimftmodules.h\";FT_CONFIG_OPTIONS_H=\"slimftoptions.h\";verbose=-1;HAVE_OT;HAVE_UCDN;HB_NO_MT;hb_malloc_impl=hb_malloc;hb_calloc_impl=hb_calloc;hb_realloc_impl=hb_realloc;hb_free_impl=hb_free" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -538,7 +538,7 @@ Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\jpeg;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\freetype\include\freetype;..\..\include\" + AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\libjpeg;..\..\thirdparty\jbig2dec;..\..\thirdparty\libjpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\freetype\include\freetype;..\..\include\" PreprocessorDefinitions="WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;OPJ_STATIC;USE_JPIP=1;FT_CONFIG_MODULES_H=\"slimftmodules.h\";FT_CONFIG_OPTIONS_H=\"slimftoptions.h\";verbose=-1;JBIG_EXTERNAL_MEMENTO_H=\"memento.h\";HAVE_OT;HAVE_UCDN;HB_NO_MT;hb_malloc_impl=hb_malloc;hb_calloc_impl=hb_calloc;hb_realloc_impl=hb_realloc;hb_free_impl=hb_free" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -601,7 +601,7 @@ Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\jpeg;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\freetype\include\freetype;..\..\include\" + AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\libjpeg;..\..\thirdparty\jbig2dec;..\..\thirdparty\libjpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\freetype\include\freetype;..\..\include\" PreprocessorDefinitions="WIN64;NDEBUG;_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;OPJ_STATIC;USE_JPIP=1;FT_CONFIG_MODULES_H=\"slimftmodules.h\";FT_CONFIG_OPTIONS_H=\"slimftoptions.h\";verbose=-1;HAVE_OT;HAVE_UCDN;HB_NO_MT;hb_malloc_impl=hb_malloc;hb_calloc_impl=hb_calloc;hb_realloc_impl=hb_realloc;hb_free_impl=hb_free" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -644,127 +644,127 @@ Name="libjpeg" > <File - RelativePath="..\..\thirdparty\jpeg\jaricom.c" + RelativePath="..\..\thirdparty\libjpeg\jaricom.c" > </File> <File - RelativePath="..\..\thirdparty\jpeg\jcomapi.c" + RelativePath="..\..\thirdparty\libjpeg\jcomapi.c" > </File> <File - RelativePath="..\..\thirdparty\jpeg\jdapimin.c" + RelativePath="..\..\thirdparty\libjpeg\jdapimin.c" > </File> <File - RelativePath="..\..\thirdparty\jpeg\jdapistd.c" + RelativePath="..\..\thirdparty\libjpeg\jdapistd.c" > </File> <File - RelativePath="..\..\thirdparty\jpeg\jdarith.c" + RelativePath="..\..\thirdparty\libjpeg\jdarith.c" > </File> <File - RelativePath="..\..\thirdparty\jpeg\jdatadst.c" + RelativePath="..\..\thirdparty\libjpeg\jdatadst.c" > </File> <File - RelativePath="..\..\thirdparty\jpeg\jdatasrc.c" + RelativePath="..\..\thirdparty\libjpeg\jdatasrc.c" > </File> <File - RelativePath="..\..\thirdparty\jpeg\jdcoefct.c" + RelativePath="..\..\thirdparty\libjpeg\jdcoefct.c" > </File> <File - RelativePath="..\..\thirdparty\jpeg\jdcolor.c" + RelativePath="..\..\thirdparty\libjpeg\jdcolor.c" > </File> <File - RelativePath="..\..\thirdparty\jpeg\jddctmgr.c" + RelativePath="..\..\thirdparty\libjpeg\jddctmgr.c" > </File> <File - RelativePath="..\..\thirdparty\jpeg\jdhuff.c" + RelativePath="..\..\thirdparty\libjpeg\jdhuff.c" > </File> <File - RelativePath="..\..\thirdparty\jpeg\jdinput.c" + RelativePath="..\..\thirdparty\libjpeg\jdinput.c" > </File> <File - RelativePath="..\..\thirdparty\jpeg\jdmainct.c" + RelativePath="..\..\thirdparty\libjpeg\jdmainct.c" > </File> <File - RelativePath="..\..\thirdparty\jpeg\jdmarker.c" + RelativePath="..\..\thirdparty\libjpeg\jdmarker.c" > </File> <File - RelativePath="..\..\thirdparty\jpeg\jdmaster.c" + RelativePath="..\..\thirdparty\libjpeg\jdmaster.c" > </File> <File - RelativePath="..\..\thirdparty\jpeg\jdmerge.c" + RelativePath="..\..\thirdparty\libjpeg\jdmerge.c" > </File> <File - RelativePath="..\..\thirdparty\jpeg\jdpostct.c" + RelativePath="..\..\thirdparty\libjpeg\jdpostct.c" > </File> <File - RelativePath="..\..\thirdparty\jpeg\jdsample.c" + RelativePath="..\..\thirdparty\libjpeg\jdsample.c" > </File> <File - RelativePath="..\..\thirdparty\jpeg\jdtrans.c" + RelativePath="..\..\thirdparty\libjpeg\jdtrans.c" > </File> <File - RelativePath="..\..\thirdparty\jpeg\jerror.c" + RelativePath="..\..\thirdparty\libjpeg\jerror.c" > </File> <File - RelativePath="..\..\thirdparty\jpeg\jfdctflt.c" + RelativePath="..\..\thirdparty\libjpeg\jfdctflt.c" > </File> <File - RelativePath="..\..\thirdparty\jpeg\jfdctfst.c" + RelativePath="..\..\thirdparty\libjpeg\jfdctfst.c" > </File> <File - RelativePath="..\..\thirdparty\jpeg\jfdctint.c" + RelativePath="..\..\thirdparty\libjpeg\jfdctint.c" > </File> <File - RelativePath="..\..\thirdparty\jpeg\jidctflt.c" + RelativePath="..\..\thirdparty\libjpeg\jidctflt.c" > </File> <File - RelativePath="..\..\thirdparty\jpeg\jidctfst.c" + RelativePath="..\..\thirdparty\libjpeg\jidctfst.c" > </File> <File - RelativePath="..\..\thirdparty\jpeg\jidctint.c" + RelativePath="..\..\thirdparty\libjpeg\jidctint.c" > </File> <File - RelativePath="..\..\thirdparty\jpeg\jmemmgr.c" + RelativePath="..\..\thirdparty\libjpeg\jmemmgr.c" > </File> <File - RelativePath="..\..\thirdparty\jpeg\jmemnobs.c" + RelativePath="..\..\thirdparty\libjpeg\jmemnobs.c" > </File> <File - RelativePath="..\..\thirdparty\jpeg\jquant1.c" + RelativePath="..\..\thirdparty\libjpeg\jquant1.c" > </File> <File - RelativePath="..\..\thirdparty\jpeg\jquant2.c" + RelativePath="..\..\thirdparty\libjpeg\jquant2.c" > </File> <File - RelativePath="..\..\thirdparty\jpeg\jutils.c" + RelativePath="..\..\thirdparty\libjpeg\jutils.c" > </File> </Filter> diff --git a/scripts/jpeg/jconfig.h b/scripts/libjpeg/jconfig.h index 466abceb..466abceb 100644 --- a/scripts/jpeg/jconfig.h +++ b/scripts/libjpeg/jconfig.h diff --git a/thirdparty/jpeg b/thirdparty/libjpeg -Subproject 9a532f2d544f218c8a237ebb56d09e24161c196 +Subproject 9a532f2d544f218c8a237ebb56d09e24161c196 |