diff options
| author | Robin Watts <robin.watts@artifex.com> | 2018-06-07 18:25:39 +0100 |
|---|---|---|
| committer | Robin Watts <robin.watts@artifex.com> | 2018-06-11 10:14:47 +0100 |
| commit | 3cbf1097dc01a7f10c4867d9c82b5e4721c6d374 (patch) | |
| tree | 5873c0c468e1265dc2894a515fe2e2c31e3a5edb /platform/win32 | |
| parent | e649146f8e465f2cf09f58e3460b507f1bf0956c (diff) | |
| download | mupdf-3cbf1097dc01a7f10c4867d9c82b5e4721c6d374.tar.xz | |
Fix MSVC dependencies/configurations.
Everything builds in a batch build for me now, except for the OpenSSL
stuff, which fails due to me not having it available.
Diffstat (limited to 'platform/win32')
| -rw-r--r-- | platform/win32/libfreeglut.vcproj | 2 | ||||
| -rw-r--r-- | platform/win32/libmupdf.vcproj | 145 | ||||
| -rw-r--r-- | platform/win32/libmuthreads.vcproj | 382 | ||||
| -rw-r--r-- | platform/win32/libmutool.vcproj | 12 | ||||
| -rw-r--r-- | platform/win32/libpkcs7.vcproj | 890 | ||||
| -rw-r--r-- | platform/win32/mu-office-lib.vcproj | 386 | ||||
| -rw-r--r-- | platform/win32/mu-office-test.vcproj | 586 | ||||
| -rw-r--r-- | platform/win32/mudraw.vcproj | 145 | ||||
| -rw-r--r-- | platform/win32/mupdf-gl.vcproj | 12 | ||||
| -rw-r--r-- | platform/win32/mupdf.sln | 383 | ||||
| -rw-r--r-- | platform/win32/mupdf.vcproj | 150 | ||||
| -rw-r--r-- | platform/win32/mutool.vcproj | 300 |
12 files changed, 474 insertions, 2919 deletions
diff --git a/platform/win32/libfreeglut.vcproj b/platform/win32/libfreeglut.vcproj index 2f45dc29..fce4e9e2 100644 --- a/platform/win32/libfreeglut.vcproj +++ b/platform/win32/libfreeglut.vcproj @@ -128,6 +128,7 @@ /> <Tool Name="VCLibrarianTool" + OutputFile="$(OutDir)\$(ProjectName).lib" /> <Tool Name="VCALinkTool" @@ -255,6 +256,7 @@ /> <Tool Name="VCLibrarianTool" + OutputFile="$(OutDir)\$(ProjectName).lib" /> <Tool Name="VCALinkTool" diff --git a/platform/win32/libmupdf.vcproj b/platform/win32/libmupdf.vcproj index 013fc3d7..e180913e 100644 --- a/platform/win32/libmupdf.vcproj +++ b/platform/win32/libmupdf.vcproj @@ -293,7 +293,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;;OPJ_STATIC" + PreprocessorDefinitions="WIN32;_DEBUG;MEMENTO=1;OPJ_STATIC" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -356,7 +356,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;MEMENTO=1" + PreprocessorDefinitions="WIN64;_DEBUG;MEMENTO=1;OPJ_STATIC" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -418,7 +418,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\openssl\include;..\..\thirdparty\mujs;..\..\thirdparty\harfbuzz\src;..\..\thirdparty\lcms2\include" - PreprocessorDefinitions="WIN32;_DEBUG;HAVE_LIBCRYPTO" + PreprocessorDefinitions="WIN32;_DEBUG;HAVE_LIBCRYPTO;OPJ_STATIC" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -481,7 +481,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\openssl\include;..\..\thirdparty\mujs;..\..\thirdparty\harfbuzz\src;..\..\thirdparty\openssl\include;..\..\thirdparty\lcms2\include" - PreprocessorDefinitions="WIN64;_DEBUG;HAVE_LIBCRYPTO" + PreprocessorDefinitions="WIN64;_DEBUG;HAVE_LIBCRYPTO;OPJ_STATIC" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -544,7 +544,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\openssl\include;..\..\thirdparty\lcms2\include" - PreprocessorDefinitions="WIN32;NDEBUG;HAVE_LIBCRYPTO" + PreprocessorDefinitions="WIN32;NDEBUG;HAVE_LIBCRYPTO;OPJ_STATIC" RuntimeLibrary="0" EnableFunctionLevelLinking="true" WarningLevel="3" @@ -607,7 +607,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\openssl\include;..\..\thirdparty\lcms2\include" - PreprocessorDefinitions="WIN64;NDEBUG;HAVE_LIBCRYPTO" + PreprocessorDefinitions="WIN64;NDEBUG;HAVE_LIBCRYPTO;OPJ_STATIC" RuntimeLibrary="0" EnableFunctionLevelLinking="true" WarningLevel="3" @@ -642,131 +642,6 @@ /> </Configuration> <Configuration - Name="DebugGProof|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)\$(ProjectName)" - ConfigurationType="4" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - CommandLine="" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - 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;FZ_ENABLE_GPRF=1" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - WarningLevel="3" - DebugInformationFormat="4" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="DebugGProof|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)" - ConfigurationType="4" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - CommandLine="" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TargetEnvironment="3" - /> - <Tool - 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;FZ_ENABLE_GPRF=1" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - WarningLevel="3" - DebugInformationFormat="3" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration Name="DebugJava|Win32" OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)\$(ProjectName)" @@ -793,7 +668,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="3" @@ -856,7 +731,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="3" @@ -920,7 +795,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="2" EnableFunctionLevelLinking="true" WarningLevel="3" @@ -983,7 +858,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="2" EnableFunctionLevelLinking="true" WarningLevel="3" diff --git a/platform/win32/libmuthreads.vcproj b/platform/win32/libmuthreads.vcproj index e810183b..b5fae496 100644 --- a/platform/win32/libmuthreads.vcproj +++ b/platform/win32/libmuthreads.vcproj @@ -402,388 +402,6 @@ Name="VCPostBuildEventTool" /> </Configuration> - <Configuration - Name="ReleaseCommercial|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)\$(ProjectName)" - ConfigurationType="4" - CharacterSet="2" - WholeProgramOptimization="0" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\..\include\mupdf\mu-office-lib;..\..\include" - PreprocessorDefinitions="WIN32;NDEBUG" - RuntimeLibrary="0" - EnableFunctionLevelLinking="true" - WarningLevel="3" - Detect64BitPortabilityProblems="false" - DebugInformationFormat="3" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - OutputFile="$(OutDir)\$(ProjectName).lib" - IgnoreAllDefaultLibraries="false" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="ReleaseCommercial|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)" - ConfigurationType="4" - CharacterSet="2" - WholeProgramOptimization="0" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TargetEnvironment="3" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\..\include\mupdf\mu-office-lib;..\..\include" - PreprocessorDefinitions="WIN64;NDEBUG;_CRT_SECURE_NO_WARNINGS" - RuntimeLibrary="0" - EnableFunctionLevelLinking="true" - WarningLevel="3" - Detect64BitPortabilityProblems="false" - DebugInformationFormat="3" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - IgnoreAllDefaultLibraries="true" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="DebugCommercial|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)\$(ProjectName)" - ConfigurationType="4" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\..\include\mupdf\mu-office-lib;..\..\include" - PreprocessorDefinitions="WIN32;_DEBUG" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - WarningLevel="3" - Detect64BitPortabilityProblems="false" - DebugInformationFormat="4" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - OutputFile="$(OutDir)\$(ProjectName).lib" - IgnoreAllDefaultLibraries="false" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="DebugCommercial|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)" - ConfigurationType="4" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TargetEnvironment="3" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\..\include\mupdf\mu-office-lib;..\..\include" - PreprocessorDefinitions="WIN64;NDEBUG;_CRT_SECURE_NO_WARNINGS" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - WarningLevel="3" - Detect64BitPortabilityProblems="false" - DebugInformationFormat="3" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - IgnoreAllDefaultLibraries="true" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="MementoCommercial|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)\$(ProjectName)" - ConfigurationType="4" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\..\include\mupdf\mu-office-lib;..\..\include" - PreprocessorDefinitions="WIN32;_DEBUG;MEMENTO=1" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - WarningLevel="3" - Detect64BitPortabilityProblems="false" - DebugInformationFormat="4" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - OutputFile="$(OutDir)\$(ProjectName).lib" - IgnoreAllDefaultLibraries="false" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="MementoCommercial|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)" - ConfigurationType="4" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TargetEnvironment="3" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\..\include\mupdf\mu-office-lib;..\..\include" - PreprocessorDefinitions="WIN64;_DEBUG;MEMENTO=1;_CRT_SECURE_NO_WARNINGS" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - WarningLevel="3" - Detect64BitPortabilityProblems="false" - DebugInformationFormat="3" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - IgnoreAllDefaultLibraries="true" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> </Configurations> <References> </References> diff --git a/platform/win32/libmutool.vcproj b/platform/win32/libmutool.vcproj index d2a962f2..3a5522ea 100644 --- a/platform/win32/libmutool.vcproj +++ b/platform/win32/libmutool.vcproj @@ -84,7 +84,7 @@ <Configuration Name="Debug|x64" OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)\$(ProjectName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)" ConfigurationType="4" CharacterSet="2" > @@ -213,7 +213,7 @@ <Configuration Name="Memento|x64" OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)\$(ProjectName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)" ConfigurationType="4" CharacterSet="2" > @@ -341,7 +341,7 @@ <Configuration Name="Release|x64" OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)\$(ProjectName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)" ConfigurationType="4" CharacterSet="2" WholeProgramOptimization="0" @@ -468,7 +468,7 @@ <Configuration Name="ReleaseCommercial|x64" OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)\$(ProjectName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)" ConfigurationType="4" CharacterSet="2" WholeProgramOptimization="0" @@ -595,7 +595,7 @@ <Configuration Name="DebugCommercial|x64" OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)\$(ProjectName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)" ConfigurationType="4" CharacterSet="2" > @@ -723,7 +723,7 @@ <Configuration Name="MementoCommercial|x64" OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)\$(ProjectName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)" ConfigurationType="4" CharacterSet="2" > diff --git a/platform/win32/libpkcs7.vcproj b/platform/win32/libpkcs7.vcproj index 7309ba24..d0603ef7 100644 --- a/platform/win32/libpkcs7.vcproj +++ b/platform/win32/libpkcs7.vcproj @@ -19,8 +19,8 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)\$(ProjectName)" + OutputDirectory="$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)" ConfigurationType="4" CharacterSet="2" > @@ -38,6 +38,7 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" @@ -48,7 +49,7 @@ BasicRuntimeChecks="3" RuntimeLibrary="1" WarningLevel="3" - DebugInformationFormat="4" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" @@ -142,8 +143,8 @@ </Configuration> <Configuration Name="Release|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)\$(ProjectName)" + OutputDirectory="$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)" ConfigurationType="4" CharacterSet="2" WholeProgramOptimization="1" @@ -162,12 +163,12 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" - WholeProgramOptimization="false" AdditionalIncludeDirectories="..\..\include" PreprocessorDefinitions="WIN32;NDEBUG" RuntimeLibrary="0" @@ -268,8 +269,8 @@ </Configuration> <Configuration Name="Memento|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)\$(ProjectName)" + OutputDirectory="$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)" ConfigurationType="4" CharacterSet="2" > @@ -287,6 +288,7 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" @@ -297,7 +299,7 @@ BasicRuntimeChecks="3" RuntimeLibrary="1" WarningLevel="3" - DebugInformationFormat="4" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" @@ -433,6 +435,8 @@ /> <Tool Name="VCLibrarianTool" + AdditionalDependencies="libeay32.lib" + AdditionalLibraryDirectories="..\..\thirdparty\openssl\lib" /> <Tool Name="VCALinkTool" @@ -476,7 +480,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\include" + AdditionalIncludeDirectories="..\..\include;..\..\thirdparty\openssl\include" PreprocessorDefinitions="WIN64;_DEBUG;HAVE_LIBCRYPTO" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -495,6 +499,8 @@ /> <Tool Name="VCLibrarianTool" + AdditionalDependencies="libeay64.lib" + AdditionalLibraryDirectories="..\..\thirdparty\openssl\lib" /> <Tool Name="VCALinkTool" @@ -539,7 +545,7 @@ Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="..\..\include" + AdditionalIncludeDirectories="..\..\include;..\..\thirdparty\openssl\include" PreprocessorDefinitions="WIN32;NDEBUG;HAVE_LIBCRYPTO" RuntimeLibrary="0" EnableFunctionLevelLinking="true" @@ -557,6 +563,8 @@ /> <Tool Name="VCLibrarianTool" + AdditionalDependencies="libeay32.lib ssleay32.lib" + AdditionalLibraryDirectories="..\..\thirdparty\openssl\lib" /> <Tool Name="VCALinkTool" @@ -602,7 +610,7 @@ Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="..\..\include" + AdditionalIncludeDirectories="..\..\include;..\..\thirdparty\openssl\include" PreprocessorDefinitions="WIN64;NDEBUG;HAVE_LIBCRYPTO" RuntimeLibrary="0" EnableFunctionLevelLinking="true" @@ -620,750 +628,8 @@ /> <Tool Name="VCLibrarianTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="DebugGProof|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)\$(ProjectName)" - ConfigurationType="4" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="WIN32;_DEBUG;FZ_ENABLE_GPRF=1" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - WarningLevel="3" - DebugInformationFormat="4" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="DebugGProof|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)" - ConfigurationType="4" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TargetEnvironment="3" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="WIN64;_DEBUG;FZ_ENABLE_GPRF=1" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - WarningLevel="3" - DebugInformationFormat="3" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="DebugJava|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)\$(ProjectName)" - ConfigurationType="4" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="WIN32;_DEBUG" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="3" - WarningLevel="3" - DebugInformationFormat="4" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="DebugJava|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)" - ConfigurationType="4" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TargetEnvironment="3" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="WIN64;_DEBUG" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="3" - WarningLevel="3" - DebugInformationFormat="3" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="ReleaseJava|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)\$(ProjectName)" - ConfigurationType="4" - CharacterSet="2" - WholeProgramOptimization="1" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - EnableIntrinsicFunctions="true" - WholeProgramOptimization="false" - AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="WIN32;NDEBUG" - RuntimeLibrary="2" - EnableFunctionLevelLinking="true" - WarningLevel="3" - DebugInformationFormat="3" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="ReleaseJava|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)" - ConfigurationType="4" - CharacterSet="2" - WholeProgramOptimization="1" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TargetEnvironment="3" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="WIN64;NDEBUG" - RuntimeLibrary="2" - EnableFunctionLevelLinking="true" - WarningLevel="3" - DebugInformationFormat="3" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="MementoCommercial|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)\$(ProjectName)" - ConfigurationType="4" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="WIN32;_DEBUG;MEMENTO=1;HAVE_LURATECH" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - WarningLevel="3" - DebugInformationFormat="4" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="MementoCommercial|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)" - ConfigurationType="4" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TargetEnvironment="3" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="WIN64;_DEBUG;MEMENTO=1;HAVE_LURATECH" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - WarningLevel="3" - DebugInformationFormat="3" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="DebugCommercial|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)\$(ProjectName)" - ConfigurationType="4" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="WIN32;_DEBUG;HAVE_LURATECH" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - WarningLevel="3" - DebugInformationFormat="4" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="DebugCommercial|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)" - ConfigurationType="4" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TargetEnvironment="3" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="WIN64;_DEBUG;HAVE_LURATECH" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - WarningLevel="3" - DebugInformationFormat="3" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="ReleaseCommercial|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)\$(ProjectName)" - ConfigurationType="4" - CharacterSet="2" - WholeProgramOptimization="1" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - EnableIntrinsicFunctions="true" - WholeProgramOptimization="false" - AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="WIN32;NDEBUG;HAVE_LURATECH" - RuntimeLibrary="0" - EnableFunctionLevelLinking="true" - WarningLevel="3" - DebugInformationFormat="3" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="ReleaseCommercial|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)" - ConfigurationType="4" - CharacterSet="2" - WholeProgramOptimization="1" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TargetEnvironment="3" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="WIN64;NDEBUG;HAVE_LURATECH" - RuntimeLibrary="0" - EnableFunctionLevelLinking="true" - WarningLevel="3" - DebugInformationFormat="3" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" + AdditionalDependencies="libeay64.lib" + AdditionalLibraryDirectories="..\..\thirdparty\openssl\lib" /> <Tool Name="VCALinkTool" @@ -1455,118 +721,6 @@ Name="VCCLCompilerTool" /> </FileConfiguration> - <FileConfiguration - Name="ReleaseOpenssl|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - <FileConfiguration - Name="ReleaseOpenssl|x64" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - <FileConfiguration - Name="DebugGProof|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - <FileConfiguration - Name="DebugGProof|x64" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - <FileConfiguration - Name="DebugJava|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - <FileConfiguration - Name="DebugJava|x64" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - <FileConfiguration - Name="ReleaseJava|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - <FileConfiguration - Name="ReleaseJava|x64" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - <FileConfiguration - Name="MementoCommercial|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - <FileConfiguration - Name="MementoCommercial|x64" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - <FileConfiguration - Name="DebugCommercial|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - <FileConfiguration - Name="DebugCommercial|x64" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - <FileConfiguration - Name="ReleaseCommercial|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - <FileConfiguration - Name="ReleaseCommercial|x64" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> </File> </Filter> </Files> diff --git a/platform/win32/mu-office-lib.vcproj b/platform/win32/mu-office-lib.vcproj index 8f69b22b..99fd1c21 100644 --- a/platform/win32/mu-office-lib.vcproj +++ b/platform/win32/mu-office-lib.vcproj @@ -127,7 +127,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile=" " + OutputFile="$(OutDir)\$(ProjectName).lib" IgnoreAllDefaultLibraries="true" /> <Tool @@ -256,7 +256,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile=" " + OutputFile="$(OutDir)\$(ProjectName).lib" IgnoreAllDefaultLibraries="true" /> <Tool @@ -383,389 +383,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile=" " - IgnoreAllDefaultLibraries="true" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="ReleaseCommercial|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)\$(ProjectName)" - ConfigurationType="4" - CharacterSet="2" - WholeProgramOptimization="0" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\..\include\mupdf\mu-office-lib;..\..\include" - PreprocessorDefinitions="WIN32;NDEBUG" - RuntimeLibrary="0" - EnableFunctionLevelLinking="true" - WarningLevel="3" - Detect64BitPortabilityProblems="false" - DebugInformationFormat="3" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - OutputFile="$(OutDir)\$(ProjectName).lib" - IgnoreAllDefaultLibraries="false" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="ReleaseCommercial|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)" - ConfigurationType="4" - CharacterSet="2" - WholeProgramOptimization="0" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TargetEnvironment="3" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\..\include\mupdf\mu-office-lib;..\..\include" - PreprocessorDefinitions="WIN64;NDEBUG;_CRT_SECURE_NO_WARNINGS" - RuntimeLibrary="0" - EnableFunctionLevelLinking="true" - WarningLevel="3" - Detect64BitPortabilityProblems="false" - DebugInformationFormat="3" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - IgnoreAllDefaultLibraries="true" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="DebugCommercial|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)\$(ProjectName)" - ConfigurationType="4" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\..\include\mupdf\mu-office-lib;..\..\include" - PreprocessorDefinitions="WIN32;_DEBUG" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - WarningLevel="3" - Detect64BitPortabilityProblems="false" - DebugInformationFormat="4" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - OutputFile="$(OutDir)\$(ProjectName).lib" - IgnoreAllDefaultLibraries="false" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="DebugCommercial|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)" - ConfigurationType="4" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TargetEnvironment="3" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\..\include\mupdf\mu-office-lib;..\..\include" - PreprocessorDefinitions="WIN64;_DEBUG;_CRT_SECURE_NO_WARNINGS" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - WarningLevel="3" - Detect64BitPortabilityProblems="false" - DebugInformationFormat="3" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - IgnoreAllDefaultLibraries="true" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="MementoCommercial|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)\$(ProjectName)" - ConfigurationType="4" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\..\include\mupdf\mu-office-lib;..\..\include" - PreprocessorDefinitions="WIN32;_DEBUG;MEMENTO=1" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - WarningLevel="3" - Detect64BitPortabilityProblems="false" - DebugInformationFormat="4" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" OutputFile="$(OutDir)\$(ProjectName).lib" - IgnoreAllDefaultLibraries="false" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="MementoCommercial|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)" - ConfigurationType="4" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TargetEnvironment="3" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\..\include\mupdf\mu-office-lib;..\..\include" - PreprocessorDefinitions="WIN64;_DEBUG;MEMENTO=1;_CRT_SECURE_NO_WARNINGS" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - WarningLevel="3" - Detect64BitPortabilityProblems="false" - DebugInformationFormat="3" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" IgnoreAllDefaultLibraries="true" /> <Tool diff --git a/platform/win32/mu-office-test.vcproj b/platform/win32/mu-office-test.vcproj index 32fed0e0..ff5be936 100644 --- a/platform/win32/mu-office-test.vcproj +++ b/platform/win32/mu-office-test.vcproj @@ -458,592 +458,6 @@ Name="VCPostBuildEventTool" /> </Configuration> - <Configuration - Name="DebugGProof|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)\$(ProjectName)" - ConfigurationType="1" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="WIN32;_DEBUG" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - WarningLevel="3" - DebugInformationFormat="4" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - GenerateDebugInformation="true" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCWebDeploymentTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="DebugGProof|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)" - ConfigurationType="1" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TargetEnvironment="3" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="WIN64;_DEBUG" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - WarningLevel="3" - DebugInformationFormat="3" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - GenerateDebugInformation="true" - TargetMachine="17" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCWebDeploymentTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="DebugCommercial|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)\$(ProjectName)" - ConfigurationType="1" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="WIN32;_DEBUG" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - WarningLevel="3" - DebugInformationFormat="4" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - GenerateDebugInformation="true" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCWebDeploymentTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="DebugCommercial|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)" - ConfigurationType="1" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TargetEnvironment="3" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="WIN64;_DEBUG" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - WarningLevel="3" - DebugInformationFormat="3" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - GenerateDebugInformation="true" - TargetMachine="17" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCWebDeploymentTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="ReleaseCommercial|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)\$(ProjectName)" - ConfigurationType="1" - CharacterSet="2" - WholeProgramOptimization="1" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="WIN32;NDEBUG" - RuntimeLibrary="0" - EnableFunctionLevelLinking="true" - WarningLevel="3" - DebugInformationFormat="3" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - GenerateDebugInformation="true" - OptimizeReferences="2" - EnableCOMDATFolding="2" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCWebDeploymentTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="ReleaseCommercial|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)" - ConfigurationType="1" - CharacterSet="2" - WholeProgramOptimization="1" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TargetEnvironment="3" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="WIN64;NDEBUG" - RuntimeLibrary="0" - EnableFunctionLevelLinking="true" - WarningLevel="3" - DebugInformationFormat="3" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - GenerateDebugInformation="true" - OptimizeReferences="2" - EnableCOMDATFolding="2" - TargetMachine="17" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCWebDeploymentTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="MementoCommercial|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)\$(ProjectName)" - ConfigurationType="1" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="WIN32;_DEBUG;MEMENTO=1" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - WarningLevel="3" - DebugInformationFormat="4" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - GenerateDebugInformation="true" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCWebDeploymentTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="MementoCommercial|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)" - ConfigurationType="1" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TargetEnvironment="3" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="WIN64;_DEBUG;MEMENTO=1" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - WarningLevel="3" - DebugInformationFormat="3" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - GenerateDebugInformation="true" - TargetMachine="17" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCWebDeploymentTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> </Configurations> <References> </References> diff --git a/platform/win32/mudraw.vcproj b/platform/win32/mudraw.vcproj index f01e68ad..9bfcd8a0 100644 --- a/platform/win32/mudraw.vcproj +++ b/platform/win32/mudraw.vcproj @@ -459,151 +459,6 @@ /> </Configuration> <Configuration - Name="DebugGProof|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)\$(ProjectName)" - ConfigurationType="1" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="WIN32;_DEBUG;MUDRAW_STANDALONE" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - WarningLevel="3" - DebugInformationFormat="4" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - GenerateDebugInformation="true" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCWebDeploymentTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="DebugGProof|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)" - ConfigurationType="1" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TargetEnvironment="3" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="WIN64;_DEBUG;MUDRAW_STANDALONE" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - WarningLevel="3" - DebugInformationFormat="3" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - GenerateDebugInformation="true" - TargetMachine="17" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCWebDeploymentTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration Name="DebugCommercial|Win32" OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)\$(ProjectName)" diff --git a/platform/win32/mupdf-gl.vcproj b/platform/win32/mupdf-gl.vcproj index f374aa4a..c5fe2722 100644 --- a/platform/win32/mupdf-gl.vcproj +++ b/platform/win32/mupdf-gl.vcproj @@ -122,7 +122,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include;..\..\thirdparty\freeglut\include;..\..\scripts\freetype;..\..\thirdparty\freetype\include" - PreprocessorDefinitions="WIN64;_DEBUG" + PreprocessorDefinitions="FREEGLUT_LIB_PRAGMAS=0;FREEGLUT_STATIC;WIN64;_DEBUG" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -274,7 +274,7 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="..\..\include;..\..\thirdparty\freeglut\include;..\..\scripts\freetype;..\..\thirdparty\freetype\include" - PreprocessorDefinitions="WIN64;_DEBUG;MEMENTO=1" + PreprocessorDefinitions="FREEGLUT_LIB_PRAGMAS=0;FREEGLUT_STATIC;WIN64;_DEBUG;MEMENTO=1" RuntimeLibrary="1" /> <Tool @@ -420,7 +420,7 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="..\..\include;..\..\thirdparty\freeglut\include;..\..\scripts\freetype;..\..\thirdparty\freetype\include" - PreprocessorDefinitions="WIN64;NDEBUG" + PreprocessorDefinitions="FREEGLUT_LIB_PRAGMAS=0;FREEGLUT_STATIC;WIN64;NDEBUG" RuntimeLibrary="0" UsePrecompiledHeader="0" WarningLevel="3" @@ -573,7 +573,7 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="..\..\include;..\..\thirdparty\freeglut\include;..\..\scripts\freetype;..\..\thirdparty\freetype\include" - PreprocessorDefinitions="WIN64;_DEBUG;MEMENTO" + PreprocessorDefinitions="FREEGLUT_LIB_PRAGMAS=0;FREEGLUT_STATIC;" RuntimeLibrary="1" /> <Tool @@ -719,7 +719,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include;..\..\thirdparty\freeglut\include;..\..\scripts\freetype;..\..\thirdparty\freetype\include" - PreprocessorDefinitions="WIN64;_DEBUG" + PreprocessorDefinitions="FREEGLUT_LIB_PRAGMAS=0;FREEGLUT_STATIC;WIN64;_DEBUG" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -875,7 +875,7 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="..\..\include;..\..\thirdparty\freeglut\include;..\..\scripts\freetype;..\..\thirdparty\freetype\include" - PreprocessorDefinitions="WIN64;NDEBUG" + PreprocessorDefinitions="FREEGLUT_LIB_PRAGMAS=0;FREEGLUT_STATIC;WIN64;NDEBUG" RuntimeLibrary="0" UsePrecompiledHeader="0" WarningLevel="3" diff --git a/platform/win32/mupdf.sln b/platform/win32/mupdf.sln index ae77cb49..2b45451e 100644 --- a/platform/win32/mupdf.sln +++ b/platform/win32/mupdf.sln @@ -3,7 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 9.00 # Visual Studio 2005 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mupdf", "mupdf.vcproj", "{E74F29F0-FA43-4ADC-B92C-6AFA08E4A417}" ProjectSection(ProjectDependencies) = postProject - {22462382-B30D-42A5-BF07-EE1A35E25D21} = {22462382-B30D-42A5-BF07-EE1A35E25D21} {5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519} EndProjectSection EndProject @@ -12,14 +11,15 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmupdf", "libmupdf.vcproj", "{5F615F91-DFF8-4F05-BF48-6222B7D86519}" ProjectSection(ProjectDependencies) = postProject {52DCAB29-C8EE-4422-954C-29AFA6B33E22} = {52DCAB29-C8EE-4422-954C-29AFA6B33E22} + {22462382-B30D-42A5-BF07-EE1A35E25D21} = {22462382-B30D-42A5-BF07-EE1A35E25D21} {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} = {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} + {B0091365-C9BA-4F40-AE2B-EF93702871B2} = {B0091365-C9BA-4F40-AE2B-EF93702871B2} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mudraw", "mudraw.vcproj", "{0B51171B-B10E-4EAC-8FFA-19226A1828A3}" ProjectSection(ProjectDependencies) = postProject - {52DCAB29-C8EE-4422-954C-29AFA6B33E22} = {52DCAB29-C8EE-4422-954C-29AFA6B33E22} - {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B} = {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B} {5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519} + {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B} = {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mutool", "mutool.vcproj", "{00811970-815B-4F64-BC9D-219078B1F3AA}" @@ -33,13 +33,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mupdf-curl", "mupdf-curl.vc ProjectSection(ProjectDependencies) = postProject {87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588} {5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519} - {22462382-B30D-42A5-BF07-EE1A35E25D21} = {22462382-B30D-42A5-BF07-EE1A35E25D21} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mujstest", "mujstest.vcproj", "{21E28758-E4D2-4B84-8EC5-B631CEE66B30}" ProjectSection(ProjectDependencies) = postProject {5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519} - {22462382-B30D-42A5-BF07-EE1A35E25D21} = {22462382-B30D-42A5-BF07-EE1A35E25D21} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libfreeglut", "libfreeglut.vcproj", "{A1B75D29-9F5C-4A0F-B368-322A10477D0C}" @@ -64,7 +62,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "muraster", "muraster.vcproj EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "javaviewerlib", "javaviewerlib.vcproj", "{3DB35F2D-9679-4DED-BA0C-240A4E6E6674}" ProjectSection(ProjectDependencies) = postProject - {52DCAB29-C8EE-4422-954C-29AFA6B33E22} = {52DCAB29-C8EE-4422-954C-29AFA6B33E22} {5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519} EndProjectSection EndProject @@ -92,16 +89,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mu-office-test", "mu-office EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmutool", "libmutool.vcproj", "{FA8ADE21-FC8A-47E0-87E4-DCE8808BFC9B}" ProjectSection(ProjectDependencies) = postProject - {22462382-B30D-42A5-BF07-EE1A35E25D21} = {22462382-B30D-42A5-BF07-EE1A35E25D21} {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B} = {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B} {5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519} - {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} = {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mutool-lura", "mutool-lura.vcproj", "{00197081-815B-4F64-BC9D-219078B1F3AA}" - ProjectSection(ProjectDependencies) = postProject - {B0091365-C9BA-4F40-AE2B-EF93702871B2} = {B0091365-C9BA-4F40-AE2B-EF93702871B2} - {FA8ADE21-FC8A-47E0-87E4-DCE8808BFC9B} = {FA8ADE21-FC8A-47E0-87E4-DCE8808BFC9B} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpkcs7", "libpkcs7.vcproj", "{22462382-B30D-42A5-BF07-EE1A35E25D21}" @@ -114,8 +103,6 @@ Global Debug|x64 = Debug|x64 DebugCommercial|Win32 = DebugCommercial|Win32 DebugCommercial|x64 = DebugCommercial|x64 - DebugGProof|Win32 = DebugGProof|Win32 - DebugGProof|x64 = DebugGProof|x64 DebugJava|Win32 = DebugJava|Win32 DebugJava|x64 = DebugJava|x64 DebugOpenssl|Win32 = DebugOpenssl|Win32 @@ -142,10 +129,6 @@ Global {E74F29F0-FA43-4ADC-B92C-6AFA08E4A417}.DebugCommercial|Win32.Build.0 = DebugCommercial|Win32 {E74F29F0-FA43-4ADC-B92C-6AFA08E4A417}.DebugCommercial|x64.ActiveCfg = DebugCommercial|x64 {E74F29F0-FA43-4ADC-B92C-6AFA08E4A417}.DebugCommercial|x64.Build.0 = DebugCommercial|x64 - {E74F29F0-FA43-4ADC-B92C-6AFA08E4A417}.DebugGProof|Win32.ActiveCfg = DebugGProof|Win32 - {E74F29F0-FA43-4ADC-B92C-6AFA08E4A417}.DebugGProof|Win32.Build.0 = DebugGProof|Win32 - {E74F29F0-FA43-4ADC-B92C-6AFA08E4A417}.DebugGProof|x64.ActiveCfg = DebugGProof|x64 - {E74F29F0-FA43-4ADC-B92C-6AFA08E4A417}.DebugGProof|x64.Build.0 = DebugGProof|x64 {E74F29F0-FA43-4ADC-B92C-6AFA08E4A417}.DebugJava|Win32.ActiveCfg = Debug|Win32 {E74F29F0-FA43-4ADC-B92C-6AFA08E4A417}.DebugJava|x64.ActiveCfg = Debug|x64 {E74F29F0-FA43-4ADC-B92C-6AFA08E4A417}.DebugOpenssl|Win32.ActiveCfg = DebugOpenssl|Win32 @@ -167,7 +150,7 @@ Global {E74F29F0-FA43-4ADC-B92C-6AFA08E4A417}.ReleaseCommercial|Win32.Build.0 = ReleaseCommercial|Win32 {E74F29F0-FA43-4ADC-B92C-6AFA08E4A417}.ReleaseCommercial|x64.ActiveCfg = ReleaseCommercial|x64 {E74F29F0-FA43-4ADC-B92C-6AFA08E4A417}.ReleaseCommercial|x64.Build.0 = ReleaseCommercial|x64 - {E74F29F0-FA43-4ADC-B92C-6AFA08E4A417}.ReleaseJava|Win32.ActiveCfg = ReleaseOpenssl|Win32 + {E74F29F0-FA43-4ADC-B92C-6AFA08E4A417}.ReleaseJava|Win32.ActiveCfg = Release|Win32 {E74F29F0-FA43-4ADC-B92C-6AFA08E4A417}.ReleaseJava|x64.ActiveCfg = ReleaseOpenssl|x64 {E74F29F0-FA43-4ADC-B92C-6AFA08E4A417}.ReleaseOpenssl|Win32.ActiveCfg = ReleaseOpenssl|Win32 {E74F29F0-FA43-4ADC-B92C-6AFA08E4A417}.ReleaseOpenssl|Win32.Build.0 = ReleaseOpenssl|Win32 @@ -180,10 +163,6 @@ Global {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}.DebugCommercial|Win32.Build.0 = Debug|Win32 {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}.DebugCommercial|x64.ActiveCfg = Debug|x64 {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}.DebugCommercial|x64.Build.0 = Debug|x64 - {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}.DebugGProof|Win32.ActiveCfg = Debug|Win32 - {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}.DebugGProof|Win32.Build.0 = Debug|Win32 - {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}.DebugGProof|x64.ActiveCfg = Debug|x64 - {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}.DebugGProof|x64.Build.0 = Debug|x64 {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}.DebugJava|Win32.ActiveCfg = DebugJava|Win32 {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}.DebugJava|Win32.Build.0 = DebugJava|Win32 {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}.DebugJava|x64.ActiveCfg = DebugJava|x64 @@ -222,10 +201,6 @@ Global {5F615F91-DFF8-4F05-BF48-6222B7D86519}.DebugCommercial|Win32.Build.0 = DebugCommercial|Win32 {5F615F91-DFF8-4F05-BF48-6222B7D86519}.DebugCommercial|x64.ActiveCfg = DebugCommercial|x64 {5F615F91-DFF8-4F05-BF48-6222B7D86519}.DebugCommercial|x64.Build.0 = DebugCommercial|x64 - {5F615F91-DFF8-4F05-BF48-6222B7D86519}.DebugGProof|Win32.ActiveCfg = DebugGProof|Win32 - {5F615F91-DFF8-4F05-BF48-6222B7D86519}.DebugGProof|Win32.Build.0 = DebugGProof|Win32 - {5F615F91-DFF8-4F05-BF48-6222B7D86519}.DebugGProof|x64.ActiveCfg = DebugGProof|x64 - {5F615F91-DFF8-4F05-BF48-6222B7D86519}.DebugGProof|x64.Build.0 = DebugGProof|x64 {5F615F91-DFF8-4F05-BF48-6222B7D86519}.DebugJava|Win32.ActiveCfg = DebugJava|Win32 {5F615F91-DFF8-4F05-BF48-6222B7D86519}.DebugJava|Win32.Build.0 = DebugJava|Win32 {5F615F91-DFF8-4F05-BF48-6222B7D86519}.DebugJava|x64.ActiveCfg = DebugJava|x64 @@ -264,14 +239,9 @@ Global {0B51171B-B10E-4EAC-8FFA-19226A1828A3}.DebugCommercial|Win32.Build.0 = DebugCommercial|Win32 {0B51171B-B10E-4EAC-8FFA-19226A1828A3}.DebugCommercial|x64.ActiveCfg = DebugCommercial|x64 {0B51171B-B10E-4EAC-8FFA-19226A1828A3}.DebugCommercial|x64.Build.0 = DebugCommercial|x64 - {0B51171B-B10E-4EAC-8FFA-19226A1828A3}.DebugGProof|Win32.ActiveCfg = DebugGProof|Win32 - {0B51171B-B10E-4EAC-8FFA-19226A1828A3}.DebugGProof|Win32.Build.0 = DebugGProof|Win32 - {0B51171B-B10E-4EAC-8FFA-19226A1828A3}.DebugGProof|x64.ActiveCfg = DebugGProof|x64 - {0B51171B-B10E-4EAC-8FFA-19226A1828A3}.DebugGProof|x64.Build.0 = DebugGProof|x64 {0B51171B-B10E-4EAC-8FFA-19226A1828A3}.DebugJava|Win32.ActiveCfg = Debug|Win32 {0B51171B-B10E-4EAC-8FFA-19226A1828A3}.DebugJava|x64.ActiveCfg = Debug|x64 {0B51171B-B10E-4EAC-8FFA-19226A1828A3}.DebugOpenssl|Win32.ActiveCfg = Debug|Win32 - {0B51171B-B10E-4EAC-8FFA-19226A1828A3}.DebugOpenssl|Win32.Build.0 = Debug|Win32 {0B51171B-B10E-4EAC-8FFA-19226A1828A3}.DebugOpenssl|x64.ActiveCfg = Debug|x64 {0B51171B-B10E-4EAC-8FFA-19226A1828A3}.Memento|Win32.ActiveCfg = Memento|Win32 {0B51171B-B10E-4EAC-8FFA-19226A1828A3}.Memento|Win32.Build.0 = Memento|Win32 @@ -298,36 +268,32 @@ Global {00811970-815B-4F64-BC9D-219078B1F3AA}.Debug|Win32.Build.0 = Debug|Win32 {00811970-815B-4F64-BC9D-219078B1F3AA}.Debug|x64.ActiveCfg = Debug|x64 {00811970-815B-4F64-BC9D-219078B1F3AA}.Debug|x64.Build.0 = Debug|x64 - {00811970-815B-4F64-BC9D-219078B1F3AA}.DebugCommercial|Win32.ActiveCfg = DebugGProof|x64 - {00811970-815B-4F64-BC9D-219078B1F3AA}.DebugCommercial|x64.ActiveCfg = DebugGProof|x64 - {00811970-815B-4F64-BC9D-219078B1F3AA}.DebugCommercial|x64.Build.0 = DebugGProof|x64 - {00811970-815B-4F64-BC9D-219078B1F3AA}.DebugGProof|Win32.ActiveCfg = DebugGProof|Win32 - {00811970-815B-4F64-BC9D-219078B1F3AA}.DebugGProof|Win32.Build.0 = DebugGProof|Win32 - {00811970-815B-4F64-BC9D-219078B1F3AA}.DebugGProof|x64.ActiveCfg = DebugGProof|x64 - {00811970-815B-4F64-BC9D-219078B1F3AA}.DebugGProof|x64.Build.0 = DebugGProof|x64 + {00811970-815B-4F64-BC9D-219078B1F3AA}.DebugCommercial|Win32.ActiveCfg = DebugCommercial|Win32 + {00811970-815B-4F64-BC9D-219078B1F3AA}.DebugCommercial|Win32.Build.0 = DebugCommercial|Win32 + {00811970-815B-4F64-BC9D-219078B1F3AA}.DebugCommercial|x64.ActiveCfg = DebugCommercial|x64 + {00811970-815B-4F64-BC9D-219078B1F3AA}.DebugCommercial|x64.Build.0 = DebugCommercial|x64 {00811970-815B-4F64-BC9D-219078B1F3AA}.DebugJava|Win32.ActiveCfg = Debug|Win32 {00811970-815B-4F64-BC9D-219078B1F3AA}.DebugJava|x64.ActiveCfg = Debug|x64 {00811970-815B-4F64-BC9D-219078B1F3AA}.DebugOpenssl|Win32.ActiveCfg = Debug|Win32 - {00811970-815B-4F64-BC9D-219078B1F3AA}.DebugOpenssl|Win32.Build.0 = Debug|Win32 {00811970-815B-4F64-BC9D-219078B1F3AA}.DebugOpenssl|x64.ActiveCfg = Debug|x64 {00811970-815B-4F64-BC9D-219078B1F3AA}.Memento|Win32.ActiveCfg = Memento|Win32 {00811970-815B-4F64-BC9D-219078B1F3AA}.Memento|Win32.Build.0 = Memento|Win32 {00811970-815B-4F64-BC9D-219078B1F3AA}.Memento|x64.ActiveCfg = Memento|x64 {00811970-815B-4F64-BC9D-219078B1F3AA}.Memento|x64.Build.0 = Memento|x64 - {00811970-815B-4F64-BC9D-219078B1F3AA}.MementoCommercial|Win32.ActiveCfg = Memento|x64 - {00811970-815B-4F64-BC9D-219078B1F3AA}.MementoCommercial|x64.ActiveCfg = Memento|x64 - {00811970-815B-4F64-BC9D-219078B1F3AA}.MementoCommercial|x64.Build.0 = Memento|x64 + {00811970-815B-4F64-BC9D-219078B1F3AA}.MementoCommercial|Win32.ActiveCfg = Memento|Win32 + {00811970-815B-4F64-BC9D-219078B1F3AA}.MementoCommercial|x64.ActiveCfg = MementoCommercial|x64 + {00811970-815B-4F64-BC9D-219078B1F3AA}.MementoCommercial|x64.Build.0 = MementoCommercial|x64 {00811970-815B-4F64-BC9D-219078B1F3AA}.Release|Win32.ActiveCfg = Release|Win32 {00811970-815B-4F64-BC9D-219078B1F3AA}.Release|Win32.Build.0 = Release|Win32 {00811970-815B-4F64-BC9D-219078B1F3AA}.Release|x64.ActiveCfg = Release|x64 {00811970-815B-4F64-BC9D-219078B1F3AA}.Release|x64.Build.0 = Release|x64 - {00811970-815B-4F64-BC9D-219078B1F3AA}.ReleaseCommercial|Win32.ActiveCfg = Release|x64 - {00811970-815B-4F64-BC9D-219078B1F3AA}.ReleaseCommercial|x64.ActiveCfg = Release|x64 - {00811970-815B-4F64-BC9D-219078B1F3AA}.ReleaseCommercial|x64.Build.0 = Release|x64 + {00811970-815B-4F64-BC9D-219078B1F3AA}.ReleaseCommercial|Win32.ActiveCfg = ReleaseCommercial|Win32 + {00811970-815B-4F64-BC9D-219078B1F3AA}.ReleaseCommercial|Win32.Build.0 = ReleaseCommercial|Win32 + {00811970-815B-4F64-BC9D-219078B1F3AA}.ReleaseCommercial|x64.ActiveCfg = ReleaseCommercial|x64 + {00811970-815B-4F64-BC9D-219078B1F3AA}.ReleaseCommercial|x64.Build.0 = ReleaseCommercial|x64 {00811970-815B-4F64-BC9D-219078B1F3AA}.ReleaseJava|Win32.ActiveCfg = Release|Win32 {00811970-815B-4F64-BC9D-219078B1F3AA}.ReleaseJava|x64.ActiveCfg = Release|x64 {00811970-815B-4F64-BC9D-219078B1F3AA}.ReleaseOpenssl|Win32.ActiveCfg = Release|Win32 - {00811970-815B-4F64-BC9D-219078B1F3AA}.ReleaseOpenssl|Win32.Build.0 = Release|Win32 {00811970-815B-4F64-BC9D-219078B1F3AA}.ReleaseOpenssl|x64.ActiveCfg = Release|x64 {87EE9DA4-DE1E-4448-8324-183C98DCA588}.Debug|Win32.ActiveCfg = Debug|Win32 {87EE9DA4-DE1E-4448-8324-183C98DCA588}.Debug|Win32.Build.0 = Debug|Win32 @@ -337,10 +303,6 @@ Global {87EE9DA4-DE1E-4448-8324-183C98DCA588}.DebugCommercial|Win32.Build.0 = Debug|Win32 {87EE9DA4-DE1E-4448-8324-183C98DCA588}.DebugCommercial|x64.ActiveCfg = Debug|x64 {87EE9DA4-DE1E-4448-8324-183C98DCA588}.DebugCommercial|x64.Build.0 = Debug|x64 - {87EE9DA4-DE1E-4448-8324-183C98DCA588}.DebugGProof|Win32.ActiveCfg = Debug|Win32 - {87EE9DA4-DE1E-4448-8324-183C98DCA588}.DebugGProof|Win32.Build.0 = Debug|Win32 - {87EE9DA4-DE1E-4448-8324-183C98DCA588}.DebugGProof|x64.ActiveCfg = Debug|x64 - {87EE9DA4-DE1E-4448-8324-183C98DCA588}.DebugGProof|x64.Build.0 = Debug|x64 {87EE9DA4-DE1E-4448-8324-183C98DCA588}.DebugJava|Win32.ActiveCfg = Debug|Win32 {87EE9DA4-DE1E-4448-8324-183C98DCA588}.DebugJava|x64.ActiveCfg = Debug|x64 {87EE9DA4-DE1E-4448-8324-183C98DCA588}.DebugOpenssl|Win32.ActiveCfg = Debug|Win32 @@ -373,8 +335,7 @@ Global {27B53E5C-ACAB-423C-854E-BECE56D73544}.DebugCommercial|Win32.ActiveCfg = DebugCommercial|Win32 {27B53E5C-ACAB-423C-854E-BECE56D73544}.DebugCommercial|Win32.Build.0 = DebugCommercial|Win32 {27B53E5C-ACAB-423C-854E-BECE56D73544}.DebugCommercial|x64.ActiveCfg = DebugCommercial|x64 - {27B53E5C-ACAB-423C-854E-BECE56D73544}.DebugGProof|Win32.ActiveCfg = Debug|Win32 - {27B53E5C-ACAB-423C-854E-BECE56D73544}.DebugGProof|x64.ActiveCfg = Debug|x64 + {27B53E5C-ACAB-423C-854E-BECE56D73544}.DebugCommercial|x64.Build.0 = DebugCommercial|x64 {27B53E5C-ACAB-423C-854E-BECE56D73544}.DebugJava|Win32.ActiveCfg = Debug|Win32 {27B53E5C-ACAB-423C-854E-BECE56D73544}.DebugJava|x64.ActiveCfg = Debug|x64 {27B53E5C-ACAB-423C-854E-BECE56D73544}.DebugOpenssl|Win32.ActiveCfg = DebugOpenssl|Win32 @@ -383,6 +344,7 @@ Global {27B53E5C-ACAB-423C-854E-BECE56D73544}.Memento|Win32.ActiveCfg = Memento|Win32 {27B53E5C-ACAB-423C-854E-BECE56D73544}.Memento|Win32.Build.0 = Memento|Win32 {27B53E5C-ACAB-423C-854E-BECE56D73544}.Memento|x64.ActiveCfg = Memento|x64 + {27B53E5C-ACAB-423C-854E-BECE56D73544}.Memento|x64.Build.0 = Memento|x64 {27B53E5C-ACAB-423C-854E-BECE56D73544}.MementoCommercial|Win32.ActiveCfg = MementoCommercial|Win32 {27B53E5C-ACAB-423C-854E-BECE56D73544}.MementoCommercial|Win32.Build.0 = MementoCommercial|Win32 {27B53E5C-ACAB-423C-854E-BECE56D73544}.MementoCommercial|x64.ActiveCfg = MementoCommercial|x64 @@ -390,10 +352,12 @@ Global {27B53E5C-ACAB-423C-854E-BECE56D73544}.Release|Win32.ActiveCfg = Release|Win32 {27B53E5C-ACAB-423C-854E-BECE56D73544}.Release|Win32.Build.0 = Release|Win32 {27B53E5C-ACAB-423C-854E-BECE56D73544}.Release|x64.ActiveCfg = Release|x64 + {27B53E5C-ACAB-423C-854E-BECE56D73544}.Release|x64.Build.0 = Release|x64 {27B53E5C-ACAB-423C-854E-BECE56D73544}.ReleaseCommercial|Win32.ActiveCfg = ReleaseCommercial|Win32 {27B53E5C-ACAB-423C-854E-BECE56D73544}.ReleaseCommercial|Win32.Build.0 = ReleaseCommercial|Win32 {27B53E5C-ACAB-423C-854E-BECE56D73544}.ReleaseCommercial|x64.ActiveCfg = ReleaseCommercial|x64 - {27B53E5C-ACAB-423C-854E-BECE56D73544}.ReleaseJava|Win32.ActiveCfg = ReleaseOpenssl|Win32 + {27B53E5C-ACAB-423C-854E-BECE56D73544}.ReleaseCommercial|x64.Build.0 = ReleaseCommercial|x64 + {27B53E5C-ACAB-423C-854E-BECE56D73544}.ReleaseJava|Win32.ActiveCfg = Release|Win32 {27B53E5C-ACAB-423C-854E-BECE56D73544}.ReleaseJava|x64.ActiveCfg = ReleaseOpenssl|x64 {27B53E5C-ACAB-423C-854E-BECE56D73544}.ReleaseOpenssl|Win32.ActiveCfg = ReleaseOpenssl|Win32 {27B53E5C-ACAB-423C-854E-BECE56D73544}.ReleaseOpenssl|Win32.Build.0 = ReleaseOpenssl|Win32 @@ -406,8 +370,6 @@ Global {21E28758-E4D2-4B84-8EC5-B631CEE66B30}.DebugCommercial|Win32.Build.0 = DebugCommercial|Win32 {21E28758-E4D2-4B84-8EC5-B631CEE66B30}.DebugCommercial|x64.ActiveCfg = DebugCommercial|x64 {21E28758-E4D2-4B84-8EC5-B631CEE66B30}.DebugCommercial|x64.Build.0 = DebugCommercial|x64 - {21E28758-E4D2-4B84-8EC5-B631CEE66B30}.DebugGProof|Win32.ActiveCfg = Debug|Win32 - {21E28758-E4D2-4B84-8EC5-B631CEE66B30}.DebugGProof|x64.ActiveCfg = Debug|x64 {21E28758-E4D2-4B84-8EC5-B631CEE66B30}.DebugJava|Win32.ActiveCfg = Debug|Win32 {21E28758-E4D2-4B84-8EC5-B631CEE66B30}.DebugJava|x64.ActiveCfg = Debug|x64 {21E28758-E4D2-4B84-8EC5-B631CEE66B30}.DebugOpenssl|Win32.ActiveCfg = DebugOpenssl|Win32 @@ -429,8 +391,8 @@ Global {21E28758-E4D2-4B84-8EC5-B631CEE66B30}.ReleaseCommercial|Win32.Build.0 = ReleaseCommercial|Win32 {21E28758-E4D2-4B84-8EC5-B631CEE66B30}.ReleaseCommercial|x64.ActiveCfg = ReleaseCommercial|x64 {21E28758-E4D2-4B84-8EC5-B631CEE66B30}.ReleaseCommercial|x64.Build.0 = ReleaseCommercial|x64 - {21E28758-E4D2-4B84-8EC5-B631CEE66B30}.ReleaseJava|Win32.ActiveCfg = ReleaseOpenssl|Win32 - {21E28758-E4D2-4B84-8EC5-B631CEE66B30}.ReleaseJava|x64.ActiveCfg = ReleaseOpenssl|x64 + {21E28758-E4D2-4B84-8EC5-B631CEE66B30}.ReleaseJava|Win32.ActiveCfg = Release|Win32 + {21E28758-E4D2-4B84-8EC5-B631CEE66B30}.ReleaseJava|x64.ActiveCfg = Release|x64 {21E28758-E4D2-4B84-8EC5-B631CEE66B30}.ReleaseOpenssl|Win32.ActiveCfg = ReleaseOpenssl|Win32 {21E28758-E4D2-4B84-8EC5-B631CEE66B30}.ReleaseOpenssl|Win32.Build.0 = ReleaseOpenssl|Win32 {21E28758-E4D2-4B84-8EC5-B631CEE66B30}.ReleaseOpenssl|x64.ActiveCfg = ReleaseOpenssl|x64 @@ -442,10 +404,6 @@ Global {A1B75D29-9F5C-4A0F-B368-322A10477D0C}.DebugCommercial|Win32.Build.0 = Debug|Win32 {A1B75D29-9F5C-4A0F-B368-322A10477D0C}.DebugCommercial|x64.ActiveCfg = Debug|x64 {A1B75D29-9F5C-4A0F-B368-322A10477D0C}.DebugCommercial|x64.Build.0 = Debug|x64 - {A1B75D29-9F5C-4A0F-B368-322A10477D0C}.DebugGProof|Win32.ActiveCfg = Debug|Win32 - {A1B75D29-9F5C-4A0F-B368-322A10477D0C}.DebugGProof|Win32.Build.0 = Debug|Win32 - {A1B75D29-9F5C-4A0F-B368-322A10477D0C}.DebugGProof|x64.ActiveCfg = Debug|x64 - {A1B75D29-9F5C-4A0F-B368-322A10477D0C}.DebugGProof|x64.Build.0 = Debug|x64 {A1B75D29-9F5C-4A0F-B368-322A10477D0C}.DebugJava|Win32.ActiveCfg = Debug|Win32 {A1B75D29-9F5C-4A0F-B368-322A10477D0C}.DebugJava|x64.ActiveCfg = Debug|x64 {A1B75D29-9F5C-4A0F-B368-322A10477D0C}.DebugOpenssl|Win32.ActiveCfg = Debug|Win32 @@ -480,12 +438,9 @@ Global {CE3A76A8-A28F-4991-8FB9-C9453D922037}.DebugCommercial|Win32.Build.0 = DebugCommercial|Win32 {CE3A76A8-A28F-4991-8FB9-C9453D922037}.DebugCommercial|x64.ActiveCfg = DebugCommercial|x64 {CE3A76A8-A28F-4991-8FB9-C9453D922037}.DebugCommercial|x64.Build.0 = DebugCommercial|x64 - {CE3A76A8-A28F-4991-8FB9-C9453D922037}.DebugGProof|Win32.ActiveCfg = Debug|Win32 - {CE3A76A8-A28F-4991-8FB9-C9453D922037}.DebugGProof|x64.ActiveCfg = Debug|x64 {CE3A76A8-A28F-4991-8FB9-C9453D922037}.DebugJava|Win32.ActiveCfg = Debug|Win32 {CE3A76A8-A28F-4991-8FB9-C9453D922037}.DebugJava|x64.ActiveCfg = Debug|x64 {CE3A76A8-A28F-4991-8FB9-C9453D922037}.DebugOpenssl|Win32.ActiveCfg = Debug|Win32 - {CE3A76A8-A28F-4991-8FB9-C9453D922037}.DebugOpenssl|Win32.Build.0 = Debug|Win32 {CE3A76A8-A28F-4991-8FB9-C9453D922037}.DebugOpenssl|x64.ActiveCfg = Debug|x64 {CE3A76A8-A28F-4991-8FB9-C9453D922037}.Memento|Win32.ActiveCfg = Memento|Win32 {CE3A76A8-A28F-4991-8FB9-C9453D922037}.Memento|Win32.Build.0 = Memento|Win32 @@ -506,7 +461,6 @@ Global {CE3A76A8-A28F-4991-8FB9-C9453D922037}.ReleaseJava|Win32.ActiveCfg = Release|Win32 {CE3A76A8-A28F-4991-8FB9-C9453D922037}.ReleaseJava|x64.ActiveCfg = Release|x64 {CE3A76A8-A28F-4991-8FB9-C9453D922037}.ReleaseOpenssl|Win32.ActiveCfg = Release|Win32 - {CE3A76A8-A28F-4991-8FB9-C9453D922037}.ReleaseOpenssl|Win32.Build.0 = Release|Win32 {CE3A76A8-A28F-4991-8FB9-C9453D922037}.ReleaseOpenssl|x64.ActiveCfg = Release|x64 {52DCAB29-C8EE-4422-954C-29AFA6B33E22}.Debug|Win32.ActiveCfg = Release|Win32 {52DCAB29-C8EE-4422-954C-29AFA6B33E22}.Debug|Win32.Build.0 = Release|Win32 @@ -516,16 +470,15 @@ Global {52DCAB29-C8EE-4422-954C-29AFA6B33E22}.DebugCommercial|Win32.Build.0 = Release|Win32 {52DCAB29-C8EE-4422-954C-29AFA6B33E22}.DebugCommercial|x64.ActiveCfg = Release|x64 {52DCAB29-C8EE-4422-954C-29AFA6B33E22}.DebugCommercial|x64.Build.0 = Release|x64 - {52DCAB29-C8EE-4422-954C-29AFA6B33E22}.DebugGProof|Win32.ActiveCfg = Release|Win32 - {52DCAB29-C8EE-4422-954C-29AFA6B33E22}.DebugGProof|x64.ActiveCfg = Release|x64 - {52DCAB29-C8EE-4422-954C-29AFA6B33E22}.DebugGProof|x64.Build.0 = Release|x64 {52DCAB29-C8EE-4422-954C-29AFA6B33E22}.DebugJava|Win32.ActiveCfg = Release|Win32 {52DCAB29-C8EE-4422-954C-29AFA6B33E22}.DebugJava|Win32.Build.0 = Release|Win32 {52DCAB29-C8EE-4422-954C-29AFA6B33E22}.DebugJava|x64.ActiveCfg = Release|x64 {52DCAB29-C8EE-4422-954C-29AFA6B33E22}.DebugJava|x64.Build.0 = Release|x64 {52DCAB29-C8EE-4422-954C-29AFA6B33E22}.DebugOpenssl|Win32.ActiveCfg = Release|Win32 + {52DCAB29-C8EE-4422-954C-29AFA6B33E22}.DebugOpenssl|Win32.Build.0 = Release|Win32 {52DCAB29-C8EE-4422-954C-29AFA6B33E22}.DebugOpenssl|x64.ActiveCfg = Release|x64 {52DCAB29-C8EE-4422-954C-29AFA6B33E22}.Memento|Win32.ActiveCfg = Release|Win32 + {52DCAB29-C8EE-4422-954C-29AFA6B33E22}.Memento|Win32.Build.0 = Release|Win32 {52DCAB29-C8EE-4422-954C-29AFA6B33E22}.Memento|x64.ActiveCfg = Release|x64 {52DCAB29-C8EE-4422-954C-29AFA6B33E22}.Memento|x64.Build.0 = Release|x64 {52DCAB29-C8EE-4422-954C-29AFA6B33E22}.MementoCommercial|Win32.ActiveCfg = Release|Win32 @@ -554,11 +507,9 @@ Global {0FDC74D7-D18C-45CE-94D6-EDFCC5A0CDF2}.DebugCommercial|Win32.Build.0 = DebugCommercial|Win32 {0FDC74D7-D18C-45CE-94D6-EDFCC5A0CDF2}.DebugCommercial|x64.ActiveCfg = DebugCommercial|x64 {0FDC74D7-D18C-45CE-94D6-EDFCC5A0CDF2}.DebugCommercial|x64.Build.0 = DebugCommercial|x64 - {0FDC74D7-D18C-45CE-94D6-EDFCC5A0CDF2}.DebugGProof|Win32.ActiveCfg = Debug|Win32 - {0FDC74D7-D18C-45CE-94D6-EDFCC5A0CDF2}.DebugGProof|x64.ActiveCfg = Debug|x64 {0FDC74D7-D18C-45CE-94D6-EDFCC5A0CDF2}.DebugJava|Win32.ActiveCfg = Debug|Win32 {0FDC74D7-D18C-45CE-94D6-EDFCC5A0CDF2}.DebugJava|x64.ActiveCfg = Debug|x64 - {0FDC74D7-D18C-45CE-94D6-EDFCC5A0CDF2}.DebugOpenssl|Win32.ActiveCfg = Debug|x64 + {0FDC74D7-D18C-45CE-94D6-EDFCC5A0CDF2}.DebugOpenssl|Win32.ActiveCfg = Debug|Win32 {0FDC74D7-D18C-45CE-94D6-EDFCC5A0CDF2}.DebugOpenssl|x64.ActiveCfg = Debug|x64 {0FDC74D7-D18C-45CE-94D6-EDFCC5A0CDF2}.Memento|Win32.ActiveCfg = Memento|Win32 {0FDC74D7-D18C-45CE-94D6-EDFCC5A0CDF2}.Memento|Win32.Build.0 = Memento|Win32 @@ -578,20 +529,18 @@ Global {0FDC74D7-D18C-45CE-94D6-EDFCC5A0CDF2}.ReleaseCommercial|x64.Build.0 = ReleaseCommercial|x64 {0FDC74D7-D18C-45CE-94D6-EDFCC5A0CDF2}.ReleaseJava|Win32.ActiveCfg = Release|Win32 {0FDC74D7-D18C-45CE-94D6-EDFCC5A0CDF2}.ReleaseJava|x64.ActiveCfg = Release|x64 - {0FDC74D7-D18C-45CE-94D6-EDFCC5A0CDF2}.ReleaseOpenssl|Win32.ActiveCfg = Release|x64 + {0FDC74D7-D18C-45CE-94D6-EDFCC5A0CDF2}.ReleaseOpenssl|Win32.ActiveCfg = Release|Win32 {0FDC74D7-D18C-45CE-94D6-EDFCC5A0CDF2}.ReleaseOpenssl|x64.ActiveCfg = Release|x64 {3DB35F2D-9679-4DED-BA0C-240A4E6E6674}.Debug|Win32.ActiveCfg = DebugJava|Win32 {3DB35F2D-9679-4DED-BA0C-240A4E6E6674}.Debug|x64.ActiveCfg = DebugJava|Win32 {3DB35F2D-9679-4DED-BA0C-240A4E6E6674}.DebugCommercial|Win32.ActiveCfg = DebugJava|Win32 {3DB35F2D-9679-4DED-BA0C-240A4E6E6674}.DebugCommercial|x64.ActiveCfg = DebugJava|Win32 - {3DB35F2D-9679-4DED-BA0C-240A4E6E6674}.DebugGProof|Win32.ActiveCfg = DebugJava|Win32 - {3DB35F2D-9679-4DED-BA0C-240A4E6E6674}.DebugGProof|x64.ActiveCfg = DebugJava|Win32 {3DB35F2D-9679-4DED-BA0C-240A4E6E6674}.DebugJava|Win32.ActiveCfg = DebugJava|Win32 {3DB35F2D-9679-4DED-BA0C-240A4E6E6674}.DebugJava|Win32.Build.0 = DebugJava|Win32 {3DB35F2D-9679-4DED-BA0C-240A4E6E6674}.DebugJava|x64.ActiveCfg = DebugJava|x64 {3DB35F2D-9679-4DED-BA0C-240A4E6E6674}.DebugJava|x64.Build.0 = DebugJava|x64 {3DB35F2D-9679-4DED-BA0C-240A4E6E6674}.DebugOpenssl|Win32.ActiveCfg = DebugJava|Win32 - {3DB35F2D-9679-4DED-BA0C-240A4E6E6674}.DebugOpenssl|x64.ActiveCfg = DebugJava|Win32 + {3DB35F2D-9679-4DED-BA0C-240A4E6E6674}.DebugOpenssl|x64.ActiveCfg = DebugJava|x64 {3DB35F2D-9679-4DED-BA0C-240A4E6E6674}.Memento|Win32.ActiveCfg = DebugJava|Win32 {3DB35F2D-9679-4DED-BA0C-240A4E6E6674}.Memento|x64.ActiveCfg = DebugJava|Win32 {3DB35F2D-9679-4DED-BA0C-240A4E6E6674}.MementoCommercial|Win32.ActiveCfg = ReleaseJava|Win32 @@ -610,14 +559,12 @@ Global {FB8DC595-90A5-44D6-9FFF-2BDFA912FD8C}.Debug|x64.ActiveCfg = DebugJava|Win32 {FB8DC595-90A5-44D6-9FFF-2BDFA912FD8C}.DebugCommercial|Win32.ActiveCfg = DebugJava|Win32 {FB8DC595-90A5-44D6-9FFF-2BDFA912FD8C}.DebugCommercial|x64.ActiveCfg = DebugJava|Win32 - {FB8DC595-90A5-44D6-9FFF-2BDFA912FD8C}.DebugGProof|Win32.ActiveCfg = DebugJava|Win32 - {FB8DC595-90A5-44D6-9FFF-2BDFA912FD8C}.DebugGProof|x64.ActiveCfg = DebugJava|Win32 {FB8DC595-90A5-44D6-9FFF-2BDFA912FD8C}.DebugJava|Win32.ActiveCfg = DebugJava|Win32 - {FB8DC595-90A5-44D6-9FFF-2BDFA912FD8C}.DebugJava|x64.ActiveCfg = DebugJava|Win32 + {FB8DC595-90A5-44D6-9FFF-2BDFA912FD8C}.DebugJava|x64.ActiveCfg = DebugJava|x64 {FB8DC595-90A5-44D6-9FFF-2BDFA912FD8C}.DebugOpenssl|Win32.ActiveCfg = DebugJava|Win32 - {FB8DC595-90A5-44D6-9FFF-2BDFA912FD8C}.DebugOpenssl|x64.ActiveCfg = DebugJava|Win32 + {FB8DC595-90A5-44D6-9FFF-2BDFA912FD8C}.DebugOpenssl|x64.ActiveCfg = DebugJava|x64 {FB8DC595-90A5-44D6-9FFF-2BDFA912FD8C}.Memento|Win32.ActiveCfg = ReleaseJava|Win32 - {FB8DC595-90A5-44D6-9FFF-2BDFA912FD8C}.Memento|x64.ActiveCfg = ReleaseJava|Win32 + {FB8DC595-90A5-44D6-9FFF-2BDFA912FD8C}.Memento|x64.ActiveCfg = DebugJava|Win32 {FB8DC595-90A5-44D6-9FFF-2BDFA912FD8C}.MementoCommercial|Win32.ActiveCfg = ReleaseJava|Win32 {FB8DC595-90A5-44D6-9FFF-2BDFA912FD8C}.MementoCommercial|x64.ActiveCfg = ReleaseJava|Win32 {FB8DC595-90A5-44D6-9FFF-2BDFA912FD8C}.Release|Win32.ActiveCfg = ReleaseJava|Win32 @@ -628,160 +575,132 @@ Global {FB8DC595-90A5-44D6-9FFF-2BDFA912FD8C}.ReleaseJava|x64.ActiveCfg = ReleaseJava|Win32 {FB8DC595-90A5-44D6-9FFF-2BDFA912FD8C}.ReleaseOpenssl|Win32.ActiveCfg = ReleaseJava|Win32 {FB8DC595-90A5-44D6-9FFF-2BDFA912FD8C}.ReleaseOpenssl|x64.ActiveCfg = ReleaseJava|Win32 - {B0091365-C9BA-4F40-AE2B-EF93702871B2}.Debug|Win32.ActiveCfg = DebugCommercial|x64 + {B0091365-C9BA-4F40-AE2B-EF93702871B2}.Debug|Win32.ActiveCfg = DebugCommercial|Win32 {B0091365-C9BA-4F40-AE2B-EF93702871B2}.Debug|x64.ActiveCfg = DebugCommercial|x64 - {B0091365-C9BA-4F40-AE2B-EF93702871B2}.Debug|x64.Build.0 = DebugCommercial|x64 {B0091365-C9BA-4F40-AE2B-EF93702871B2}.DebugCommercial|Win32.ActiveCfg = DebugCommercial|Win32 {B0091365-C9BA-4F40-AE2B-EF93702871B2}.DebugCommercial|Win32.Build.0 = DebugCommercial|Win32 {B0091365-C9BA-4F40-AE2B-EF93702871B2}.DebugCommercial|x64.ActiveCfg = DebugCommercial|x64 {B0091365-C9BA-4F40-AE2B-EF93702871B2}.DebugCommercial|x64.Build.0 = DebugCommercial|x64 - {B0091365-C9BA-4F40-AE2B-EF93702871B2}.DebugGProof|Win32.ActiveCfg = DebugCommercial|x64 - {B0091365-C9BA-4F40-AE2B-EF93702871B2}.DebugGProof|x64.ActiveCfg = DebugCommercial|x64 - {B0091365-C9BA-4F40-AE2B-EF93702871B2}.DebugGProof|x64.Build.0 = DebugCommercial|x64 - {B0091365-C9BA-4F40-AE2B-EF93702871B2}.DebugJava|Win32.ActiveCfg = DebugCommercial|x64 + {B0091365-C9BA-4F40-AE2B-EF93702871B2}.DebugJava|Win32.ActiveCfg = DebugCommercial|Win32 {B0091365-C9BA-4F40-AE2B-EF93702871B2}.DebugJava|x64.ActiveCfg = DebugCommercial|x64 - {B0091365-C9BA-4F40-AE2B-EF93702871B2}.DebugJava|x64.Build.0 = DebugCommercial|x64 - {B0091365-C9BA-4F40-AE2B-EF93702871B2}.DebugOpenssl|Win32.ActiveCfg = DebugCommercial|x64 + {B0091365-C9BA-4F40-AE2B-EF93702871B2}.DebugOpenssl|Win32.ActiveCfg = DebugCommercial|Win32 {B0091365-C9BA-4F40-AE2B-EF93702871B2}.DebugOpenssl|x64.ActiveCfg = DebugCommercial|x64 - {B0091365-C9BA-4F40-AE2B-EF93702871B2}.DebugOpenssl|x64.Build.0 = DebugCommercial|x64 - {B0091365-C9BA-4F40-AE2B-EF93702871B2}.Memento|Win32.ActiveCfg = MementoCommercial|x64 + {B0091365-C9BA-4F40-AE2B-EF93702871B2}.Memento|Win32.ActiveCfg = MementoCommercial|Win32 {B0091365-C9BA-4F40-AE2B-EF93702871B2}.Memento|x64.ActiveCfg = MementoCommercial|x64 {B0091365-C9BA-4F40-AE2B-EF93702871B2}.Memento|x64.Build.0 = MementoCommercial|x64 {B0091365-C9BA-4F40-AE2B-EF93702871B2}.MementoCommercial|Win32.ActiveCfg = MementoCommercial|Win32 {B0091365-C9BA-4F40-AE2B-EF93702871B2}.MementoCommercial|Win32.Build.0 = MementoCommercial|Win32 {B0091365-C9BA-4F40-AE2B-EF93702871B2}.MementoCommercial|x64.ActiveCfg = MementoCommercial|x64 {B0091365-C9BA-4F40-AE2B-EF93702871B2}.MementoCommercial|x64.Build.0 = MementoCommercial|x64 - {B0091365-C9BA-4F40-AE2B-EF93702871B2}.Release|Win32.ActiveCfg = ReleaseCommercial|x64 + {B0091365-C9BA-4F40-AE2B-EF93702871B2}.Release|Win32.ActiveCfg = ReleaseCommercial|Win32 {B0091365-C9BA-4F40-AE2B-EF93702871B2}.Release|x64.ActiveCfg = ReleaseCommercial|x64 {B0091365-C9BA-4F40-AE2B-EF93702871B2}.Release|x64.Build.0 = ReleaseCommercial|x64 {B0091365-C9BA-4F40-AE2B-EF93702871B2}.ReleaseCommercial|Win32.ActiveCfg = ReleaseCommercial|Win32 {B0091365-C9BA-4F40-AE2B-EF93702871B2}.ReleaseCommercial|Win32.Build.0 = ReleaseCommercial|Win32 {B0091365-C9BA-4F40-AE2B-EF93702871B2}.ReleaseCommercial|x64.ActiveCfg = ReleaseCommercial|x64 {B0091365-C9BA-4F40-AE2B-EF93702871B2}.ReleaseCommercial|x64.Build.0 = ReleaseCommercial|x64 - {B0091365-C9BA-4F40-AE2B-EF93702871B2}.ReleaseJava|Win32.ActiveCfg = ReleaseCommercial|x64 + {B0091365-C9BA-4F40-AE2B-EF93702871B2}.ReleaseJava|Win32.ActiveCfg = ReleaseCommercial|Win32 {B0091365-C9BA-4F40-AE2B-EF93702871B2}.ReleaseJava|x64.ActiveCfg = ReleaseCommercial|x64 - {B0091365-C9BA-4F40-AE2B-EF93702871B2}.ReleaseJava|x64.Build.0 = ReleaseCommercial|x64 - {B0091365-C9BA-4F40-AE2B-EF93702871B2}.ReleaseOpenssl|Win32.ActiveCfg = ReleaseCommercial|x64 + {B0091365-C9BA-4F40-AE2B-EF93702871B2}.ReleaseOpenssl|Win32.ActiveCfg = ReleaseCommercial|Win32 {B0091365-C9BA-4F40-AE2B-EF93702871B2}.ReleaseOpenssl|x64.ActiveCfg = ReleaseCommercial|x64 - {B0091365-C9BA-4F40-AE2B-EF93702871B2}.ReleaseOpenssl|x64.Build.0 = ReleaseCommercial|x64 {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B}.Debug|Win32.ActiveCfg = Debug|Win32 {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B}.Debug|Win32.Build.0 = Debug|Win32 {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B}.Debug|x64.ActiveCfg = Debug|x64 {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B}.Debug|x64.Build.0 = Debug|x64 - {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B}.DebugCommercial|Win32.ActiveCfg = DebugCommercial|Win32 - {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B}.DebugCommercial|Win32.Build.0 = DebugCommercial|Win32 - {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B}.DebugCommercial|x64.ActiveCfg = DebugCommercial|x64 - {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B}.DebugCommercial|x64.Build.0 = DebugCommercial|x64 - {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B}.DebugGProof|Win32.ActiveCfg = DebugCommercial|x64 - {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B}.DebugGProof|x64.ActiveCfg = DebugCommercial|x64 - {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B}.DebugGProof|x64.Build.0 = DebugCommercial|x64 - {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B}.DebugJava|Win32.ActiveCfg = DebugCommercial|x64 - {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B}.DebugJava|x64.ActiveCfg = DebugCommercial|x64 - {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B}.DebugJava|x64.Build.0 = DebugCommercial|x64 - {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B}.DebugOpenssl|Win32.ActiveCfg = DebugCommercial|x64 - {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B}.DebugOpenssl|x64.ActiveCfg = DebugCommercial|x64 - {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B}.DebugOpenssl|x64.Build.0 = DebugCommercial|x64 + {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B}.DebugCommercial|Win32.ActiveCfg = Debug|Win32 + {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B}.DebugCommercial|Win32.Build.0 = Debug|Win32 + {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B}.DebugCommercial|x64.ActiveCfg = Debug|x64 + {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B}.DebugCommercial|x64.Build.0 = Debug|x64 + {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B}.DebugJava|Win32.ActiveCfg = DebugCommercial|Win32 + {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B}.DebugJava|x64.ActiveCfg = Debug|x64 + {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B}.DebugOpenssl|Win32.ActiveCfg = Debug|Win32 + {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B}.DebugOpenssl|Win32.Build.0 = Debug|Win32 + {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B}.DebugOpenssl|x64.ActiveCfg = Debug|x64 {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B}.Memento|Win32.ActiveCfg = Memento|Win32 {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B}.Memento|Win32.Build.0 = Memento|Win32 {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B}.Memento|x64.ActiveCfg = Memento|x64 {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B}.Memento|x64.Build.0 = Memento|x64 - {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B}.MementoCommercial|Win32.ActiveCfg = MementoCommercial|Win32 - {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B}.MementoCommercial|Win32.Build.0 = MementoCommercial|Win32 - {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B}.MementoCommercial|x64.ActiveCfg = MementoCommercial|x64 - {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B}.MementoCommercial|x64.Build.0 = MementoCommercial|x64 + {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B}.MementoCommercial|Win32.ActiveCfg = Memento|Win32 + {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B}.MementoCommercial|Win32.Build.0 = Memento|Win32 + {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B}.MementoCommercial|x64.ActiveCfg = Memento|x64 + {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B}.MementoCommercial|x64.Build.0 = Memento|x64 {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B}.Release|Win32.ActiveCfg = Release|Win32 {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B}.Release|Win32.Build.0 = Release|Win32 {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B}.Release|x64.ActiveCfg = Release|x64 {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B}.Release|x64.Build.0 = Release|x64 - {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B}.ReleaseCommercial|Win32.ActiveCfg = ReleaseCommercial|Win32 - {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B}.ReleaseCommercial|Win32.Build.0 = ReleaseCommercial|Win32 - {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B}.ReleaseCommercial|x64.ActiveCfg = ReleaseCommercial|x64 - {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B}.ReleaseCommercial|x64.Build.0 = ReleaseCommercial|x64 - {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B}.ReleaseJava|Win32.ActiveCfg = ReleaseCommercial|x64 - {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B}.ReleaseJava|x64.ActiveCfg = ReleaseCommercial|x64 - {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B}.ReleaseJava|x64.Build.0 = ReleaseCommercial|x64 - {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B}.ReleaseOpenssl|Win32.ActiveCfg = ReleaseCommercial|x64 - {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B}.ReleaseOpenssl|x64.ActiveCfg = ReleaseCommercial|x64 - {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B}.ReleaseOpenssl|x64.Build.0 = ReleaseCommercial|x64 + {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B}.ReleaseCommercial|Win32.ActiveCfg = Release|Win32 + {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B}.ReleaseCommercial|Win32.Build.0 = Release|Win32 + {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B}.ReleaseCommercial|x64.ActiveCfg = Release|x64 + {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B}.ReleaseCommercial|x64.Build.0 = Release|x64 + {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B}.ReleaseJava|Win32.ActiveCfg = Release|Win32 + {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B}.ReleaseJava|x64.ActiveCfg = Release|x64 + {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B}.ReleaseOpenssl|Win32.ActiveCfg = Release|Win32 + {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B}.ReleaseOpenssl|Win32.Build.0 = Release|Win32 + {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B}.ReleaseOpenssl|x64.ActiveCfg = Release|x64 {FFF91365-C9BA-4F40-AE2B-EF93702871B2}.Debug|Win32.ActiveCfg = Debug|Win32 {FFF91365-C9BA-4F40-AE2B-EF93702871B2}.Debug|Win32.Build.0 = Debug|Win32 {FFF91365-C9BA-4F40-AE2B-EF93702871B2}.Debug|x64.ActiveCfg = Debug|x64 {FFF91365-C9BA-4F40-AE2B-EF93702871B2}.Debug|x64.Build.0 = Debug|x64 - {FFF91365-C9BA-4F40-AE2B-EF93702871B2}.DebugCommercial|Win32.ActiveCfg = DebugCommercial|Win32 - {FFF91365-C9BA-4F40-AE2B-EF93702871B2}.DebugCommercial|Win32.Build.0 = DebugCommercial|Win32 - {FFF91365-C9BA-4F40-AE2B-EF93702871B2}.DebugCommercial|x64.ActiveCfg = DebugCommercial|x64 - {FFF91365-C9BA-4F40-AE2B-EF93702871B2}.DebugCommercial|x64.Build.0 = DebugCommercial|x64 - {FFF91365-C9BA-4F40-AE2B-EF93702871B2}.DebugGProof|Win32.ActiveCfg = DebugCommercial|x64 - {FFF91365-C9BA-4F40-AE2B-EF93702871B2}.DebugGProof|x64.ActiveCfg = DebugCommercial|x64 - {FFF91365-C9BA-4F40-AE2B-EF93702871B2}.DebugGProof|x64.Build.0 = DebugCommercial|x64 - {FFF91365-C9BA-4F40-AE2B-EF93702871B2}.DebugJava|Win32.ActiveCfg = DebugCommercial|x64 - {FFF91365-C9BA-4F40-AE2B-EF93702871B2}.DebugJava|x64.ActiveCfg = DebugCommercial|x64 - {FFF91365-C9BA-4F40-AE2B-EF93702871B2}.DebugJava|x64.Build.0 = DebugCommercial|x64 - {FFF91365-C9BA-4F40-AE2B-EF93702871B2}.DebugOpenssl|Win32.ActiveCfg = DebugCommercial|x64 - {FFF91365-C9BA-4F40-AE2B-EF93702871B2}.DebugOpenssl|x64.ActiveCfg = DebugCommercial|x64 - {FFF91365-C9BA-4F40-AE2B-EF93702871B2}.DebugOpenssl|x64.Build.0 = DebugCommercial|x64 + {FFF91365-C9BA-4F40-AE2B-EF93702871B2}.DebugCommercial|Win32.ActiveCfg = Debug|Win32 + {FFF91365-C9BA-4F40-AE2B-EF93702871B2}.DebugCommercial|Win32.Build.0 = Debug|Win32 + {FFF91365-C9BA-4F40-AE2B-EF93702871B2}.DebugCommercial|x64.ActiveCfg = Debug|x64 + {FFF91365-C9BA-4F40-AE2B-EF93702871B2}.DebugCommercial|x64.Build.0 = Debug|x64 + {FFF91365-C9BA-4F40-AE2B-EF93702871B2}.DebugJava|Win32.ActiveCfg = Debug|Win32 + {FFF91365-C9BA-4F40-AE2B-EF93702871B2}.DebugJava|x64.ActiveCfg = Debug|x64 + {FFF91365-C9BA-4F40-AE2B-EF93702871B2}.DebugOpenssl|Win32.ActiveCfg = Debug|Win32 + {FFF91365-C9BA-4F40-AE2B-EF93702871B2}.DebugOpenssl|Win32.Build.0 = Debug|Win32 + {FFF91365-C9BA-4F40-AE2B-EF93702871B2}.DebugOpenssl|x64.ActiveCfg = Debug|x64 {FFF91365-C9BA-4F40-AE2B-EF93702871B2}.Memento|Win32.ActiveCfg = Memento|Win32 {FFF91365-C9BA-4F40-AE2B-EF93702871B2}.Memento|Win32.Build.0 = Memento|Win32 {FFF91365-C9BA-4F40-AE2B-EF93702871B2}.Memento|x64.ActiveCfg = Memento|x64 {FFF91365-C9BA-4F40-AE2B-EF93702871B2}.Memento|x64.Build.0 = Memento|x64 - {FFF91365-C9BA-4F40-AE2B-EF93702871B2}.MementoCommercial|Win32.ActiveCfg = MementoCommercial|Win32 - {FFF91365-C9BA-4F40-AE2B-EF93702871B2}.MementoCommercial|Win32.Build.0 = MementoCommercial|Win32 - {FFF91365-C9BA-4F40-AE2B-EF93702871B2}.MementoCommercial|x64.ActiveCfg = MementoCommercial|x64 - {FFF91365-C9BA-4F40-AE2B-EF93702871B2}.MementoCommercial|x64.Build.0 = MementoCommercial|x64 + {FFF91365-C9BA-4F40-AE2B-EF93702871B2}.MementoCommercial|Win32.ActiveCfg = Memento|Win32 + {FFF91365-C9BA-4F40-AE2B-EF93702871B2}.MementoCommercial|Win32.Build.0 = Memento|Win32 + {FFF91365-C9BA-4F40-AE2B-EF93702871B2}.MementoCommercial|x64.ActiveCfg = Memento|x64 {FFF91365-C9BA-4F40-AE2B-EF93702871B2}.Release|Win32.ActiveCfg = Release|Win32 {FFF91365-C9BA-4F40-AE2B-EF93702871B2}.Release|Win32.Build.0 = Release|Win32 {FFF91365-C9BA-4F40-AE2B-EF93702871B2}.Release|x64.ActiveCfg = Release|x64 {FFF91365-C9BA-4F40-AE2B-EF93702871B2}.Release|x64.Build.0 = Release|x64 - {FFF91365-C9BA-4F40-AE2B-EF93702871B2}.ReleaseCommercial|Win32.ActiveCfg = ReleaseCommercial|Win32 - {FFF91365-C9BA-4F40-AE2B-EF93702871B2}.ReleaseCommercial|Win32.Build.0 = ReleaseCommercial|Win32 + {FFF91365-C9BA-4F40-AE2B-EF93702871B2}.ReleaseCommercial|Win32.ActiveCfg = Release|Win32 + {FFF91365-C9BA-4F40-AE2B-EF93702871B2}.ReleaseCommercial|Win32.Build.0 = Release|Win32 {FFF91365-C9BA-4F40-AE2B-EF93702871B2}.ReleaseCommercial|x64.ActiveCfg = ReleaseCommercial|x64 {FFF91365-C9BA-4F40-AE2B-EF93702871B2}.ReleaseCommercial|x64.Build.0 = ReleaseCommercial|x64 - {FFF91365-C9BA-4F40-AE2B-EF93702871B2}.ReleaseJava|Win32.ActiveCfg = ReleaseCommercial|x64 - {FFF91365-C9BA-4F40-AE2B-EF93702871B2}.ReleaseJava|x64.ActiveCfg = ReleaseCommercial|x64 - {FFF91365-C9BA-4F40-AE2B-EF93702871B2}.ReleaseJava|x64.Build.0 = ReleaseCommercial|x64 - {FFF91365-C9BA-4F40-AE2B-EF93702871B2}.ReleaseOpenssl|Win32.ActiveCfg = ReleaseCommercial|x64 - {FFF91365-C9BA-4F40-AE2B-EF93702871B2}.ReleaseOpenssl|x64.ActiveCfg = ReleaseCommercial|x64 - {FFF91365-C9BA-4F40-AE2B-EF93702871B2}.ReleaseOpenssl|x64.Build.0 = ReleaseCommercial|x64 + {FFF91365-C9BA-4F40-AE2B-EF93702871B2}.ReleaseJava|Win32.ActiveCfg = Release|Win32 + {FFF91365-C9BA-4F40-AE2B-EF93702871B2}.ReleaseJava|x64.ActiveCfg = Release|x64 + {FFF91365-C9BA-4F40-AE2B-EF93702871B2}.ReleaseOpenssl|Win32.ActiveCfg = Release|Win32 + {FFF91365-C9BA-4F40-AE2B-EF93702871B2}.ReleaseOpenssl|x64.ActiveCfg = Release|x64 {FB51171B-B10E-4EAC-8FFA-19226A1828A3}.Debug|Win32.ActiveCfg = Debug|Win32 {FB51171B-B10E-4EAC-8FFA-19226A1828A3}.Debug|Win32.Build.0 = Debug|Win32 {FB51171B-B10E-4EAC-8FFA-19226A1828A3}.Debug|x64.ActiveCfg = Debug|x64 {FB51171B-B10E-4EAC-8FFA-19226A1828A3}.Debug|x64.Build.0 = Debug|x64 - {FB51171B-B10E-4EAC-8FFA-19226A1828A3}.DebugCommercial|Win32.ActiveCfg = DebugCommercial|Win32 - {FB51171B-B10E-4EAC-8FFA-19226A1828A3}.DebugCommercial|Win32.Build.0 = DebugCommercial|Win32 - {FB51171B-B10E-4EAC-8FFA-19226A1828A3}.DebugCommercial|x64.ActiveCfg = DebugCommercial|x64 - {FB51171B-B10E-4EAC-8FFA-19226A1828A3}.DebugCommercial|x64.Build.0 = DebugCommercial|x64 - {FB51171B-B10E-4EAC-8FFA-19226A1828A3}.DebugGProof|Win32.ActiveCfg = DebugGProof|Win32 - {FB51171B-B10E-4EAC-8FFA-19226A1828A3}.DebugGProof|Win32.Build.0 = DebugGProof|Win32 - {FB51171B-B10E-4EAC-8FFA-19226A1828A3}.DebugGProof|x64.ActiveCfg = DebugGProof|x64 - {FB51171B-B10E-4EAC-8FFA-19226A1828A3}.DebugGProof|x64.Build.0 = DebugGProof|x64 - {FB51171B-B10E-4EAC-8FFA-19226A1828A3}.DebugJava|Win32.ActiveCfg = DebugCommercial|x64 - {FB51171B-B10E-4EAC-8FFA-19226A1828A3}.DebugJava|x64.ActiveCfg = DebugCommercial|x64 - {FB51171B-B10E-4EAC-8FFA-19226A1828A3}.DebugJava|x64.Build.0 = DebugCommercial|x64 - {FB51171B-B10E-4EAC-8FFA-19226A1828A3}.DebugOpenssl|Win32.ActiveCfg = DebugCommercial|x64 - {FB51171B-B10E-4EAC-8FFA-19226A1828A3}.DebugOpenssl|x64.ActiveCfg = DebugCommercial|x64 - {FB51171B-B10E-4EAC-8FFA-19226A1828A3}.DebugOpenssl|x64.Build.0 = DebugCommercial|x64 + {FB51171B-B10E-4EAC-8FFA-19226A1828A3}.DebugCommercial|Win32.ActiveCfg = Debug|Win32 + {FB51171B-B10E-4EAC-8FFA-19226A1828A3}.DebugCommercial|Win32.Build.0 = Debug|Win32 + {FB51171B-B10E-4EAC-8FFA-19226A1828A3}.DebugCommercial|x64.ActiveCfg = Debug|x64 + {FB51171B-B10E-4EAC-8FFA-19226A1828A3}.DebugCommercial|x64.Build.0 = Debug|x64 + {FB51171B-B10E-4EAC-8FFA-19226A1828A3}.DebugJava|Win32.ActiveCfg = Debug|Win32 + {FB51171B-B10E-4EAC-8FFA-19226A1828A3}.DebugJava|x64.ActiveCfg = Debug|x64 + {FB51171B-B10E-4EAC-8FFA-19226A1828A3}.DebugOpenssl|Win32.ActiveCfg = Debug|Win32 + {FB51171B-B10E-4EAC-8FFA-19226A1828A3}.DebugOpenssl|Win32.Build.0 = Debug|Win32 + {FB51171B-B10E-4EAC-8FFA-19226A1828A3}.DebugOpenssl|x64.ActiveCfg = Debug|x64 {FB51171B-B10E-4EAC-8FFA-19226A1828A3}.Memento|Win32.ActiveCfg = Memento|Win32 {FB51171B-B10E-4EAC-8FFA-19226A1828A3}.Memento|Win32.Build.0 = Memento|Win32 {FB51171B-B10E-4EAC-8FFA-19226A1828A3}.Memento|x64.ActiveCfg = Memento|x64 {FB51171B-B10E-4EAC-8FFA-19226A1828A3}.Memento|x64.Build.0 = Memento|x64 - {FB51171B-B10E-4EAC-8FFA-19226A1828A3}.MementoCommercial|Win32.ActiveCfg = MementoCommercial|Win32 - {FB51171B-B10E-4EAC-8FFA-19226A1828A3}.MementoCommercial|Win32.Build.0 = MementoCommercial|Win32 - {FB51171B-B10E-4EAC-8FFA-19226A1828A3}.MementoCommercial|x64.ActiveCfg = MementoCommercial|x64 - {FB51171B-B10E-4EAC-8FFA-19226A1828A3}.MementoCommercial|x64.Build.0 = MementoCommercial|x64 + {FB51171B-B10E-4EAC-8FFA-19226A1828A3}.MementoCommercial|Win32.ActiveCfg = Memento|Win32 + {FB51171B-B10E-4EAC-8FFA-19226A1828A3}.MementoCommercial|Win32.Build.0 = Memento|Win32 + {FB51171B-B10E-4EAC-8FFA-19226A1828A3}.MementoCommercial|x64.ActiveCfg = Memento|x64 {FB51171B-B10E-4EAC-8FFA-19226A1828A3}.Release|Win32.ActiveCfg = Release|Win32 {FB51171B-B10E-4EAC-8FFA-19226A1828A3}.Release|Win32.Build.0 = Release|Win32 {FB51171B-B10E-4EAC-8FFA-19226A1828A3}.Release|x64.ActiveCfg = Release|x64 {FB51171B-B10E-4EAC-8FFA-19226A1828A3}.Release|x64.Build.0 = Release|x64 - {FB51171B-B10E-4EAC-8FFA-19226A1828A3}.ReleaseCommercial|Win32.ActiveCfg = ReleaseCommercial|Win32 - {FB51171B-B10E-4EAC-8FFA-19226A1828A3}.ReleaseCommercial|Win32.Build.0 = ReleaseCommercial|Win32 + {FB51171B-B10E-4EAC-8FFA-19226A1828A3}.ReleaseCommercial|Win32.ActiveCfg = Release|Win32 + {FB51171B-B10E-4EAC-8FFA-19226A1828A3}.ReleaseCommercial|Win32.Build.0 = Release|Win32 {FB51171B-B10E-4EAC-8FFA-19226A1828A3}.ReleaseCommercial|x64.ActiveCfg = ReleaseCommercial|x64 {FB51171B-B10E-4EAC-8FFA-19226A1828A3}.ReleaseCommercial|x64.Build.0 = ReleaseCommercial|x64 - {FB51171B-B10E-4EAC-8FFA-19226A1828A3}.ReleaseJava|Win32.ActiveCfg = ReleaseCommercial|x64 - {FB51171B-B10E-4EAC-8FFA-19226A1828A3}.ReleaseJava|x64.ActiveCfg = ReleaseCommercial|x64 - {FB51171B-B10E-4EAC-8FFA-19226A1828A3}.ReleaseJava|x64.Build.0 = ReleaseCommercial|x64 - {FB51171B-B10E-4EAC-8FFA-19226A1828A3}.ReleaseOpenssl|Win32.ActiveCfg = ReleaseCommercial|x64 - {FB51171B-B10E-4EAC-8FFA-19226A1828A3}.ReleaseOpenssl|x64.ActiveCfg = ReleaseCommercial|x64 - {FB51171B-B10E-4EAC-8FFA-19226A1828A3}.ReleaseOpenssl|x64.Build.0 = ReleaseCommercial|x64 + {FB51171B-B10E-4EAC-8FFA-19226A1828A3}.ReleaseJava|Win32.ActiveCfg = Release|Win32 + {FB51171B-B10E-4EAC-8FFA-19226A1828A3}.ReleaseJava|x64.ActiveCfg = Release|x64 + {FB51171B-B10E-4EAC-8FFA-19226A1828A3}.ReleaseOpenssl|Win32.ActiveCfg = Release|Win32 + {FB51171B-B10E-4EAC-8FFA-19226A1828A3}.ReleaseOpenssl|x64.ActiveCfg = Release|x64 {FA8ADE21-FC8A-47E0-87E4-DCE8808BFC9B}.Debug|Win32.ActiveCfg = Debug|Win32 {FA8ADE21-FC8A-47E0-87E4-DCE8808BFC9B}.Debug|Win32.Build.0 = Debug|Win32 {FA8ADE21-FC8A-47E0-87E4-DCE8808BFC9B}.Debug|x64.ActiveCfg = Debug|x64 @@ -790,15 +709,11 @@ Global {FA8ADE21-FC8A-47E0-87E4-DCE8808BFC9B}.DebugCommercial|Win32.Build.0 = DebugCommercial|Win32 {FA8ADE21-FC8A-47E0-87E4-DCE8808BFC9B}.DebugCommercial|x64.ActiveCfg = DebugCommercial|x64 {FA8ADE21-FC8A-47E0-87E4-DCE8808BFC9B}.DebugCommercial|x64.Build.0 = DebugCommercial|x64 - {FA8ADE21-FC8A-47E0-87E4-DCE8808BFC9B}.DebugGProof|Win32.ActiveCfg = DebugCommercial|x64 - {FA8ADE21-FC8A-47E0-87E4-DCE8808BFC9B}.DebugGProof|x64.ActiveCfg = DebugCommercial|x64 - {FA8ADE21-FC8A-47E0-87E4-DCE8808BFC9B}.DebugGProof|x64.Build.0 = DebugCommercial|x64 - {FA8ADE21-FC8A-47E0-87E4-DCE8808BFC9B}.DebugJava|Win32.ActiveCfg = DebugCommercial|x64 - {FA8ADE21-FC8A-47E0-87E4-DCE8808BFC9B}.DebugJava|x64.ActiveCfg = DebugCommercial|x64 - {FA8ADE21-FC8A-47E0-87E4-DCE8808BFC9B}.DebugJava|x64.Build.0 = DebugCommercial|x64 - {FA8ADE21-FC8A-47E0-87E4-DCE8808BFC9B}.DebugOpenssl|Win32.ActiveCfg = DebugCommercial|x64 - {FA8ADE21-FC8A-47E0-87E4-DCE8808BFC9B}.DebugOpenssl|x64.ActiveCfg = DebugCommercial|x64 - {FA8ADE21-FC8A-47E0-87E4-DCE8808BFC9B}.DebugOpenssl|x64.Build.0 = DebugCommercial|x64 + {FA8ADE21-FC8A-47E0-87E4-DCE8808BFC9B}.DebugJava|Win32.ActiveCfg = DebugCommercial|Win32 + {FA8ADE21-FC8A-47E0-87E4-DCE8808BFC9B}.DebugJava|x64.ActiveCfg = Debug|x64 + {FA8ADE21-FC8A-47E0-87E4-DCE8808BFC9B}.DebugOpenssl|Win32.ActiveCfg = Debug|Win32 + {FA8ADE21-FC8A-47E0-87E4-DCE8808BFC9B}.DebugOpenssl|Win32.Build.0 = Debug|Win32 + {FA8ADE21-FC8A-47E0-87E4-DCE8808BFC9B}.DebugOpenssl|x64.ActiveCfg = Debug|x64 {FA8ADE21-FC8A-47E0-87E4-DCE8808BFC9B}.Memento|Win32.ActiveCfg = Memento|Win32 {FA8ADE21-FC8A-47E0-87E4-DCE8808BFC9B}.Memento|Win32.Build.0 = Memento|Win32 {FA8ADE21-FC8A-47E0-87E4-DCE8808BFC9B}.Memento|x64.ActiveCfg = Memento|x64 @@ -815,101 +730,55 @@ Global {FA8ADE21-FC8A-47E0-87E4-DCE8808BFC9B}.ReleaseCommercial|Win32.Build.0 = ReleaseCommercial|Win32 {FA8ADE21-FC8A-47E0-87E4-DCE8808BFC9B}.ReleaseCommercial|x64.ActiveCfg = ReleaseCommercial|x64 {FA8ADE21-FC8A-47E0-87E4-DCE8808BFC9B}.ReleaseCommercial|x64.Build.0 = ReleaseCommercial|x64 - {FA8ADE21-FC8A-47E0-87E4-DCE8808BFC9B}.ReleaseJava|Win32.ActiveCfg = ReleaseCommercial|x64 - {FA8ADE21-FC8A-47E0-87E4-DCE8808BFC9B}.ReleaseJava|x64.ActiveCfg = ReleaseCommercial|x64 - {FA8ADE21-FC8A-47E0-87E4-DCE8808BFC9B}.ReleaseJava|x64.Build.0 = ReleaseCommercial|x64 - {FA8ADE21-FC8A-47E0-87E4-DCE8808BFC9B}.ReleaseOpenssl|Win32.ActiveCfg = ReleaseCommercial|x64 - {FA8ADE21-FC8A-47E0-87E4-DCE8808BFC9B}.ReleaseOpenssl|x64.ActiveCfg = ReleaseCommercial|x64 - {FA8ADE21-FC8A-47E0-87E4-DCE8808BFC9B}.ReleaseOpenssl|x64.Build.0 = ReleaseCommercial|x64 - {00197081-815B-4F64-BC9D-219078B1F3AA}.Debug|Win32.ActiveCfg = DebugCommercial|x64 - {00197081-815B-4F64-BC9D-219078B1F3AA}.Debug|x64.ActiveCfg = DebugCommercial|x64 - {00197081-815B-4F64-BC9D-219078B1F3AA}.Debug|x64.Build.0 = DebugCommercial|x64 - {00197081-815B-4F64-BC9D-219078B1F3AA}.DebugCommercial|Win32.ActiveCfg = DebugCommercial|Win32 - {00197081-815B-4F64-BC9D-219078B1F3AA}.DebugCommercial|Win32.Build.0 = DebugCommercial|Win32 - {00197081-815B-4F64-BC9D-219078B1F3AA}.DebugCommercial|x64.ActiveCfg = DebugCommercial|x64 - {00197081-815B-4F64-BC9D-219078B1F3AA}.DebugCommercial|x64.Build.0 = DebugCommercial|x64 - {00197081-815B-4F64-BC9D-219078B1F3AA}.DebugGProof|Win32.ActiveCfg = DebugCommercial|x64 - {00197081-815B-4F64-BC9D-219078B1F3AA}.DebugGProof|x64.ActiveCfg = DebugCommercial|x64 - {00197081-815B-4F64-BC9D-219078B1F3AA}.DebugGProof|x64.Build.0 = DebugCommercial|x64 - {00197081-815B-4F64-BC9D-219078B1F3AA}.DebugJava|Win32.ActiveCfg = DebugCommercial|x64 - {00197081-815B-4F64-BC9D-219078B1F3AA}.DebugJava|x64.ActiveCfg = DebugCommercial|x64 - {00197081-815B-4F64-BC9D-219078B1F3AA}.DebugJava|x64.Build.0 = DebugCommercial|x64 - {00197081-815B-4F64-BC9D-219078B1F3AA}.DebugOpenssl|Win32.ActiveCfg = DebugCommercial|x64 - {00197081-815B-4F64-BC9D-219078B1F3AA}.DebugOpenssl|x64.ActiveCfg = DebugCommercial|x64 - {00197081-815B-4F64-BC9D-219078B1F3AA}.DebugOpenssl|x64.Build.0 = DebugCommercial|x64 - {00197081-815B-4F64-BC9D-219078B1F3AA}.Memento|Win32.ActiveCfg = MementoCommercial|x64 - {00197081-815B-4F64-BC9D-219078B1F3AA}.Memento|x64.ActiveCfg = MementoCommercial|x64 - {00197081-815B-4F64-BC9D-219078B1F3AA}.Memento|x64.Build.0 = MementoCommercial|x64 - {00197081-815B-4F64-BC9D-219078B1F3AA}.MementoCommercial|Win32.ActiveCfg = MementoCommercial|Win32 - {00197081-815B-4F64-BC9D-219078B1F3AA}.MementoCommercial|Win32.Build.0 = MementoCommercial|Win32 - {00197081-815B-4F64-BC9D-219078B1F3AA}.MementoCommercial|x64.ActiveCfg = MementoCommercial|x64 - {00197081-815B-4F64-BC9D-219078B1F3AA}.MementoCommercial|x64.Build.0 = MementoCommercial|x64 - {00197081-815B-4F64-BC9D-219078B1F3AA}.Release|Win32.ActiveCfg = ReleaseCommercial|x64 - {00197081-815B-4F64-BC9D-219078B1F3AA}.Release|x64.ActiveCfg = ReleaseCommercial|x64 - {00197081-815B-4F64-BC9D-219078B1F3AA}.Release|x64.Build.0 = ReleaseCommercial|x64 - {00197081-815B-4F64-BC9D-219078B1F3AA}.ReleaseCommercial|Win32.ActiveCfg = ReleaseCommercial|Win32 - {00197081-815B-4F64-BC9D-219078B1F3AA}.ReleaseCommercial|Win32.Build.0 = ReleaseCommercial|Win32 - {00197081-815B-4F64-BC9D-219078B1F3AA}.ReleaseCommercial|x64.ActiveCfg = ReleaseCommercial|x64 - {00197081-815B-4F64-BC9D-219078B1F3AA}.ReleaseCommercial|x64.Build.0 = ReleaseCommercial|x64 - {00197081-815B-4F64-BC9D-219078B1F3AA}.ReleaseJava|Win32.ActiveCfg = ReleaseCommercial|x64 - {00197081-815B-4F64-BC9D-219078B1F3AA}.ReleaseJava|x64.ActiveCfg = ReleaseCommercial|x64 - {00197081-815B-4F64-BC9D-219078B1F3AA}.ReleaseJava|x64.Build.0 = ReleaseCommercial|x64 - {00197081-815B-4F64-BC9D-219078B1F3AA}.ReleaseOpenssl|Win32.ActiveCfg = ReleaseCommercial|x64 - {00197081-815B-4F64-BC9D-219078B1F3AA}.ReleaseOpenssl|x64.ActiveCfg = ReleaseCommercial|x64 - {00197081-815B-4F64-BC9D-219078B1F3AA}.ReleaseOpenssl|x64.Build.0 = ReleaseCommercial|x64 + {FA8ADE21-FC8A-47E0-87E4-DCE8808BFC9B}.ReleaseJava|Win32.ActiveCfg = Release|Win32 + {FA8ADE21-FC8A-47E0-87E4-DCE8808BFC9B}.ReleaseJava|x64.ActiveCfg = Release|x64 + {FA8ADE21-FC8A-47E0-87E4-DCE8808BFC9B}.ReleaseOpenssl|Win32.ActiveCfg = Release|Win32 + {FA8ADE21-FC8A-47E0-87E4-DCE8808BFC9B}.ReleaseOpenssl|Win32.Build.0 = Release|Win32 + {FA8ADE21-FC8A-47E0-87E4-DCE8808BFC9B}.ReleaseOpenssl|x64.ActiveCfg = Release|x64 {22462382-B30D-42A5-BF07-EE1A35E25D21}.Debug|Win32.ActiveCfg = Debug|Win32 {22462382-B30D-42A5-BF07-EE1A35E25D21}.Debug|Win32.Build.0 = Debug|Win32 {22462382-B30D-42A5-BF07-EE1A35E25D21}.Debug|x64.ActiveCfg = Debug|x64 {22462382-B30D-42A5-BF07-EE1A35E25D21}.Debug|x64.Build.0 = Debug|x64 - {22462382-B30D-42A5-BF07-EE1A35E25D21}.DebugCommercial|Win32.ActiveCfg = DebugCommercial|Win32 - {22462382-B30D-42A5-BF07-EE1A35E25D21}.DebugCommercial|Win32.Build.0 = DebugCommercial|Win32 - {22462382-B30D-42A5-BF07-EE1A35E25D21}.DebugCommercial|x64.ActiveCfg = DebugCommercial|x64 - {22462382-B30D-42A5-BF07-EE1A35E25D21}.DebugCommercial|x64.Build.0 = DebugCommercial|x64 - {22462382-B30D-42A5-BF07-EE1A35E25D21}.DebugGProof|Win32.ActiveCfg = DebugGProof|Win32 - {22462382-B30D-42A5-BF07-EE1A35E25D21}.DebugGProof|Win32.Build.0 = DebugGProof|Win32 - {22462382-B30D-42A5-BF07-EE1A35E25D21}.DebugGProof|x64.ActiveCfg = DebugGProof|x64 - {22462382-B30D-42A5-BF07-EE1A35E25D21}.DebugGProof|x64.Build.0 = DebugGProof|x64 - {22462382-B30D-42A5-BF07-EE1A35E25D21}.DebugJava|Win32.ActiveCfg = DebugJava|Win32 - {22462382-B30D-42A5-BF07-EE1A35E25D21}.DebugJava|Win32.Build.0 = DebugJava|Win32 - {22462382-B30D-42A5-BF07-EE1A35E25D21}.DebugJava|x64.ActiveCfg = DebugJava|x64 - {22462382-B30D-42A5-BF07-EE1A35E25D21}.DebugJava|x64.Build.0 = DebugJava|x64 + {22462382-B30D-42A5-BF07-EE1A35E25D21}.DebugCommercial|Win32.ActiveCfg = Debug|Win32 + {22462382-B30D-42A5-BF07-EE1A35E25D21}.DebugCommercial|Win32.Build.0 = Debug|Win32 + {22462382-B30D-42A5-BF07-EE1A35E25D21}.DebugCommercial|x64.ActiveCfg = Debug|x64 + {22462382-B30D-42A5-BF07-EE1A35E25D21}.DebugCommercial|x64.Build.0 = Debug|x64 + {22462382-B30D-42A5-BF07-EE1A35E25D21}.DebugJava|Win32.ActiveCfg = Debug|Win32 + {22462382-B30D-42A5-BF07-EE1A35E25D21}.DebugJava|Win32.Build.0 = Debug|Win32 + {22462382-B30D-42A5-BF07-EE1A35E25D21}.DebugJava|x64.ActiveCfg = Debug|x64 + {22462382-B30D-42A5-BF07-EE1A35E25D21}.DebugJava|x64.Build.0 = Debug|x64 {22462382-B30D-42A5-BF07-EE1A35E25D21}.DebugOpenssl|Win32.ActiveCfg = DebugOpenssl|Win32 {22462382-B30D-42A5-BF07-EE1A35E25D21}.DebugOpenssl|Win32.Build.0 = DebugOpenssl|Win32 - {22462382-B30D-42A5-BF07-EE1A35E25D21}.DebugOpenssl|x64.ActiveCfg = DebugOpenssl|x64 - {22462382-B30D-42A5-BF07-EE1A35E25D21}.DebugOpenssl|x64.Build.0 = DebugOpenssl|x64 + {22462382-B30D-42A5-BF07-EE1A35E25D21}.DebugOpenssl|x64.ActiveCfg = Debug|x64 {22462382-B30D-42A5-BF07-EE1A35E25D21}.Memento|Win32.ActiveCfg = Memento|Win32 {22462382-B30D-42A5-BF07-EE1A35E25D21}.Memento|Win32.Build.0 = Memento|Win32 {22462382-B30D-42A5-BF07-EE1A35E25D21}.Memento|x64.ActiveCfg = Memento|x64 {22462382-B30D-42A5-BF07-EE1A35E25D21}.Memento|x64.Build.0 = Memento|x64 - {22462382-B30D-42A5-BF07-EE1A35E25D21}.MementoCommercial|Win32.ActiveCfg = MementoCommercial|Win32 - {22462382-B30D-42A5-BF07-EE1A35E25D21}.MementoCommercial|Win32.Build.0 = MementoCommercial|Win32 - {22462382-B30D-42A5-BF07-EE1A35E25D21}.MementoCommercial|x64.ActiveCfg = MementoCommercial|x64 - {22462382-B30D-42A5-BF07-EE1A35E25D21}.MementoCommercial|x64.Build.0 = MementoCommercial|x64 + {22462382-B30D-42A5-BF07-EE1A35E25D21}.MementoCommercial|Win32.ActiveCfg = Memento|Win32 + {22462382-B30D-42A5-BF07-EE1A35E25D21}.MementoCommercial|Win32.Build.0 = Memento|Win32 + {22462382-B30D-42A5-BF07-EE1A35E25D21}.MementoCommercial|x64.ActiveCfg = Memento|x64 + {22462382-B30D-42A5-BF07-EE1A35E25D21}.MementoCommercial|x64.Build.0 = Memento|x64 {22462382-B30D-42A5-BF07-EE1A35E25D21}.Release|Win32.ActiveCfg = Release|Win32 {22462382-B30D-42A5-BF07-EE1A35E25D21}.Release|Win32.Build.0 = Release|Win32 {22462382-B30D-42A5-BF07-EE1A35E25D21}.Release|x64.ActiveCfg = Release|x64 {22462382-B30D-42A5-BF07-EE1A35E25D21}.Release|x64.Build.0 = Release|x64 - {22462382-B30D-42A5-BF07-EE1A35E25D21}.ReleaseCommercial|Win32.ActiveCfg = ReleaseCommercial|Win32 - {22462382-B30D-42A5-BF07-EE1A35E25D21}.ReleaseCommercial|Win32.Build.0 = ReleaseCommercial|Win32 - {22462382-B30D-42A5-BF07-EE1A35E25D21}.ReleaseCommercial|x64.ActiveCfg = ReleaseCommercial|x64 - {22462382-B30D-42A5-BF07-EE1A35E25D21}.ReleaseCommercial|x64.Build.0 = ReleaseCommercial|x64 - {22462382-B30D-42A5-BF07-EE1A35E25D21}.ReleaseJava|Win32.ActiveCfg = ReleaseJava|Win32 - {22462382-B30D-42A5-BF07-EE1A35E25D21}.ReleaseJava|Win32.Build.0 = ReleaseJava|Win32 - {22462382-B30D-42A5-BF07-EE1A35E25D21}.ReleaseJava|x64.ActiveCfg = ReleaseJava|x64 - {22462382-B30D-42A5-BF07-EE1A35E25D21}.ReleaseJava|x64.Build.0 = ReleaseJava|x64 + {22462382-B30D-42A5-BF07-EE1A35E25D21}.ReleaseCommercial|Win32.ActiveCfg = Release|Win32 + {22462382-B30D-42A5-BF07-EE1A35E25D21}.ReleaseCommercial|Win32.Build.0 = Release|Win32 + {22462382-B30D-42A5-BF07-EE1A35E25D21}.ReleaseCommercial|x64.ActiveCfg = Release|x64 + {22462382-B30D-42A5-BF07-EE1A35E25D21}.ReleaseCommercial|x64.Build.0 = Release|x64 + {22462382-B30D-42A5-BF07-EE1A35E25D21}.ReleaseJava|Win32.ActiveCfg = Release|Win32 + {22462382-B30D-42A5-BF07-EE1A35E25D21}.ReleaseJava|Win32.Build.0 = Release|Win32 + {22462382-B30D-42A5-BF07-EE1A35E25D21}.ReleaseJava|x64.ActiveCfg = Release|x64 + {22462382-B30D-42A5-BF07-EE1A35E25D21}.ReleaseJava|x64.Build.0 = Release|x64 {22462382-B30D-42A5-BF07-EE1A35E25D21}.ReleaseOpenssl|Win32.ActiveCfg = ReleaseOpenssl|Win32 {22462382-B30D-42A5-BF07-EE1A35E25D21}.ReleaseOpenssl|Win32.Build.0 = ReleaseOpenssl|Win32 {22462382-B30D-42A5-BF07-EE1A35E25D21}.ReleaseOpenssl|x64.ActiveCfg = ReleaseOpenssl|x64 - {22462382-B30D-42A5-BF07-EE1A35E25D21}.ReleaseOpenssl|x64.Build.0 = ReleaseOpenssl|x64 {BFE316B3-BD90-433A-A20D-C73975F1CAA7}.Debug|Win32.ActiveCfg = Release|Win32 {BFE316B3-BD90-433A-A20D-C73975F1CAA7}.Debug|Win32.Build.0 = Release|Win32 {BFE316B3-BD90-433A-A20D-C73975F1CAA7}.Debug|x64.ActiveCfg = Release|Win32 {BFE316B3-BD90-433A-A20D-C73975F1CAA7}.DebugCommercial|Win32.ActiveCfg = Release|Win32 {BFE316B3-BD90-433A-A20D-C73975F1CAA7}.DebugCommercial|Win32.Build.0 = Release|Win32 {BFE316B3-BD90-433A-A20D-C73975F1CAA7}.DebugCommercial|x64.ActiveCfg = Release|Win32 - {BFE316B3-BD90-433A-A20D-C73975F1CAA7}.DebugGProof|Win32.ActiveCfg = Release|Win32 - {BFE316B3-BD90-433A-A20D-C73975F1CAA7}.DebugGProof|Win32.Build.0 = Release|Win32 - {BFE316B3-BD90-433A-A20D-C73975F1CAA7}.DebugGProof|x64.ActiveCfg = Release|Win32 {BFE316B3-BD90-433A-A20D-C73975F1CAA7}.DebugJava|Win32.ActiveCfg = Release|Win32 {BFE316B3-BD90-433A-A20D-C73975F1CAA7}.DebugJava|Win32.Build.0 = Release|Win32 {BFE316B3-BD90-433A-A20D-C73975F1CAA7}.DebugJava|x64.ActiveCfg = Release|Win32 diff --git a/platform/win32/mupdf.vcproj b/platform/win32/mupdf.vcproj index 3698227d..cf07232a 100644 --- a/platform/win32/mupdf.vcproj +++ b/platform/win32/mupdf.vcproj @@ -502,8 +502,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="libcrypto.lib" - AdditionalLibraryDirectories="..\..\thirdparty\openssl\lib" + AdditionalLibraryDirectories="" GenerateDebugInformation="true" TargetMachine="1" /> @@ -653,7 +652,7 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="libeay32.lib" - AdditionalLibraryDirectories="..\..\thirdparty\openssl\lib" + AdditionalLibraryDirectories="" GenerateDebugInformation="true" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -763,151 +762,6 @@ /> </Configuration> <Configuration - Name="DebugGProof|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)\$(ProjectName)" - ConfigurationType="1" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="WIN32;_DEBUG;FT2_BUILD_LIBRARY;OPJ_STATIC" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - WarningLevel="3" - DebugInformationFormat="4" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - GenerateDebugInformation="true" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCWebDeploymentTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="DebugGProof|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)" - ConfigurationType="1" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TargetEnvironment="3" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="WIN64;_DEBUG;FT2_BUILD_LIBRARY;OPJ_STATIC" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - WarningLevel="3" - DebugInformationFormat="3" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - GenerateDebugInformation="true" - TargetMachine="17" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCWebDeploymentTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration Name="MementoCommercial|Win32" OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)\$(ProjectName)" diff --git a/platform/win32/mutool.vcproj b/platform/win32/mutool.vcproj index 3d74fbfc..018d5df2 100644 --- a/platform/win32/mutool.vcproj +++ b/platform/win32/mutool.vcproj @@ -459,7 +459,158 @@ /> </Configuration> <Configuration - Name="DebugGProof|Win32" + Name="ReleaseCommercial|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)\$(ProjectName)" + ConfigurationType="1" + CharacterSet="2" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + EnableIntrinsicFunctions="true" + AdditionalIncludeDirectories="..\..\include;..\..\thirdparty\mujs" + PreprocessorDefinitions="WIN32;NDEBUG" + RuntimeLibrary="0" + EnableFunctionLevelLinking="true" + WarningLevel="3" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + GenerateDebugInformation="true" + OptimizeReferences="2" + EnableCOMDATFolding="2" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="ReleaseCommercial|x64" + OutputDirectory="$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)" + ConfigurationType="1" + CharacterSet="2" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + EnableIntrinsicFunctions="true" + AdditionalIncludeDirectories="..\..\include;..\..\thirdparty\mujs" + PreprocessorDefinitions="WIN64;NDEBUG" + RuntimeLibrary="0" + EnableFunctionLevelLinking="true" + WarningLevel="3" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + GenerateDebugInformation="true" + OptimizeReferences="2" + EnableCOMDATFolding="2" + TargetMachine="17" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="DebugCommercial|Win32" OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)\$(ProjectName)" ConfigurationType="1" @@ -531,7 +682,7 @@ /> </Configuration> <Configuration - Name="DebugGProof|x64" + Name="DebugCommercial|x64" OutputDirectory="$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)" ConfigurationType="1" @@ -603,6 +754,151 @@ Name="VCPostBuildEventTool" /> </Configuration> + <Configuration + Name="MementoCommercial|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)\$(ProjectName)" + ConfigurationType="1" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="..\..\include;..\..\thirdparty\mujs" + PreprocessorDefinitions="WIN32;_DEBUG;MEMENTO" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="1" + WarningLevel="3" + DebugInformationFormat="4" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + GenerateDebugInformation="true" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="MementoCommercial|x64" + OutputDirectory="$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)" + ConfigurationType="1" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="..\..\include;..\..\thirdparty\mujs" + PreprocessorDefinitions="WIN64;_DEBUG;MEMENTO" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="1" + WarningLevel="3" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + GenerateDebugInformation="true" + TargetMachine="17" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> </Configurations> <References> </References> |