diff options
| author | Tor Andersson <tor.andersson@artifex.com> | 2018-04-07 02:34:02 +0200 |
|---|---|---|
| committer | Tor Andersson <tor.andersson@artifex.com> | 2018-04-11 13:49:38 +0200 |
| commit | 5cccad8f7b93c142b0672f59b01069a50a353c45 (patch) | |
| tree | 32cc5cd0e4cec92f574ea92aff3ed7ef131e2c46 /platform/win32 | |
| parent | 2df3e5da2988257eea28670d4a893e99ff199aac (diff) | |
| download | mupdf-5cccad8f7b93c142b0672f59b01069a50a353c45.tar.xz | |
Remove needless #defines in load-jpx.c
Diffstat (limited to 'platform/win32')
| -rw-r--r-- | platform/win32/libmupdf.vcproj | 10 | ||||
| -rw-r--r-- | platform/win32/libthirdparty.vcproj | 23 |
2 files changed, 5 insertions, 28 deletions
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" |