diff options
author | Tor Andersson <tor.andersson@artifex.com> | 2017-01-09 16:53:21 +0100 |
---|---|---|
committer | Robin Watts <robin.watts@artifex.com> | 2017-01-17 17:48:54 +0000 |
commit | 08de3aa3254690425607ceb859d808f7d0852a84 (patch) | |
tree | 6c8dbe599855ce882981c7f374df91318db0453c /platform | |
parent | cc8fba5b4e43bf4c635beee6882284605e9f8076 (diff) | |
download | mupdf-08de3aa3254690425607ceb859d808f7d0852a84.tar.xz |
Remove preprocessor defines from vcproj.
Keeping them up to date is difficult and prone to errors, so we move
setting the USE_OUTPUT_DEBUG_STRING and FZ_LARGEFILE flags to the source
instead of relying on project file definitions.
Diffstat (limited to 'platform')
-rw-r--r-- | platform/win32/generated.vcproj | 2 | ||||
-rw-r--r-- | platform/win32/javaviewer.vcproj | 4 | ||||
-rw-r--r-- | platform/win32/javaviewerlib.vcproj | 8 | ||||
-rw-r--r-- | platform/win32/libglfw.vcproj | 12 | ||||
-rw-r--r-- | platform/win32/libluratech.vcproj | 24 | ||||
-rw-r--r-- | platform/win32/libmupdf.vcproj | 38 | ||||
-rw-r--r-- | platform/win32/libmuthreads.vcproj | 24 | ||||
-rw-r--r-- | platform/win32/libthirdparty.vcproj | 20 | ||||
-rw-r--r-- | platform/win32/mu-office-lib.vcproj | 24 | ||||
-rw-r--r-- | platform/win32/mu-office-test.vcproj | 28 | ||||
-rw-r--r-- | platform/win32/mudraw.vcproj | 28 | ||||
-rw-r--r-- | platform/win32/mujstest.vcproj | 24 | ||||
-rw-r--r-- | platform/win32/mupdf-curl.vcproj | 32 | ||||
-rw-r--r-- | platform/win32/mupdf-gl.vcproj | 24 | ||||
-rw-r--r-- | platform/win32/mupdf.vcproj | 36 | ||||
-rw-r--r-- | platform/win32/muraster.vcproj | 24 | ||||
-rw-r--r-- | platform/win32/mutool.vcproj | 28 |
17 files changed, 193 insertions, 187 deletions
diff --git a/platform/win32/generated.vcproj b/platform/win32/generated.vcproj index dffefdd5..9ef71954 100644 --- a/platform/win32/generated.vcproj +++ b/platform/win32/generated.vcproj @@ -27,7 +27,7 @@ ReBuildCommandLine="del /q ..\..\generated ..\..\include\mupdf\pdf\name-table.h ..\..\source\pdf\pdf-name-table.h && generate.bat" CleanCommandLine="del /q ..\..\generated ..\..\include\mupdf\pdf\name-table.h ..\..\source\pdf\pdf-name-table.h" Output="" - PreprocessorDefinitions="WIN32;_DEBUG;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN32;_DEBUG" IncludeSearchPath="" ForcedIncludes="" AssemblySearchPath="" diff --git a/platform/win32/javaviewer.vcproj b/platform/win32/javaviewer.vcproj index 440039b5..5561a4b7 100644 --- a/platform/win32/javaviewer.vcproj +++ b/platform/win32/javaviewer.vcproj @@ -50,7 +50,7 @@ ReBuildCommandLine="cd ..\java && winmake.bat $(PlatformName)\$(ConfigurationName)" CleanCommandLine="" Output="javaviewer.jar" - PreprocessorDefinitions="WIN32;_DEBUG" + PreprocessorDefinitions="WIN64;_DEBUG" IncludeSearchPath="" ForcedIncludes="" AssemblySearchPath="" @@ -90,7 +90,7 @@ ReBuildCommandLine="cd ..\java && winmake.bat $(PlatformName)\$(ConfigurationName)" CleanCommandLine="" Output="javaviewer.exe" - PreprocessorDefinitions="WIN32;NDEBUG" + PreprocessorDefinitions="WIN64;NDEBUG" IncludeSearchPath="" ForcedIncludes="" AssemblySearchPath="" diff --git a/platform/win32/javaviewerlib.vcproj b/platform/win32/javaviewerlib.vcproj index 4a829c27..be1aa5ba 100644 --- a/platform/win32/javaviewerlib.vcproj +++ b/platform/win32/javaviewerlib.vcproj @@ -44,7 +44,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="../../include;$(JAVA_HOME)/include;$(JAVA_HOME)/include/win32" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;JAVAVIEWERLIB_EXPORTS" + PreprocessorDefinitions="WIN32;_DEBUG" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -122,7 +122,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="../../include;$(JAVA_HOME)/include;$(JAVA_HOME)/include/win32" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;JAVAVIEWERLIB_EXPORTS" + PreprocessorDefinitions="WIN64;_DEBUG" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -199,7 +199,7 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="../../include;$(JAVA_HOME)/include;$(JAVA_HOME)/include/win32" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;JAVAVIEWERLIB_EXPORTS" + PreprocessorDefinitions="WIN32;NDEBUG" RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" @@ -277,7 +277,7 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="../../include;$(JAVA_HOME)/include;$(JAVA_HOME)/include/win32" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;JAVAVIEWERLIB_EXPORTS" + PreprocessorDefinitions="WIN64;NDEBUG" RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" diff --git a/platform/win32/libglfw.vcproj b/platform/win32/libglfw.vcproj index 231dc064..d0f50eab 100644 --- a/platform/win32/libglfw.vcproj +++ b/platform/win32/libglfw.vcproj @@ -43,7 +43,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS;_GLFW_WIN32;_GLFW_WGL;_GLFW_USE_OPENGL" + PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_GLFW_WIN32;_GLFW_WGL;_GLFW_USE_OPENGL" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -106,7 +106,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS;_GLFW_WIN32;_GLFW_WGL;_GLFW_USE_OPENGL" + PreprocessorDefinitions="WIN64;_DEBUG;_CRT_SECURE_NO_WARNINGS;_GLFW_WIN32;_GLFW_WGL;_GLFW_USE_OPENGL" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -168,7 +168,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS;_GLFW_WIN32;_GLFW_WGL;_GLFW_USE_OPENGL;MEMENTO" + PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_GLFW_WIN32;_GLFW_WGL;_GLFW_USE_OPENGL;MEMENTO" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -231,7 +231,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS;_GLFW_WIN32;_GLFW_WGL;_GLFW_USE_OPENGL;MEMENTO" + PreprocessorDefinitions="WIN64;_DEBUG;_CRT_SECURE_NO_WARNINGS;_GLFW_WIN32;_GLFW_WGL;_GLFW_USE_OPENGL;MEMENTO" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -293,7 +293,7 @@ /> <Tool Name="VCCLCompilerTool" - PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS;_GLFW_WIN32;_GLFW_WGL;_GLFW_USE_OPENGL" + PreprocessorDefinitions="WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_GLFW_WIN32;_GLFW_WGL;_GLFW_USE_OPENGL" RuntimeLibrary="0" EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" @@ -355,7 +355,7 @@ /> <Tool Name="VCCLCompilerTool" - PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS;_GLFW_WIN32;_GLFW_WGL;_GLFW_USE_OPENGL" + PreprocessorDefinitions="WIN64;NDEBUG;_CRT_SECURE_NO_WARNINGS;_GLFW_WIN32;_GLFW_WGL;_GLFW_USE_OPENGL" RuntimeLibrary="0" UsePrecompiledHeader="0" WarningLevel="3" diff --git a/platform/win32/libluratech.vcproj b/platform/win32/libluratech.vcproj index 23dccbf0..05e06780 100644 --- a/platform/win32/libluratech.vcproj +++ b/platform/win32/libluratech.vcproj @@ -43,7 +43,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\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;_CRT_SECURE_NO_WARNINGS" + PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -108,7 +108,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\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;_CRT_SECURE_NO_WARNINGS" + PreprocessorDefinitions="WIN64;_DEBUG;_CRT_SECURE_NO_WARNINGS" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -172,7 +172,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\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" + PreprocessorDefinitions="WIN32;_DEBUG;MEMENTO=1" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -237,7 +237,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\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;_CRT_SECURE_NO_WARNINGS" + PreprocessorDefinitions="WIN64;_DEBUG;MEMENTO=1;_CRT_SECURE_NO_WARNINGS" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -301,7 +301,7 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="..\..\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" + PreprocessorDefinitions="WIN32;NDEBUG" RuntimeLibrary="0" EnableFunctionLevelLinking="true" WarningLevel="3" @@ -365,7 +365,7 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="..\..\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;_CRT_SECURE_NO_WARNINGS" + PreprocessorDefinitions="WIN64;NDEBUG;_CRT_SECURE_NO_WARNINGS" RuntimeLibrary="0" EnableFunctionLevelLinking="true" WarningLevel="3" @@ -428,7 +428,7 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="..\..\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" + PreprocessorDefinitions="WIN32;NDEBUG" RuntimeLibrary="0" EnableFunctionLevelLinking="true" WarningLevel="3" @@ -491,7 +491,7 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="..\..\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;_CRT_SECURE_NO_WARNINGS" + PreprocessorDefinitions="WIN64;NDEBUG;_CRT_SECURE_NO_WARNINGS" RuntimeLibrary="0" EnableFunctionLevelLinking="true" WarningLevel="3" @@ -553,7 +553,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\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" + PreprocessorDefinitions="WIN32;_DEBUG" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -617,7 +617,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\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;_CRT_SECURE_NO_WARNINGS" + PreprocessorDefinitions="WIN64;_DEBUG;_CRT_SECURE_NO_WARNINGS" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -680,7 +680,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\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" + PreprocessorDefinitions="WIN32;_DEBUG;MEMENTO=1" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -744,7 +744,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\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;_CRT_SECURE_NO_WARNINGS" + PreprocessorDefinitions="WIN64;_DEBUG;MEMENTO=1;_CRT_SECURE_NO_WARNINGS" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" diff --git a/platform/win32/libmupdf.vcproj b/platform/win32/libmupdf.vcproj index dace16a5..ed8634e6 100644 --- a/platform/win32/libmupdf.vcproj +++ b/platform/win32/libmupdf.vcproj @@ -43,7 +43,7 @@ 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" - PreprocessorDefinitions="FZ_LARGEFILE;DEBUG=1;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN32;_DEBUG" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -105,7 +105,7 @@ 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" - PreprocessorDefinitions="FZ_LARGEFILE;DEBUG=1;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN64;_DEBUG" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -171,6 +171,7 @@ 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" + PreprocessorDefinitions="WIN32;NDEBUG" RuntimeLibrary="0" EnableFunctionLevelLinking="true" WarningLevel="3" @@ -235,6 +236,7 @@ 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" + PreprocessorDefinitions="WIN64;NDEBUG" RuntimeLibrary="0" EnableFunctionLevelLinking="true" WarningLevel="3" @@ -295,7 +297,7 @@ 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" - PreprocessorDefinitions="FZ_LARGEFILE;MEMENTO=1;DEBUG=1;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN32;_DEBUG;MEMENTO=1" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -358,7 +360,7 @@ 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" - PreprocessorDefinitions="FZ_LARGEFILE;MEMENTO=1;DEBUG=1;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN64;_DEBUG;MEMENTO=1" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -420,7 +422,7 @@ 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" - PreprocessorDefinitions="FZ_LARGEFILE;DEBUG=1;HAVE_LIBCRYPTO;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN32;_DEBUG;HAVE_LIBCRYPTO" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -483,7 +485,7 @@ 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" - PreprocessorDefinitions="FZ_LARGEFILE;DEBUG=1;HAVE_LIBCRYPTO;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN64;_DEBUG;HAVE_LIBCRYPTO" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -548,6 +550,7 @@ 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" + PreprocessorDefinitions="WIN32;NDEBUG;HAVE_LIBCRYPTO" RuntimeLibrary="0" EnableFunctionLevelLinking="true" WarningLevel="3" @@ -612,6 +615,7 @@ 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" + PreprocessorDefinitions="WIN64;NDEBUG;HAVE_LIBCRYPTO" RuntimeLibrary="0" EnableFunctionLevelLinking="true" WarningLevel="3" @@ -672,7 +676,7 @@ 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" - PreprocessorDefinitions="FZ_LARGEFILE;DEBUG=1;USE_OUTPUT_DEBUG_STRING;FZ_ENABLE_GPRF=1" + PreprocessorDefinitions="WIN32;_DEBUG;FZ_ENABLE_GPRF=1" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -735,7 +739,7 @@ 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" - PreprocessorDefinitions="FZ_LARGEFILE;DEBUG=1;USE_OUTPUT_DEBUG_STRING;FZ_ENABLE_GPRF=1" + PreprocessorDefinitions="WIN64;_DEBUG;FZ_ENABLE_GPRF=1" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -797,7 +801,7 @@ 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" - PreprocessorDefinitions="FZ_LARGEFILE;DEBUG=1;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN32;_DEBUG" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -860,7 +864,7 @@ 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" - PreprocessorDefinitions="FZ_LARGEFILE;DEBUG=1;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN64;_DEBUG" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -926,6 +930,7 @@ 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" + PreprocessorDefinitions="WIN32;NDEBUG" RuntimeLibrary="2" EnableFunctionLevelLinking="true" WarningLevel="3" @@ -990,6 +995,7 @@ 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" + PreprocessorDefinitions="WIN64;NDEBUG" RuntimeLibrary="2" EnableFunctionLevelLinking="true" WarningLevel="3" @@ -1050,7 +1056,7 @@ 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" - PreprocessorDefinitions="FZ_LARGEFILE;MEMENTO=1;DEBUG=1;USE_OUTPUT_DEBUG_STRING;HAVE_LURATECH" + PreprocessorDefinitions="WIN32;_DEBUG;MEMENTO=1;HAVE_LURATECH" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -1113,7 +1119,7 @@ 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" - PreprocessorDefinitions="FZ_LARGEFILE;MEMENTO=1;DEBUG=1;USE_OUTPUT_DEBUG_STRING;HAVE_LURATECH" + PreprocessorDefinitions="WIN64;_DEBUG;MEMENTO=1;HAVE_LURATECH" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -1175,7 +1181,7 @@ 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" - PreprocessorDefinitions="FZ_LARGEFILE;DEBUG=1;USE_OUTPUT_DEBUG_STRING;HAVE_LURATECH" + PreprocessorDefinitions="WIN32;_DEBUG;HAVE_LURATECH" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -1238,7 +1244,7 @@ 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" - PreprocessorDefinitions="FZ_LARGEFILE;DEBUG=1;USE_OUTPUT_DEBUG_STRING;HAVE_LURATECH" + PreprocessorDefinitions="WIN64;_DEBUG;HAVE_LURATECH" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -1304,7 +1310,7 @@ 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" - PreprocessorDefinitions="HAVE_LURATECH" + PreprocessorDefinitions="WIN32;NDEBUG;HAVE_LURATECH" RuntimeLibrary="0" EnableFunctionLevelLinking="true" WarningLevel="3" @@ -1369,7 +1375,7 @@ 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" - PreprocessorDefinitions="HAVE_LURATECH" + PreprocessorDefinitions="WIN64;NDEBUG;HAVE_LURATECH" RuntimeLibrary="0" EnableFunctionLevelLinking="true" WarningLevel="3" diff --git a/platform/win32/libmuthreads.vcproj b/platform/win32/libmuthreads.vcproj index 2ad84a38..f91f4ee1 100644 --- a/platform/win32/libmuthreads.vcproj +++ b/platform/win32/libmuthreads.vcproj @@ -43,7 +43,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include\mupdf\mu-office-lib;..\..\include" - PreprocessorDefinitions="WIN32;MEMENTO=1;_CRT_SECURE_NO_WARNINGS" + PreprocessorDefinitions="WIN32;_DEBUG;MEMENTO=1;_CRT_SECURE_NO_WARNINGS" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -108,7 +108,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include\mupdf\mu-office-lib;..\..\include" - PreprocessorDefinitions="WIN64;_CRT_SECURE_NO_WARNINGS" + PreprocessorDefinitions="WIN64;_DEBUG;_CRT_SECURE_NO_WARNINGS" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -172,7 +172,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include\mupdf\mu-office-lib;..\..\include" - PreprocessorDefinitions="WIN32;MEMENTO=1" + PreprocessorDefinitions="WIN32;_DEBUG;MEMENTO=1" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -237,7 +237,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include\mupdf\mu-office-lib;..\..\include" - PreprocessorDefinitions="WIN64;MEMENTO=1;_CRT_SECURE_NO_WARNINGS" + PreprocessorDefinitions="WIN64;_DEBUG;MEMENTO=1;_CRT_SECURE_NO_WARNINGS" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -301,7 +301,7 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="..\..\include\mupdf\mu-office-lib;..\..\include" - PreprocessorDefinitions="WIN32" + PreprocessorDefinitions="WIN32;NDEBUG" RuntimeLibrary="0" EnableFunctionLevelLinking="true" WarningLevel="3" @@ -365,7 +365,7 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="..\..\include\mupdf\mu-office-lib;..\..\include" - PreprocessorDefinitions="WIN64;_CRT_SECURE_NO_WARNINGS" + PreprocessorDefinitions="WIN64;NDEBUG;_CRT_SECURE_NO_WARNINGS" RuntimeLibrary="0" EnableFunctionLevelLinking="true" WarningLevel="3" @@ -428,7 +428,7 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="..\..\include\mupdf\mu-office-lib;..\..\include" - PreprocessorDefinitions="WIN32" + PreprocessorDefinitions="WIN32;NDEBUG" RuntimeLibrary="0" EnableFunctionLevelLinking="true" WarningLevel="3" @@ -492,7 +492,7 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="..\..\include\mupdf\mu-office-lib;..\..\include" - PreprocessorDefinitions="WIN64;_CRT_SECURE_NO_WARNINGS" + PreprocessorDefinitions="WIN64;NDEBUG;_CRT_SECURE_NO_WARNINGS" RuntimeLibrary="0" EnableFunctionLevelLinking="true" WarningLevel="3" @@ -554,7 +554,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include\mupdf\mu-office-lib;..\..\include" - PreprocessorDefinitions="WIN32" + PreprocessorDefinitions="WIN32;_DEBUG" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -619,7 +619,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include\mupdf\mu-office-lib;..\..\include" - PreprocessorDefinitions="WIN64;_CRT_SECURE_NO_WARNINGS" + PreprocessorDefinitions="WIN64;NDEBUG;_CRT_SECURE_NO_WARNINGS" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -682,7 +682,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include\mupdf\mu-office-lib;..\..\include" - PreprocessorDefinitions="WIN32;MEMENTO=1" + PreprocessorDefinitions="WIN32;_DEBUG;MEMENTO=1" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -747,7 +747,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include\mupdf\mu-office-lib;..\..\include" - PreprocessorDefinitions="WIN64;MEMENTO=1;_CRT_SECURE_NO_WARNINGS" + PreprocessorDefinitions="WIN64;_DEBUG;MEMENTO=1;_CRT_SECURE_NO_WARNINGS" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" diff --git a/platform/win32/libthirdparty.vcproj b/platform/win32/libthirdparty.vcproj index 71d5e70b..585b9629 100644 --- a/platform/win32/libthirdparty.vcproj +++ b/platform/win32/libthirdparty.vcproj @@ -43,7 +43,7 @@ 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\" - PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;OPJ_STATIC;USE_JPIP=1;FT_CONFIG_MODULES_H=\"slimftmodules.h\";FT_CONFIG_OPTIONS_H=\"slimftoptions.h\";DEBUG=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" + 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" RuntimeLibrary="1" @@ -105,7 +105,7 @@ 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\" - PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;OPJ_STATIC;USE_JPIP=1;FT_CONFIG_MODULES_H=\"slimftmodules.h\";FT_CONFIG_OPTIONS_H=\"slimftoptions.h\";DEBUG=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" + 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" RuntimeLibrary="1" @@ -168,7 +168,7 @@ 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\" - PreprocessorDefinitions="_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" + 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" WarningLevel="3" @@ -231,7 +231,7 @@ 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\" - PreprocessorDefinitions="_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" + 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" WarningLevel="3" @@ -291,7 +291,7 @@ 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\" - PreprocessorDefinitions="_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;DEBUG=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" + 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" RuntimeLibrary="1" @@ -353,7 +353,7 @@ 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\" - PreprocessorDefinitions="_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;DEBUG=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" + 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" RuntimeLibrary="1" @@ -414,7 +414,7 @@ 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\" - PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;OPJ_STATIC;USE_JPIP=1;FT_CONFIG_MODULES_H=\"slimftmodules.h\";FT_CONFIG_OPTIONS_H=\"slimftoptions.h\";DEBUG=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" + 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" RuntimeLibrary="3" @@ -476,7 +476,7 @@ 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\" - PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;OPJ_STATIC;USE_JPIP=1;FT_CONFIG_MODULES_H=\"slimftmodules.h\";FT_CONFIG_OPTIONS_H=\"slimftoptions.h\";DEBUG=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" + 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" RuntimeLibrary="3" @@ -539,7 +539,7 @@ 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\" - PreprocessorDefinitions="_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" + 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" WarningLevel="3" @@ -602,7 +602,7 @@ 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\" - PreprocessorDefinitions="_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" + 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" WarningLevel="3" diff --git a/platform/win32/mu-office-lib.vcproj b/platform/win32/mu-office-lib.vcproj index fc5a8797..cfd5832c 100644 --- a/platform/win32/mu-office-lib.vcproj +++ b/platform/win32/mu-office-lib.vcproj @@ -43,7 +43,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include\mupdf\mu-office-lib;..\..\include" - PreprocessorDefinitions="WIN32;MEMENTO=1;_CRT_SECURE_NO_WARNINGS" + PreprocessorDefinitions="WIN32;_DEBUG;MEMENTO=1;_CRT_SECURE_NO_WARNINGS" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -108,7 +108,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include\mupdf\mu-office-lib;..\..\include" - PreprocessorDefinitions="WIN64;_CRT_SECURE_NO_WARNINGS" + PreprocessorDefinitions="WIN64;_DEBUG;_CRT_SECURE_NO_WARNINGS" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -172,7 +172,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include\mupdf\mu-office-lib;..\..\include" - PreprocessorDefinitions="WIN32;MEMENTO=1" + PreprocessorDefinitions="WIN32;_DEBUG;MEMENTO=1" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -237,7 +237,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include\mupdf\mu-office-lib;..\..\include" - PreprocessorDefinitions="WIN64;MEMENTO=1;_CRT_SECURE_NO_WARNINGS" + PreprocessorDefinitions="WIN64;_DEBUG;MEMENTO=1;_CRT_SECURE_NO_WARNINGS" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -301,7 +301,7 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="..\..\include\mupdf\mu-office-lib;..\..\include" - PreprocessorDefinitions="WIN32" + PreprocessorDefinitions="WIN32;NDEBUG" RuntimeLibrary="0" EnableFunctionLevelLinking="true" WarningLevel="3" @@ -365,7 +365,7 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="..\..\include\mupdf\mu-office-lib;..\..\include" - PreprocessorDefinitions="WIN64;_CRT_SECURE_NO_WARNINGS" + PreprocessorDefinitions="WIN64;NDEBUG;_CRT_SECURE_NO_WARNINGS" RuntimeLibrary="0" EnableFunctionLevelLinking="true" WarningLevel="3" @@ -428,7 +428,7 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="..\..\include\mupdf\mu-office-lib;..\..\include" - PreprocessorDefinitions="WIN32" + PreprocessorDefinitions="WIN32;NDEBUG" RuntimeLibrary="0" EnableFunctionLevelLinking="true" WarningLevel="3" @@ -492,7 +492,7 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="..\..\include\mupdf\mu-office-lib;..\..\include" - PreprocessorDefinitions="WIN64;_CRT_SECURE_NO_WARNINGS" + PreprocessorDefinitions="WIN64;NDEBUG;_CRT_SECURE_NO_WARNINGS" RuntimeLibrary="0" EnableFunctionLevelLinking="true" WarningLevel="3" @@ -554,7 +554,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include\mupdf\mu-office-lib;..\..\include" - PreprocessorDefinitions="WIN32" + PreprocessorDefinitions="WIN32;_DEBUG" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -619,7 +619,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include\mupdf\mu-office-lib;..\..\include" - PreprocessorDefinitions="WIN64;_CRT_SECURE_NO_WARNINGS" + PreprocessorDefinitions="WIN64;_DEBUG;_CRT_SECURE_NO_WARNINGS" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -682,7 +682,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include\mupdf\mu-office-lib;..\..\include" - PreprocessorDefinitions="WIN32;MEMENTO=1" + PreprocessorDefinitions="WIN32;_DEBUG;MEMENTO=1" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -747,7 +747,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include\mupdf\mu-office-lib;..\..\include" - PreprocessorDefinitions="WIN64;MEMENTO=1;_CRT_SECURE_NO_WARNINGS" + PreprocessorDefinitions="WIN64;_DEBUG;MEMENTO=1;_CRT_SECURE_NO_WARNINGS" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" diff --git a/platform/win32/mu-office-test.vcproj b/platform/win32/mu-office-test.vcproj index bd64017b..32fed0e0 100644 --- a/platform/win32/mu-office-test.vcproj +++ b/platform/win32/mu-office-test.vcproj @@ -43,7 +43,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="FZ_LARGEFILE;DEBUG=1;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN32;_DEBUG" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -116,7 +116,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="FZ_LARGEFILE;DEBUG=1;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN64;_DEBUG" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -190,7 +190,7 @@ Optimization="2" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="FZ_LARGEFILE" + PreprocessorDefinitions="WIN32;NDEBUG" RuntimeLibrary="0" EnableFunctionLevelLinking="true" WarningLevel="3" @@ -266,7 +266,7 @@ Optimization="2" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="FZ_LARGEFILE" + PreprocessorDefinitions="WIN64;NDEBUG" RuntimeLibrary="0" EnableFunctionLevelLinking="true" WarningLevel="3" @@ -339,7 +339,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="FZ_LARGEFILE;MEMENTO=1;DEBUG=1;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN32;_DEBUG;MEMENTO=1" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -412,7 +412,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="FZ_LARGEFILE;MEMENTO=1;DEBUG=1;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN64;_DEBUG;MEMENTO=1" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -484,7 +484,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="FZ_LARGEFILE;DEBUG=1;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN32;_DEBUG" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -557,7 +557,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="FZ_LARGEFILE;DEBUG=1;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN64;_DEBUG" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -629,7 +629,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="FZ_LARGEFILE;DEBUG=1;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN32;_DEBUG" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -702,7 +702,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="FZ_LARGEFILE;DEBUG=1;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN64;_DEBUG" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -776,7 +776,7 @@ Optimization="2" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="FZ_LARGEFILE" + PreprocessorDefinitions="WIN32;NDEBUG" RuntimeLibrary="0" EnableFunctionLevelLinking="true" WarningLevel="3" @@ -852,7 +852,7 @@ Optimization="2" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="FZ_LARGEFILE" + PreprocessorDefinitions="WIN64;NDEBUG" RuntimeLibrary="0" EnableFunctionLevelLinking="true" WarningLevel="3" @@ -925,7 +925,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="FZ_LARGEFILE;MEMENTO=1;DEBUG=1;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN32;_DEBUG;MEMENTO=1" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -998,7 +998,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="FZ_LARGEFILE;MEMENTO=1;DEBUG=1;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN64;_DEBUG;MEMENTO=1" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" diff --git a/platform/win32/mudraw.vcproj b/platform/win32/mudraw.vcproj index b24016f0..f01e68ad 100644 --- a/platform/win32/mudraw.vcproj +++ b/platform/win32/mudraw.vcproj @@ -43,7 +43,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="FZ_LARGEFILE;MUDRAW_STANDALONE;DEBUG=1;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN32;_DEBUG;MUDRAW_STANDALONE" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -116,7 +116,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="FZ_LARGEFILE;MUDRAW_STANDALONE;DEBUG=1;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN64;_DEBUG;MUDRAW_STANDALONE" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -190,7 +190,7 @@ Optimization="2" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="FZ_LARGEFILE;MUDRAW_STANDALONE" + PreprocessorDefinitions="WIN32;NDEBUG;MUDRAW_STANDALONE" RuntimeLibrary="0" EnableFunctionLevelLinking="true" WarningLevel="3" @@ -266,7 +266,7 @@ Optimization="2" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="FZ_LARGEFILE;MUDRAW_STANDALONE" + PreprocessorDefinitions="WIN64;NDEBUG;MUDRAW_STANDALONE" RuntimeLibrary="0" EnableFunctionLevelLinking="true" WarningLevel="3" @@ -339,7 +339,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="FZ_LARGEFILE;MUDRAW_STANDALONE;MEMENTO=1;DEBUG=1;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN32;_DEBUG;MUDRAW_STANDALONE;MEMENTO=1" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -412,7 +412,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="FZ_LARGEFILE;MUDRAW_STANDALONE;MEMENTO=1;DEBUG=1;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN64;_DEBUG;MUDRAW_STANDALONE;MEMENTO=1" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -484,7 +484,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="FZ_LARGEFILE;MUDRAW_STANDALONE;DEBUG=1;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN32;_DEBUG;MUDRAW_STANDALONE" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -557,7 +557,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="FZ_LARGEFILE;MUDRAW_STANDALONE;DEBUG=1;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN64;_DEBUG;MUDRAW_STANDALONE" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -629,7 +629,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="FZ_LARGEFILE;MUDRAW_STANDALONE;DEBUG=1;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN32;_DEBUG;MUDRAW_STANDALONE" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -702,7 +702,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="FZ_LARGEFILE;MUDRAW_STANDALONE;DEBUG=1;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN64;_DEBUG;MUDRAW_STANDALONE" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -776,7 +776,7 @@ Optimization="2" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="FZ_LARGEFILE;MUDRAW_STANDALONE" + PreprocessorDefinitions="WIN32;NDEBUG;MUDRAW_STANDALONE" RuntimeLibrary="0" EnableFunctionLevelLinking="true" WarningLevel="3" @@ -852,7 +852,7 @@ Optimization="2" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="FZ_LARGEFILE;MUDRAW_STANDALONE" + PreprocessorDefinitions="WIN64;NDEBUG;MUDRAW_STANDALONE" RuntimeLibrary="0" EnableFunctionLevelLinking="true" WarningLevel="3" @@ -925,7 +925,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="FZ_LARGEFILE;MUDRAW_STANDALONE;MEMENTO=1;DEBUG=1;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN32;_DEBUG;MUDRAW_STANDALONE;MEMENTO=1" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -998,7 +998,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="FZ_LARGEFILE;MUDRAW_STANDALONE;MEMENTO=1;DEBUG=1;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN64;_DEBUG;MUDRAW_STANDALONE;MEMENTO=1" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" diff --git a/platform/win32/mujstest.vcproj b/platform/win32/mujstest.vcproj index 5af029de..4d14e9c6 100644 --- a/platform/win32/mujstest.vcproj +++ b/platform/win32/mujstest.vcproj @@ -43,7 +43,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="FT2_BUILD_LIBRARY;OPJ_STATIC;DEBUG=1;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN32;_DEBUG;FT2_BUILD_LIBRARY;OPJ_STATIC" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -117,7 +117,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="FT2_BUILD_LIBRARY;OPJ_STATIC;DEBUG=1;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN64;_DEBUG;FT2_BUILD_LIBRARY;OPJ_STATIC" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -339,7 +339,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="FT2_BUILD_LIBRARY;OPJ_STATIC;MEMENTO=1;DEBUG=1;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN32;_DEBUG;FT2_BUILD_LIBRARY;OPJ_STATIC;MEMENTO=1" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -412,7 +412,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="FT2_BUILD_LIBRARY;OPJ_STATIC;MEMENTO=1;DEBUG=1;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN64;_DEBUG;FT2_BUILD_LIBRARY;OPJ_STATIC;MEMENTO=1" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -484,7 +484,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="FT2_BUILD_LIBRARY;OPJ_STATIC;DEBUG=1;HAVE_LIBCRYPTO;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN32;_DEBUG;FT2_BUILD_LIBRARY;OPJ_STATIC;HAVE_LIBCRYPTO" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -558,7 +558,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="FT2_BUILD_LIBRARY;OPJ_STATIC;DEBUG=1;HAVE_LIBCRYPTO;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN64;_DEBUG;FT2_BUILD_LIBRARY;OPJ_STATIC;HAVE_LIBCRYPTO" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -633,7 +633,7 @@ Optimization="2" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="HAVE_LIBCRYPTO" + PreprocessorDefinitions="WIN32;NDEBUG;HAVE_LIBCRYPTO" RuntimeLibrary="0" EnableFunctionLevelLinking="true" WarningLevel="3" @@ -709,7 +709,7 @@ Optimization="2" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="HAVE_LIBCRYPTO" + PreprocessorDefinitions="WIN64;NDEBUG;HAVE_LIBCRYPTO" RuntimeLibrary="0" EnableFunctionLevelLinking="true" WarningLevel="3" @@ -782,7 +782,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="FT2_BUILD_LIBRARY;OPJ_STATIC;DEBUG=1;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN32;_DEBUG;FT2_BUILD_LIBRARY;OPJ_STATIC" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -856,7 +856,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="FT2_BUILD_LIBRARY;OPJ_STATIC;DEBUG=1;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN64;_DEBUG;FT2_BUILD_LIBRARY;OPJ_STATIC" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -929,7 +929,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="FT2_BUILD_LIBRARY;OPJ_STATIC;MEMENTO=1;DEBUG=1;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN32;_DEBUG;FT2_BUILD_LIBRARY;OPJ_STATIC;MEMENTO=1" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -1002,7 +1002,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="FT2_BUILD_LIBRARY;OPJ_STATIC;MEMENTO=1;DEBUG=1;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN64;_DEBUG;FT2_BUILD_LIBRARY;OPJ_STATIC;MEMENTO=1" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" diff --git a/platform/win32/mupdf-curl.vcproj b/platform/win32/mupdf-curl.vcproj index d76ae1d4..f09799e6 100644 --- a/platform/win32/mupdf-curl.vcproj +++ b/platform/win32/mupdf-curl.vcproj @@ -43,7 +43,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include,..\..\thirdparty\curl\include,..\..\thirdparty\curl\lib" - PreprocessorDefinitions="FZ_LARGEFILE;FT2_BUILD_LIBRARY;OPJ_STATIC;DEBUG=1;HAVE_CURL=1;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN32;_DEBUG;FT2_BUILD_LIBRARY;OPJ_STATIC;HAVE_CURL=1" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -117,7 +117,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include,..\..\thirdparty\curl\include,..\..\thirdparty\curl\lib" - PreprocessorDefinitions="FZ_LARGEFILE;FT2_BUILD_LIBRARY;OPJ_STATIC;DEBUG=1;HAVE_CURL=1;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN64;_DEBUG;FT2_BUILD_LIBRARY;OPJ_STATIC;HAVE_CURL=1" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -192,7 +192,7 @@ Optimization="2" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="..\..\include,..\..\thirdparty\curl\include,..\..\thirdparty\curl\lib" - PreprocessorDefinitions="FZ_LARGEFILE;HAVE_CURL=1" + PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CURL=1" RuntimeLibrary="0" EnableFunctionLevelLinking="true" WarningLevel="3" @@ -269,7 +269,7 @@ Optimization="2" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="..\..\include,..\..\thirdparty\curl\include,..\..\thirdparty\curl\lib" - PreprocessorDefinitions="FZ_LARGEFILE;HAVE_CURL=1" + PreprocessorDefinitions="WIN64;NDEBUG;HAVE_CURL=1" RuntimeLibrary="0" EnableFunctionLevelLinking="true" WarningLevel="3" @@ -343,7 +343,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include,..\..\thirdparty\curl\include,..\..\thirdparty\curl\lib" - PreprocessorDefinitions="FZ_LARGEFILE;FT2_BUILD_LIBRARY;OPJ_STATIC;MEMENTO=1;DEBUG=1;HAVE_CURL=1;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN32;_DEBUG;FT2_BUILD_LIBRARY;OPJ_STATIC;MEMENTO=1;HAVE_CURL=1" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -417,7 +417,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include,..\..\thirdparty\curl\include,..\..\thirdparty\curl\lib" - PreprocessorDefinitions="FZ_LARGEFILE;FT2_BUILD_LIBRARY;OPJ_STATIC;MEMENTO=1;DEBUG=1;HAVE_CURL=1;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN64;_DEBUG;FT2_BUILD_LIBRARY;OPJ_STATIC;MEMENTO=1;HAVE_CURL=1" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -490,7 +490,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include,..\..\thirdparty\curl\include,..\..\thirdparty\curl\lib" - PreprocessorDefinitions="FZ_LARGEFILE;FT2_BUILD_LIBRARY;OPJ_STATIC;DEBUG=1;HAVE_LIBCRYPTO;HAVE_CURL=1;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN32;_DEBUG;FT2_BUILD_LIBRARY;OPJ_STATIC;HAVE_LIBCRYPTO;HAVE_CURL=1" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -565,7 +565,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include,..\..\thirdparty\curl\include,..\..\thirdparty\curl\lib" - PreprocessorDefinitions="FZ_LARGEFILE;FT2_BUILD_LIBRARY;OPJ_STATIC;DEBUG=1;HAVE_LIBCRYPTO;HAVE_CURL=1;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN64;_DEBUG;FT2_BUILD_LIBRARY;OPJ_STATIC;HAVE_LIBCRYPTO;HAVE_CURL=1" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -641,7 +641,7 @@ Optimization="2" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="..\..\include,..\..\thirdparty\curl\include,..\..\thirdparty\curl\lib" - PreprocessorDefinitions="FZ_LARGEFILE;HAVE_LIBCRYPTO;HAVE_CURL=1" + PreprocessorDefinitions="WIN32;NDEBUG;HAVE_LIBCRYPTO;HAVE_CURL=1" RuntimeLibrary="0" EnableFunctionLevelLinking="true" WarningLevel="3" @@ -719,7 +719,7 @@ Optimization="2" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="..\..\include,..\..\thirdparty\curl\include,..\..\thirdparty\curl\lib" - PreprocessorDefinitions="FZ_LARGEFILE;HAVE_LIBCRYPTO;HAVE_CURL=1" + PreprocessorDefinitions="WIN64;NDEBUG;HAVE_LIBCRYPTO;HAVE_CURL=1" RuntimeLibrary="0" EnableFunctionLevelLinking="true" WarningLevel="3" @@ -794,7 +794,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include,..\..\thirdparty\curl\include,..\..\thirdparty\curl\lib" - PreprocessorDefinitions="FZ_LARGEFILE;FT2_BUILD_LIBRARY;OPJ_STATIC;MEMENTO=1;DEBUG=1;HAVE_CURL=1;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN32;_DEBUG;FT2_BUILD_LIBRARY;OPJ_STATIC;MEMENTO=1;HAVE_CURL=1" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -868,7 +868,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include,..\..\thirdparty\curl\include,..\..\thirdparty\curl\lib" - PreprocessorDefinitions="FZ_LARGEFILE;FT2_BUILD_LIBRARY;OPJ_STATIC;MEMENTO=1;DEBUG=1;HAVE_CURL=1;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN64;_DEBUG;FT2_BUILD_LIBRARY;OPJ_STATIC;MEMENTO=1;HAVE_CURL=1" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -943,7 +943,7 @@ Optimization="2" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="..\..\include,..\..\thirdparty\curl\include,..\..\thirdparty\curl\lib" - PreprocessorDefinitions="FZ_LARGEFILE;HAVE_CURL=1" + PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CURL=1" RuntimeLibrary="0" EnableFunctionLevelLinking="true" WarningLevel="3" @@ -1020,7 +1020,7 @@ Optimization="2" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="..\..\include,..\..\thirdparty\curl\include,..\..\thirdparty\curl\lib" - PreprocessorDefinitions="FZ_LARGEFILE;HAVE_CURL=1" + PreprocessorDefinitions="WIN64;NDEBUG;HAVE_CURL=1" RuntimeLibrary="0" EnableFunctionLevelLinking="true" WarningLevel="3" @@ -1094,7 +1094,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include,..\..\thirdparty\curl\include,..\..\thirdparty\curl\lib" - PreprocessorDefinitions="FZ_LARGEFILE;FT2_BUILD_LIBRARY;OPJ_STATIC;DEBUG=1;HAVE_CURL=1;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN32;_DEBUG;FT2_BUILD_LIBRARY;OPJ_STATIC;HAVE_CURL=1" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -1168,7 +1168,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include,..\..\thirdparty\curl\include,..\..\thirdparty\curl\lib" - PreprocessorDefinitions="FZ_LARGEFILE;FT2_BUILD_LIBRARY;OPJ_STATIC;DEBUG=1;HAVE_CURL=1;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN64;_DEBUG;FT2_BUILD_LIBRARY;OPJ_STATIC;HAVE_CURL=1" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" diff --git a/platform/win32/mupdf-gl.vcproj b/platform/win32/mupdf-gl.vcproj index fbfbc5d0..8d25a8e8 100644 --- a/platform/win32/mupdf-gl.vcproj +++ b/platform/win32/mupdf-gl.vcproj @@ -44,7 +44,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include;..\..\thirdparty\glfw\include;..\..\scripts\freetype;..\..\thirdparty\freetype\include" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN32;_DEBUG" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -122,7 +122,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include;..\..\thirdparty\glfw\include;..\..\scripts\freetype;..\..\thirdparty\freetype\include" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN64;_DEBUG" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -199,7 +199,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include;..\..\thirdparty\glfw\include;..\..\scripts\freetype;..\..\thirdparty\freetype\include" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;USE_OUTPUT_DEBUG_STRING;MEMENTO" + PreprocessorDefinitions="WIN32;_DEBUG;MEMENTO" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -274,7 +274,7 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="..\..\include;..\..\thirdparty\glfw\include;..\..\scripts\freetype;..\..\thirdparty\freetype\include" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;USE_OUTPUT_DEBUG_STRING;MEMENTO" + PreprocessorDefinitions="WIN64;_DEBUG;MEMENTO=1" RuntimeLibrary="1" /> <Tool @@ -340,7 +340,7 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="..\..\include;..\..\thirdparty\glfw\include;..\..\scripts\freetype;..\..\thirdparty\freetype\include" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" + PreprocessorDefinitions="WIN32;NDEBUG" RuntimeLibrary="0" EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" @@ -419,7 +419,7 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="..\..\include;..\..\thirdparty\glfw\include;..\..\scripts\freetype;..\..\thirdparty\freetype\include" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" + PreprocessorDefinitions="WIN64;NDEBUG" RuntimeLibrary="0" UsePrecompiledHeader="0" WarningLevel="3" @@ -496,7 +496,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include;..\..\thirdparty\glfw\include;..\..\scripts\freetype;..\..\thirdparty\freetype\include" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;USE_OUTPUT_DEBUG_STRING;MEMENTO" + PreprocessorDefinitions="WIN32;_DEBUG;MEMENTO" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -572,7 +572,7 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="..\..\include;..\..\thirdparty\glfw\include;..\..\scripts\freetype;..\..\thirdparty\freetype\include" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;USE_OUTPUT_DEBUG_STRING;MEMENTO" + PreprocessorDefinitions="WIN64;_DEBUG;MEMENTO" RuntimeLibrary="1" /> <Tool @@ -639,7 +639,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include;..\..\thirdparty\glfw\include;..\..\scripts\freetype;..\..\thirdparty\freetype\include" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN32;_DEBUG" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -717,7 +717,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include;..\..\thirdparty\glfw\include;..\..\scripts\freetype;..\..\thirdparty\freetype\include" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN64;_DEBUG" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -794,7 +794,7 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="..\..\include;..\..\thirdparty\glfw\include;..\..\scripts\freetype;..\..\thirdparty\freetype\include" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" + PreprocessorDefinitions="WIN32;NDEBUG" RuntimeLibrary="0" EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" @@ -873,7 +873,7 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="..\..\include;..\..\thirdparty\glfw\include;..\..\scripts\freetype;..\..\thirdparty\freetype\include" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" + PreprocessorDefinitions="WIN64;NDEBUG" RuntimeLibrary="0" UsePrecompiledHeader="0" WarningLevel="3" diff --git a/platform/win32/mupdf.vcproj b/platform/win32/mupdf.vcproj index d7082786..a85fe1ee 100644 --- a/platform/win32/mupdf.vcproj +++ b/platform/win32/mupdf.vcproj @@ -43,7 +43,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="FZ_LARGEFILE;FT2_BUILD_LIBRARY;OPJ_STATIC;DEBUG=1;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN32;_DEBUG;FT2_BUILD_LIBRARY;OPJ_STATIC" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -116,7 +116,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="FZ_LARGEFILE;FT2_BUILD_LIBRARY;OPJ_STATIC;DEBUG=1;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN64;_DEBUG;FT2_BUILD_LIBRARY;OPJ_STATIC" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -190,7 +190,7 @@ Optimization="2" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="FZ_LARGEFILE" + PreprocessorDefinitions="WIN32;NDEBUG" RuntimeLibrary="0" EnableFunctionLevelLinking="true" WarningLevel="3" @@ -266,7 +266,7 @@ Optimization="2" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="FZ_LARGEFILE" + PreprocessorDefinitions="WIN64;NDEBUG" RuntimeLibrary="0" EnableFunctionLevelLinking="true" WarningLevel="3" @@ -339,7 +339,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="FZ_LARGEFILE;FT2_BUILD_LIBRARY;OPJ_STATIC;MEMENTO=1;DEBUG=1;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN32;_DEBUG;FT2_BUILD_LIBRARY;OPJ_STATIC;MEMENTO=1" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -412,7 +412,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="FZ_LARGEFILE;FT2_BUILD_LIBRARY;OPJ_STATIC;MEMENTO=1;DEBUG=1;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN64;_DEBUG;FT2_BUILD_LIBRARY;OPJ_STATIC;MEMENTO=1" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -484,7 +484,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="FZ_LARGEFILE;FT2_BUILD_LIBRARY;OPJ_STATIC;DEBUG=1;HAVE_LIBCRYPTO;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN32;_DEBUG;FT2_BUILD_LIBRARY;OPJ_STATIC;HAVE_LIBCRYPTO" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -559,7 +559,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="FZ_LARGEFILE;FT2_BUILD_LIBRARY;OPJ_STATIC;DEBUG=1;HAVE_LIBCRYPTO;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN64;_DEBUG;FT2_BUILD_LIBRARY;OPJ_STATIC;HAVE_LIBCRYPTO" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -635,7 +635,7 @@ Optimization="2" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="FZ_LARGEFILE;HAVE_LIBCRYPTO" + PreprocessorDefinitions="WIN32;NDEBUG;HAVE_LIBCRYPTO" RuntimeLibrary="0" EnableFunctionLevelLinking="true" WarningLevel="3" @@ -713,7 +713,7 @@ Optimization="2" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="FZ_LARGEFILE;HAVE_LIBCRYPTO" + PreprocessorDefinitions="WIN64;NDEBUG;HAVE_LIBCRYPTO" RuntimeLibrary="0" EnableFunctionLevelLinking="true" WarningLevel="3" @@ -788,7 +788,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="FZ_LARGEFILE;FT2_BUILD_LIBRARY;OPJ_STATIC;DEBUG=1;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN32;_DEBUG;FT2_BUILD_LIBRARY;OPJ_STATIC" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -861,7 +861,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="FZ_LARGEFILE;FT2_BUILD_LIBRARY;OPJ_STATIC;DEBUG=1;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN64;_DEBUG;FT2_BUILD_LIBRARY;OPJ_STATIC" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -933,7 +933,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="FZ_LARGEFILE;FT2_BUILD_LIBRARY;OPJ_STATIC;MEMENTO=1;DEBUG=1;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN32;_DEBUG;FT2_BUILD_LIBRARY;OPJ_STATIC;MEMENTO=1" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -1006,7 +1006,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="FZ_LARGEFILE;FT2_BUILD_LIBRARY;OPJ_STATIC;MEMENTO=1;DEBUG=1;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN64;_DEBUG;FT2_BUILD_LIBRARY;OPJ_STATIC;MEMENTO=1" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -1078,7 +1078,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="FZ_LARGEFILE;FT2_BUILD_LIBRARY;OPJ_STATIC;DEBUG=1;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN32;_DEBUG;FT2_BUILD_LIBRARY;OPJ_STATIC" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -1151,7 +1151,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="FZ_LARGEFILE;FT2_BUILD_LIBRARY;OPJ_STATIC;DEBUG=1;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN64;_DEBUG;FT2_BUILD_LIBRARY;OPJ_STATIC" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -1225,7 +1225,7 @@ Optimization="2" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="FZ_LARGEFILE" + PreprocessorDefinitions="WIN32;NDEBUG" RuntimeLibrary="0" EnableFunctionLevelLinking="true" WarningLevel="3" @@ -1301,7 +1301,7 @@ Optimization="2" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="FZ_LARGEFILE" + PreprocessorDefinitions="WIN64;NDEBUG" RuntimeLibrary="0" EnableFunctionLevelLinking="true" WarningLevel="3" diff --git a/platform/win32/muraster.vcproj b/platform/win32/muraster.vcproj index 8e40e54e..e9685060 100644 --- a/platform/win32/muraster.vcproj +++ b/platform/win32/muraster.vcproj @@ -43,7 +43,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="FZ_LARGEFILE;DEBUG=1;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN32;_DEBUG" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -116,7 +116,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="FZ_LARGEFILE;DEBUG=1;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN64;_DEBUG" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -190,7 +190,7 @@ Optimization="2" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="FZ_LARGEFILE" + PreprocessorDefinitions="WIN32;NDEBUG" RuntimeLibrary="0" EnableFunctionLevelLinking="true" WarningLevel="3" @@ -266,7 +266,7 @@ Optimization="2" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="FZ_LARGEFILE" + PreprocessorDefinitions="WIN64;NDEBUG" RuntimeLibrary="0" EnableFunctionLevelLinking="true" WarningLevel="3" @@ -339,7 +339,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="FZ_LARGEFILE;MEMENTO=1;DEBUG=1;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN32;_DEBUG;MEMENTO=1" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -412,7 +412,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="FZ_LARGEFILE;MEMENTO=1;DEBUG=1;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN64;_DEBUG;MEMENTO=1" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -484,7 +484,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="FZ_LARGEFILE;DEBUG=1;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN32;_DEBUG" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -557,7 +557,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="FZ_LARGEFILE;DEBUG=1;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN64;_DEBUG" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -631,7 +631,7 @@ Optimization="2" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="FZ_LARGEFILE" + PreprocessorDefinitions="WIN32" RuntimeLibrary="0" EnableFunctionLevelLinking="true" WarningLevel="3" @@ -707,7 +707,7 @@ Optimization="2" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="FZ_LARGEFILE" + PreprocessorDefinitions="WIN64" RuntimeLibrary="0" EnableFunctionLevelLinking="true" WarningLevel="3" @@ -780,7 +780,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="FZ_LARGEFILE;MEMENTO=1;DEBUG=1;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN32;_DEBUG;MEMENTO=1" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -853,7 +853,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="FZ_LARGEFILE;MEMENTO=1;DEBUG=1;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN64;_DEBUG;MEMENTO=1" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" diff --git a/platform/win32/mutool.vcproj b/platform/win32/mutool.vcproj index 413beca8..de1e58de 100644 --- a/platform/win32/mutool.vcproj +++ b/platform/win32/mutool.vcproj @@ -43,7 +43,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include;..\..\thirdparty\mujs" - PreprocessorDefinitions="FZ_LARGEFILE;DEBUG=1;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN32;_DEBUG" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -116,7 +116,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include;..\..\thirdparty\mujs" - PreprocessorDefinitions="FZ_LARGEFILE;DEBUG=1;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN64;_DEBUG" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -190,7 +190,7 @@ Optimization="2" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="..\..\include;..\..\thirdparty\mujs" - PreprocessorDefinitions="FZ_LARGEFILE" + PreprocessorDefinitions="WIN32;NDEBUG" RuntimeLibrary="0" EnableFunctionLevelLinking="true" WarningLevel="3" @@ -266,7 +266,7 @@ Optimization="2" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="..\..\include;..\..\thirdparty\mujs" - PreprocessorDefinitions="FZ_LARGEFILE" + PreprocessorDefinitions="WIN64;NDEBUG" RuntimeLibrary="0" EnableFunctionLevelLinking="true" WarningLevel="3" @@ -339,7 +339,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include;..\..\thirdparty\mujs" - PreprocessorDefinitions="FZ_LARGEFILE;MEMENTO=1;DEBUG=1;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN32;_DEBUG;MEMENTO" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -412,7 +412,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include;..\..\thirdparty\mujs" - PreprocessorDefinitions="FZ_LARGEFILE;MEMENTO=1;DEBUG=1;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN64;_DEBUG;MEMENTO" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -484,7 +484,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include;..\..\thirdparty\mujs" - PreprocessorDefinitions="FZ_LARGEFILE;DEBUG=1;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN32;_DEBUG" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -557,7 +557,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include;..\..\thirdparty\mujs" - PreprocessorDefinitions="FZ_LARGEFILE;DEBUG=1;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN64;_DEBUG" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -631,7 +631,7 @@ Optimization="2" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="..\..\include;..\..\thirdparty\mujs" - PreprocessorDefinitions="FZ_LARGEFILE" + PreprocessorDefinitions="WIN32;NDEBUG" RuntimeLibrary="0" EnableFunctionLevelLinking="true" WarningLevel="3" @@ -707,7 +707,7 @@ Optimization="2" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="..\..\include;..\..\thirdparty\mujs" - PreprocessorDefinitions="FZ_LARGEFILE" + PreprocessorDefinitions="WIN64;NDEBUG" RuntimeLibrary="0" EnableFunctionLevelLinking="true" WarningLevel="3" @@ -780,7 +780,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include;..\..\thirdparty\mujs" - PreprocessorDefinitions="FZ_LARGEFILE;DEBUG=1;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN32;_DEBUG" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -853,7 +853,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include;..\..\thirdparty\mujs" - PreprocessorDefinitions="FZ_LARGEFILE;DEBUG=1;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN64;_DEBUG" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -925,7 +925,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include;..\..\thirdparty\mujs" - PreprocessorDefinitions="FZ_LARGEFILE;MEMENTO=1;DEBUG=1;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN32;_DEBUG;MEMENTO" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -998,7 +998,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include;..\..\thirdparty\mujs" - PreprocessorDefinitions="FZ_LARGEFILE;MEMENTO=1;DEBUG=1;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="WIN64;_DEBUG;MEMENTO" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" |