summaryrefslogtreecommitdiff
path: root/platform
diff options
context:
space:
mode:
authorRobin Watts <robin.watts@artifex.com>2018-10-17 15:35:16 +0100
committerRobin Watts <robin.watts@artifex.com>2018-10-17 16:10:42 +0100
commit854a2cd9a4e9700b5f829409d268f61d7adc4509 (patch)
tree45656543416e64f247f4eb83ec4e0312d9483bc9 /platform
parent0b104e0f35a8497f1f5fd2fc1a05f5015f49471f (diff)
downloadmupdf-854a2cd9a4e9700b5f829409d268f61d7adc4509.tar.xz
MSVC: Fix libluratech.vcproj.
Was set to create an exe rather than a lib. For some reason this didn't upset VS2005, but did upset VS2008.
Diffstat (limited to 'platform')
-rw-r--r--platform/win32/libluratech.vcproj174
-rw-r--r--platform/win32/mupdf.sln8
2 files changed, 37 insertions, 145 deletions
diff --git a/platform/win32/libluratech.vcproj b/platform/win32/libluratech.vcproj
index ddc7f692..5cdb88e9 100644
--- a/platform/win32/libluratech.vcproj
+++ b/platform/win32/libluratech.vcproj
@@ -5,6 +5,7 @@
Name="libluratech"
ProjectGUID="{B0091365-C9BA-4F40-AE2B-EF93702871B2}"
RootNamespace="libluratech"
+ Keyword="Win32Proj"
>
<Platforms>
<Platform
@@ -43,9 +44,10 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\thirdparty\luratech\ldf_jb2\source\common;..\..\thirdparty\luratech\ldf_jb2\source\libraries;..\..\thirdparty\luratech\ldf_jb2\source\compress;..\..\thirdparty\luratech\lwf_jp2\library\source"
- PreprocessorDefinitions="WIN32;NDEBUG"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="3"
@@ -62,6 +64,7 @@
<Tool
Name="VCLibrarianTool"
IgnoreAllDefaultLibraries="true"
+ OutputFile="$(OutDir)\$(ProjectName).lib"
/>
<Tool
Name="VCALinkTool"
@@ -109,6 +112,7 @@
PreprocessorDefinitions="WIN64;NDEBUG;_CRT_SECURE_NO_WARNINGS"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="3"
@@ -125,6 +129,7 @@
<Tool
Name="VCLibrarianTool"
IgnoreAllDefaultLibraries="true"
+ OutputFile="$(OutDir)\$(ProjectName).lib"
/>
<Tool
Name="VCALinkTool"
@@ -147,7 +152,7 @@
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="4"
- CharacterSet="2"
+ CharacterSet="0"
>
<Tool
Name="VCPreBuildEventTool"
@@ -168,10 +173,11 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\thirdparty\luratech\ldf_jb2\source\common;..\..\thirdparty\luratech\ldf_jb2\source\libraries;..\..\thirdparty\luratech\ldf_jb2\source\compress;..\..\thirdparty\luratech\lwf_jp2\library\source"
- PreprocessorDefinitions="WIN32;_DEBUG"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
+ UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="4"
@@ -188,6 +194,7 @@
<Tool
Name="VCLibrarianTool"
IgnoreAllDefaultLibraries="true"
+ OutputFile="$(OutDir)\$(ProjectName).lib"
/>
<Tool
Name="VCALinkTool"
@@ -210,7 +217,7 @@
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
ConfigurationType="4"
- CharacterSet="2"
+ CharacterSet="0"
>
<Tool
Name="VCPreBuildEventTool"
@@ -236,6 +243,7 @@
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
+ UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="3"
@@ -252,6 +260,7 @@
<Tool
Name="VCLibrarianTool"
IgnoreAllDefaultLibraries="true"
+ OutputFile="$(OutDir)\$(ProjectName).lib"
/>
<Tool
Name="VCALinkTool"
@@ -270,11 +279,12 @@
/>
</Configuration>
<Configuration
- Name="MementoCommercial|Win32"
+ Name="Release|Win32"
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="4"
- CharacterSet="2"
+ CharacterSet="0"
+ WholeProgramOptimization="0"
>
<Tool
Name="VCPreBuildEventTool"
@@ -293,15 +303,14 @@
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories="..\..\thirdparty\luratech\ldf_jb2\source\common;..\..\thirdparty\luratech\ldf_jb2\source\libraries;..\..\thirdparty\luratech\ldf_jb2\source\compress;..\..\thirdparty\luratech\lwf_jp2\library\source"
- PreprocessorDefinitions="WIN32;_DEBUG;MEMENTO=1"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS"
+ RuntimeLibrary="0"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="false"
- DebugInformationFormat="4"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -315,6 +324,7 @@
<Tool
Name="VCLibrarianTool"
IgnoreAllDefaultLibraries="true"
+ OutputFile="$(OutDir)\$(ProjectName).lib"
/>
<Tool
Name="VCALinkTool"
@@ -333,11 +343,12 @@
/>
</Configuration>
<Configuration
- Name="MementoCommercial|x64"
+ Name="Release|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
ConfigurationType="4"
- CharacterSet="2"
+ CharacterSet="0"
+ WholeProgramOptimization="0"
>
<Tool
Name="VCPreBuildEventTool"
@@ -357,12 +368,10 @@
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories="..\..\thirdparty\luratech\ldf_jb2\source\common;..\..\thirdparty\luratech\ldf_jb2\source\libraries;..\..\thirdparty\luratech\ldf_jb2\source\compress;..\..\thirdparty\luratech\lwf_jp2\library\source"
- PreprocessorDefinitions="WIN64;_DEBUG;MEMENTO=1;_CRT_SECURE_NO_WARNINGS"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
+ PreprocessorDefinitions="WIN64;NDEBUG;_CRT_SECURE_NO_WARNINGS"
+ RuntimeLibrary="0"
+ UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="3"
@@ -379,6 +388,7 @@
<Tool
Name="VCLibrarianTool"
IgnoreAllDefaultLibraries="true"
+ OutputFile="$(OutDir)\$(ProjectName).lib"
/>
<Tool
Name="VCALinkTool"
@@ -396,128 +406,6 @@
Name="VCPostBuildEventTool"
/>
</Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- 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|x64"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
- 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>
</Configurations>
<References>
</References>
@@ -6618,6 +6506,10 @@
</FileConfiguration>
</File>
</Filter>
+ <File
+ RelativePath=".\dummy.c"
+ >
+ </File>
</Files>
<Globals>
</Globals>
diff --git a/platform/win32/mupdf.sln b/platform/win32/mupdf.sln
index fb1086c0..b52b899e 100644
--- a/platform/win32/mupdf.sln
+++ b/platform/win32/mupdf.sln
@@ -724,10 +724,10 @@ Global
{B0091365-C9BA-4F40-AE2B-EF93702871B2}.Memento|Win32.Build.0 = Release|Win32
{B0091365-C9BA-4F40-AE2B-EF93702871B2}.Memento|x64.ActiveCfg = Release|x64
{B0091365-C9BA-4F40-AE2B-EF93702871B2}.Memento|x64.Build.0 = Release|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}.MementoCommercial|Win32.ActiveCfg = DebugCommercial|Win32
+ {B0091365-C9BA-4F40-AE2B-EF93702871B2}.MementoCommercial|Win32.Build.0 = DebugCommercial|Win32
+ {B0091365-C9BA-4F40-AE2B-EF93702871B2}.MementoCommercial|x64.ActiveCfg = DebugCommercial|x64
+ {B0091365-C9BA-4F40-AE2B-EF93702871B2}.MementoCommercial|x64.Build.0 = DebugCommercial|x64
{B0091365-C9BA-4F40-AE2B-EF93702871B2}.MementoOpenSSL|Win32.ActiveCfg = Release|Win32
{B0091365-C9BA-4F40-AE2B-EF93702871B2}.MementoOpenSSL|Win32.Build.0 = Release|Win32
{B0091365-C9BA-4F40-AE2B-EF93702871B2}.MementoOpenSSL|x64.ActiveCfg = Release|x64