diff options
| author | Robin Watts <robin.watts@artifex.com> | 2016-06-14 12:46:15 +0100 |
|---|---|---|
| committer | Robin Watts <robin.watts@artifex.com> | 2016-06-14 13:00:05 +0100 |
| commit | 57a844489a0802441be7a0efdd26423aaf42d4af (patch) | |
| tree | 25d314d9fa2395021b2bca7d7a72a0982398e5b2 /platform/win32 | |
| parent | c0759acc6e5bd8167ab4983fc51eb1212da6a216 (diff) | |
| download | mupdf-57a844489a0802441be7a0efdd26423aaf42d4af.tar.xz | |
MSVC 64bit fixes
libfonts wasn't being generated in 64bit configs.
murun had the wrong include path in 64bit configs.
generated was being invoked wrongly in 64bit configs.
Diffstat (limited to 'platform/win32')
| -rw-r--r-- | platform/win32/generated.vcproj | 4 | ||||
| -rw-r--r-- | platform/win32/libfonts.vcproj | 188 | ||||
| -rw-r--r-- | platform/win32/mupdf.sln | 3 | ||||
| -rw-r--r-- | platform/win32/mutool.vcproj | 6 |
4 files changed, 195 insertions, 6 deletions
diff --git a/platform/win32/generated.vcproj b/platform/win32/generated.vcproj index e28c4a1d..0960361b 100644 --- a/platform/win32/generated.vcproj +++ b/platform/win32/generated.vcproj @@ -47,8 +47,8 @@ <Tool Name="VCNMakeTool" BuildCommandLine="generate.bat" - ReBuildCommandLine="del /q ..\..\generated && generate.bat" - CleanCommandLine="del /q ..\..\generated" + ReBuildCommandLine="del /q ..\..\generated ..\..\include\mupdf\pdf\name-table.h ..\..\source\pdf\pdf-name-table.h && generate.bat" + CleanCommandLine="del /q ..\..\generated ..\..\include\mupdf\pdf\name-table.h ..\..\source\pdf\pdf-name-table.h" Output="" PreprocessorDefinitions="WIN64;_DEBUG;USE_OUTPUT_DEBUG_STRING" IncludeSearchPath="" diff --git a/platform/win32/libfonts.vcproj b/platform/win32/libfonts.vcproj index 410e5d38..46a8868d 100644 --- a/platform/win32/libfonts.vcproj +++ b/platform/win32/libfonts.vcproj @@ -10,6 +10,9 @@ <Platform Name="Win32" /> + <Platform + Name="x64" + /> </Platforms> <ToolFiles> </ToolFiles> @@ -196,6 +199,191 @@ Name="VCPostBuildEventTool" /> </Configuration> + <Configuration + Name="Debug|x64" + OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" + 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" + 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="Memento|x64" + OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" + 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" + 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="Release|x64" + OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" + 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" + 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> </Configurations> <References> </References> diff --git a/platform/win32/mupdf.sln b/platform/win32/mupdf.sln index 86ca1e51..55457291 100644 --- a/platform/win32/mupdf.sln +++ b/platform/win32/mupdf.sln @@ -311,7 +311,8 @@ Global {05A1CA5B-9807-4B3A-9954-EFAB8ADE7757}.ReleaseOpenssl|x64.ActiveCfg = Release|Win32 {52DCAB29-C8EE-4422-954C-29AFA6B33E22}.Debug|Win32.ActiveCfg = Debug|Win32 {52DCAB29-C8EE-4422-954C-29AFA6B33E22}.Debug|Win32.Build.0 = Debug|Win32 - {52DCAB29-C8EE-4422-954C-29AFA6B33E22}.Debug|x64.ActiveCfg = Debug|Win32 + {52DCAB29-C8EE-4422-954C-29AFA6B33E22}.Debug|x64.ActiveCfg = Debug|x64 + {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 diff --git a/platform/win32/mutool.vcproj b/platform/win32/mutool.vcproj index ff707d16..3aaab37f 100644 --- a/platform/win32/mutool.vcproj +++ b/platform/win32/mutool.vcproj @@ -115,7 +115,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\include" + AdditionalIncludeDirectories="..\..\include;..\..\thirdparty\mujs" PreprocessorDefinitions="FZ_LARGEFILE;DEBUG=1;USE_OUTPUT_DEBUG_STRING" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -265,7 +265,7 @@ Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="..\..\include" + AdditionalIncludeDirectories="..\..\include;..\..\thirdparty\mujs" PreprocessorDefinitions="FZ_LARGEFILE" RuntimeLibrary="0" EnableFunctionLevelLinking="true" @@ -411,7 +411,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\include" + AdditionalIncludeDirectories="..\..\include;..\..\thirdparty\mujs" PreprocessorDefinitions="FZ_LARGEFILE;MEMENTO=1;DEBUG=1;USE_OUTPUT_DEBUG_STRING" MinimalRebuild="true" BasicRuntimeChecks="3" |