diff options
| author | Robin Watts <robin.watts@artifex.com> | 2016-06-14 17:02:26 +0100 |
|---|---|---|
| committer | Robin Watts <robin.watts@artifex.com> | 2016-06-16 15:17:08 +0100 |
| commit | d4037cf388761e3ec632e085046ac9f0bf2e13ce (patch) | |
| tree | 9aaaef5da3fa28c7d3b3936f2273f1e16b13f955 /platform | |
| parent | d67f59b37a7177f5cf47ae9bfd580a19ca698b5f (diff) | |
| download | mupdf-d4037cf388761e3ec632e085046ac9f0bf2e13ce.tar.xz | |
MSVC: 64bit fixes.
Update libfonts build directory; this was causing many warnings
because the debugging information was being put in the wrong place.
Also ensure that libfonts is build for the different 64bit configs.
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/win32/libfonts.vcproj | 46 | ||||
| -rw-r--r-- | platform/win32/mupdf.sln | 30 |
2 files changed, 49 insertions, 27 deletions
diff --git a/platform/win32/libfonts.vcproj b/platform/win32/libfonts.vcproj index 46a8868d..c5e1215d 100644 --- a/platform/win32/libfonts.vcproj +++ b/platform/win32/libfonts.vcproj @@ -20,7 +20,7 @@ <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)\$(ProjectName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)" ConfigurationType="4" CharacterSet="2" > @@ -79,9 +79,9 @@ /> </Configuration> <Configuration - Name="Memento|Win32" - OutputDirectory="$(SolutionDir)$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)\$(ProjectName)" + Name="Debug|x64" + OutputDirectory="$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)" ConfigurationType="4" CharacterSet="2" > @@ -99,6 +99,7 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" @@ -108,7 +109,7 @@ RuntimeLibrary="1" WarningLevel="3" Detect64BitPortabilityProblems="false" - DebugInformationFormat="4" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" @@ -140,12 +141,11 @@ /> </Configuration> <Configuration - Name="Release|Win32" + Name="Memento|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)\$(ProjectName)" ConfigurationType="4" CharacterSet="2" - WholeProgramOptimization="0" > <Tool Name="VCPreBuildEventTool" @@ -164,11 +164,13 @@ /> <Tool Name="VCCLCompilerTool" - RuntimeLibrary="0" - EnableFunctionLevelLinking="true" + Optimization="0" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="1" WarningLevel="3" Detect64BitPortabilityProblems="false" - DebugInformationFormat="3" + DebugInformationFormat="4" /> <Tool Name="VCManagedResourceCompilerTool" @@ -200,9 +202,9 @@ /> </Configuration> <Configuration - Name="Debug|x64" - OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" + Name="Memento|x64" + OutputDirectory="$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)" ConfigurationType="4" CharacterSet="2" > @@ -262,11 +264,12 @@ /> </Configuration> <Configuration - Name="Memento|x64" - OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" + Name="Release|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)\$(ProjectName)" ConfigurationType="4" CharacterSet="2" + WholeProgramOptimization="0" > <Tool Name="VCPreBuildEventTool" @@ -282,14 +285,11 @@ /> <Tool Name="VCMIDLTool" - TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" - Optimization="0" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="1" + RuntimeLibrary="0" + EnableFunctionLevelLinking="true" WarningLevel="3" Detect64BitPortabilityProblems="false" DebugInformationFormat="3" @@ -325,8 +325,8 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" + OutputDirectory="$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)" ConfigurationType="4" CharacterSet="2" WholeProgramOptimization="0" diff --git a/platform/win32/mupdf.sln b/platform/win32/mupdf.sln index 55457291..b499b3f2 100644 --- a/platform/win32/mupdf.sln +++ b/platform/win32/mupdf.sln @@ -315,16 +315,38 @@ Global {52DCAB29-C8EE-4422-954C-29AFA6B33E22}.Debug|x64.Build.0 = Debug|x64 {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}.DebugOpenssl|x64.ActiveCfg = Debug|x64 + {52DCAB29-C8EE-4422-954C-29AFA6B33E22}.DebugOpenssl|x64.Build.0 = Debug|x64 {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}.Memento|x64.ActiveCfg = Memento|x64 + {52DCAB29-C8EE-4422-954C-29AFA6B33E22}.Memento|x64.Build.0 = Memento|x64 {52DCAB29-C8EE-4422-954C-29AFA6B33E22}.Release|Win32.ActiveCfg = Release|Win32 {52DCAB29-C8EE-4422-954C-29AFA6B33E22}.Release|Win32.Build.0 = Release|Win32 - {52DCAB29-C8EE-4422-954C-29AFA6B33E22}.Release|x64.ActiveCfg = Release|Win32 + {52DCAB29-C8EE-4422-954C-29AFA6B33E22}.Release|x64.ActiveCfg = Release|x64 + {52DCAB29-C8EE-4422-954C-29AFA6B33E22}.Release|x64.Build.0 = Release|x64 {52DCAB29-C8EE-4422-954C-29AFA6B33E22}.ReleaseOpenssl|Win32.ActiveCfg = Release|Win32 {52DCAB29-C8EE-4422-954C-29AFA6B33E22}.ReleaseOpenssl|Win32.Build.0 = Release|Win32 - {52DCAB29-C8EE-4422-954C-29AFA6B33E22}.ReleaseOpenssl|x64.ActiveCfg = Release|Win32 + {52DCAB29-C8EE-4422-954C-29AFA6B33E22}.ReleaseOpenssl|x64.ActiveCfg = Release|x64 + {52DCAB29-C8EE-4422-954C-29AFA6B33E22}.ReleaseOpenssl|x64.Build.0 = Release|x64 + {0FDC74D7-D18C-45CE-94D6-EDFCC5A0CDF2}.Debug|Win32.ActiveCfg = Debug|Win32 + {0FDC74D7-D18C-45CE-94D6-EDFCC5A0CDF2}.Debug|Win32.Build.0 = Debug|Win32 + {0FDC74D7-D18C-45CE-94D6-EDFCC5A0CDF2}.Debug|x64.ActiveCfg = Debug|x64 + {0FDC74D7-D18C-45CE-94D6-EDFCC5A0CDF2}.Debug|x64.Build.0 = Debug|x64 + {0FDC74D7-D18C-45CE-94D6-EDFCC5A0CDF2}.DebugOpenssl|Win32.ActiveCfg = Debug|x64 + {0FDC74D7-D18C-45CE-94D6-EDFCC5A0CDF2}.DebugOpenssl|x64.ActiveCfg = Debug|x64 + {0FDC74D7-D18C-45CE-94D6-EDFCC5A0CDF2}.DebugOpenssl|x64.Build.0 = Debug|x64 + {0FDC74D7-D18C-45CE-94D6-EDFCC5A0CDF2}.Memento|Win32.ActiveCfg = Memento|Win32 + {0FDC74D7-D18C-45CE-94D6-EDFCC5A0CDF2}.Memento|Win32.Build.0 = Memento|Win32 + {0FDC74D7-D18C-45CE-94D6-EDFCC5A0CDF2}.Memento|x64.ActiveCfg = Memento|x64 + {0FDC74D7-D18C-45CE-94D6-EDFCC5A0CDF2}.Memento|x64.Build.0 = Memento|x64 + {0FDC74D7-D18C-45CE-94D6-EDFCC5A0CDF2}.Release|Win32.ActiveCfg = Release|Win32 + {0FDC74D7-D18C-45CE-94D6-EDFCC5A0CDF2}.Release|Win32.Build.0 = Release|Win32 + {0FDC74D7-D18C-45CE-94D6-EDFCC5A0CDF2}.Release|x64.ActiveCfg = Release|x64 + {0FDC74D7-D18C-45CE-94D6-EDFCC5A0CDF2}.Release|x64.Build.0 = Release|x64 + {0FDC74D7-D18C-45CE-94D6-EDFCC5A0CDF2}.ReleaseOpenssl|Win32.ActiveCfg = Release|x64 + {0FDC74D7-D18C-45CE-94D6-EDFCC5A0CDF2}.ReleaseOpenssl|x64.ActiveCfg = Release|x64 + {0FDC74D7-D18C-45CE-94D6-EDFCC5A0CDF2}.ReleaseOpenssl|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE |