diff options
| author | Robin Watts <robin.watts@artifex.com> | 2016-03-26 12:07:40 +0000 |
|---|---|---|
| committer | Robin Watts <robin.watts@artifex.com> | 2016-03-28 12:49:03 +0100 |
| commit | 812c72b261e8bd13f347ddc027dbdc843e647f77 (patch) | |
| tree | 6d2177b2c858fd4e5e9e474564e4c0e74bde581a | |
| parent | 4042aa0732c0fe8c25ba14c6eb647b1bfeaf18f4 (diff) | |
| download | mupdf-812c72b261e8bd13f347ddc027dbdc843e647f77.tar.xz | |
MSVC: More solution tweaking.
Avoid library warnings when including libfonts.
| -rw-r--r-- | platform/win32/libfonts.vcproj | 88 | ||||
| -rw-r--r-- | platform/win32/mupdf.sln | 4 |
2 files changed, 71 insertions, 21 deletions
diff --git a/platform/win32/libfonts.vcproj b/platform/win32/libfonts.vcproj index e8391961..ab4b2063 100644 --- a/platform/win32/libfonts.vcproj +++ b/platform/win32/libfonts.vcproj @@ -17,7 +17,7 @@ <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)\$(ProjectName)" ConfigurationType="4" CharacterSet="2" > @@ -43,7 +43,7 @@ BasicRuntimeChecks="3" RuntimeLibrary="1" WarningLevel="3" - Detect64BitPortabilityProblems="true" + Detect64BitPortabilityProblems="false" DebugInformationFormat="4" /> <Tool @@ -57,6 +57,7 @@ /> <Tool Name="VCLibrarianTool" + IgnoreAllDefaultLibraries="true" /> <Tool Name="VCALinkTool" @@ -75,12 +76,11 @@ /> </Configuration> <Configuration - Name="Release|Win32" + Name="Memento|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" - ConfigurationType="1" + IntermediateDirectory="$(ConfigurationName)\$(ProjectName)" + ConfigurationType="4" CharacterSet="2" - WholeProgramOptimization="1" > <Tool Name="VCPreBuildEventTool" @@ -99,10 +99,13 @@ /> <Tool Name="VCCLCompilerTool" - RuntimeLibrary="0" + Optimization="0" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="1" WarningLevel="3" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" + Detect64BitPortabilityProblems="false" + DebugInformationFormat="4" /> <Tool Name="VCManagedResourceCompilerTool" @@ -114,19 +117,13 @@ Name="VCPreLinkEventTool" /> <Tool - Name="VCLinkerTool" - GenerateDebugInformation="true" - OptimizeReferences="2" - EnableCOMDATFolding="2" - TargetMachine="1" + Name="VCLibrarianTool" + IgnoreAllDefaultLibraries="true" /> <Tool Name="VCALinkTool" /> <Tool - Name="VCManifestTool" - /> - <Tool Name="VCXDCMakeTool" /> <Tool @@ -136,10 +133,63 @@ Name="VCFxCopTool" /> <Tool - Name="VCAppVerifierTool" + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)\$(ProjectName)" + ConfigurationType="4" + CharacterSet="2" + WholeProgramOptimization="0" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" /> <Tool - Name="VCWebDeploymentTool" + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + RuntimeLibrary="0" + 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" diff --git a/platform/win32/mupdf.sln b/platform/win32/mupdf.sln index 88f7777c..86ca1e51 100644 --- a/platform/win32/mupdf.sln +++ b/platform/win32/mupdf.sln @@ -315,8 +315,8 @@ Global {52DCAB29-C8EE-4422-954C-29AFA6B33E22}.DebugOpenssl|Win32.ActiveCfg = Debug|Win32 {52DCAB29-C8EE-4422-954C-29AFA6B33E22}.DebugOpenssl|Win32.Build.0 = Debug|Win32 {52DCAB29-C8EE-4422-954C-29AFA6B33E22}.DebugOpenssl|x64.ActiveCfg = Debug|Win32 - {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|Win32.ActiveCfg = Memento|Win32 + {52DCAB29-C8EE-4422-954C-29AFA6B33E22}.Memento|Win32.Build.0 = Memento|Win32 {52DCAB29-C8EE-4422-954C-29AFA6B33E22}.Memento|x64.ActiveCfg = Release|Win32 {52DCAB29-C8EE-4422-954C-29AFA6B33E22}.Release|Win32.ActiveCfg = Release|Win32 {52DCAB29-C8EE-4422-954C-29AFA6B33E22}.Release|Win32.Build.0 = Release|Win32 |