diff options
Diffstat (limited to 'platform/win32')
-rw-r--r-- | platform/win32/libfonts.vcproj | 1 | ||||
-rw-r--r-- | platform/win32/libglfw.vcproj | 43 | ||||
-rw-r--r-- | platform/win32/mupdf-gl.vcproj | 106 |
3 files changed, 106 insertions, 44 deletions
diff --git a/platform/win32/libfonts.vcproj b/platform/win32/libfonts.vcproj index c356de07..410e5d38 100644 --- a/platform/win32/libfonts.vcproj +++ b/platform/win32/libfonts.vcproj @@ -162,6 +162,7 @@ <Tool Name="VCCLCompilerTool" RuntimeLibrary="0" + EnableFunctionLevelLinking="true" WarningLevel="3" Detect64BitPortabilityProblems="false" DebugInformationFormat="3" diff --git a/platform/win32/libglfw.vcproj b/platform/win32/libglfw.vcproj index cc5517c7..231dc064 100644 --- a/platform/win32/libglfw.vcproj +++ b/platform/win32/libglfw.vcproj @@ -81,9 +81,9 @@ /> </Configuration> <Configuration - Name="Memento|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)\$(ProjectName)" + Name="Debug|x64" + OutputDirectory="$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)" ConfigurationType="4" CharacterSet="1" > @@ -101,18 +101,19 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" Optimization="0" - PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS;_GLFW_WIN32;_GLFW_WGL;_GLFW_USE_OPENGL;MEMENTO" + PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS;_GLFW_WIN32;_GLFW_WGL;_GLFW_USE_OPENGL" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="true" - DebugInformationFormat="4" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" @@ -143,12 +144,11 @@ /> </Configuration> <Configuration - Name="Release|Win32" + Name="Memento|Win32" OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)\$(ProjectName)" ConfigurationType="4" CharacterSet="1" - WholeProgramOptimization="1" > <Tool Name="VCPreBuildEventTool" @@ -167,12 +167,15 @@ /> <Tool Name="VCCLCompilerTool" - PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS;_GLFW_WIN32;_GLFW_WGL;_GLFW_USE_OPENGL" - RuntimeLibrary="0" + Optimization="0" + PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS;_GLFW_WIN32;_GLFW_WGL;_GLFW_USE_OPENGL;MEMENTO" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="1" UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" + DebugInformationFormat="4" /> <Tool Name="VCManagedResourceCompilerTool" @@ -203,7 +206,7 @@ /> </Configuration> <Configuration - Name="Debug|x64" + Name="Memento|x64" OutputDirectory="$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)" ConfigurationType="4" @@ -228,7 +231,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS;_GLFW_WIN32;_GLFW_WGL;_GLFW_USE_OPENGL" + PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS;_GLFW_WIN32;_GLFW_WGL;_GLFW_USE_OPENGL;MEMENTO" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -266,11 +269,12 @@ /> </Configuration> <Configuration - Name="Memento|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)" + Name="Release|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)\$(ProjectName)" ConfigurationType="4" CharacterSet="1" + WholeProgramOptimization="1" > <Tool Name="VCPreBuildEventTool" @@ -286,15 +290,12 @@ /> <Tool Name="VCMIDLTool" - TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" - Optimization="0" - PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS;_GLFW_WIN32;_GLFW_WGL;_GLFW_USE_OPENGL;MEMENTO" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="1" + PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS;_GLFW_WIN32;_GLFW_WGL;_GLFW_USE_OPENGL" + RuntimeLibrary="0" + EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="true" diff --git a/platform/win32/mupdf-gl.vcproj b/platform/win32/mupdf-gl.vcproj index 3ae4488a..46a2103d 100644 --- a/platform/win32/mupdf-gl.vcproj +++ b/platform/win32/mupdf-gl.vcproj @@ -96,9 +96,9 @@ /> </Configuration> <Configuration - Name="Memento|Win32" - OutputDirectory="$(SolutionDir)$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" + Name="Debug|x64" + OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="1" CharacterSet="1" > @@ -116,19 +116,20 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include;..\..\thirdparty\glfw\include;..\..\scripts\freetype;..\..\thirdparty\freetype\include" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;USE_OUTPUT_DEBUG_STRING;MEMENTO" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;USE_OUTPUT_DEBUG_STRING" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="true" - DebugInformationFormat="4" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" @@ -145,7 +146,7 @@ LinkIncremental="0" GenerateDebugInformation="true" SubSystem="2" - TargetMachine="1" + TargetMachine="17" /> <Tool Name="VCALinkTool" @@ -173,12 +174,11 @@ /> </Configuration> <Configuration - Name="Release|Win32" + Name="Memento|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="1" CharacterSet="1" - WholeProgramOptimization="1" > <Tool Name="VCPreBuildEventTool" @@ -197,13 +197,16 @@ /> <Tool Name="VCCLCompilerTool" + Optimization="0" AdditionalIncludeDirectories="..\..\include;..\..\thirdparty\glfw\include;..\..\scripts\freetype;..\..\thirdparty\freetype\include" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" - RuntimeLibrary="0" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;USE_OUTPUT_DEBUG_STRING;MEMENTO" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="1" UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" + DebugInformationFormat="4" /> <Tool Name="VCManagedResourceCompilerTool" @@ -220,8 +223,6 @@ LinkIncremental="0" GenerateDebugInformation="true" SubSystem="2" - OptimizeReferences="2" - EnableCOMDATFolding="2" TargetMachine="1" /> <Tool @@ -250,11 +251,71 @@ /> </Configuration> <Configuration - Name="Debug|x64" - OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" + Name="Memento|x64" + ConfigurationType="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + /> + <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="Release|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" ConfigurationType="1" CharacterSet="1" + WholeProgramOptimization="1" > <Tool Name="VCPreBuildEventTool" @@ -270,16 +331,13 @@ /> <Tool Name="VCMIDLTool" - TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" - Optimization="0" AdditionalIncludeDirectories="..\..\include;..\..\thirdparty\glfw\include;..\..\scripts\freetype;..\..\thirdparty\freetype\include" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;USE_OUTPUT_DEBUG_STRING" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="1" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" + RuntimeLibrary="0" + EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="true" @@ -300,7 +358,9 @@ LinkIncremental="0" GenerateDebugInformation="true" SubSystem="2" - TargetMachine="17" + OptimizeReferences="2" + EnableCOMDATFolding="2" + TargetMachine="1" /> <Tool Name="VCALinkTool" |