MSVS: More solution fixes.

In particular ensure that curl builds properly for 32 and 64bit
modes.

6 files changed, 34 insertions, 32 deletions

diff --git a/platform/win32/javaviewer.vcproj b/platform/win32/javaviewer.vcproj
index 3b54d023..440039b5 100644
--- a/platform/win32/javaviewer.vcproj
+++ b/platform/win32/javaviewer.vcproj
@@ -21,7 +21,7 @@
 		<Configuration
 			Name="DebugJava|Win32"
 			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
 			ConfigurationType="0"
 			>
 			<Tool
@@ -40,7 +40,7 @@
 		</Configuration>
 		<Configuration
 			Name="DebugJava|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
 			ConfigurationType="0"
 			>
@@ -61,13 +61,13 @@
 		<Configuration
 			Name="ReleaseJava|Win32"
 			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
 			ConfigurationType="0"
 			>
 			<Tool
 				Name="VCNMakeTool"
-				BuildCommandLine=""
-				ReBuildCommandLine=""
+				BuildCommandLine="cd ..\java &amp;&amp; winmake.bat $(PlatformName)\$(ConfigurationName)"
+				ReBuildCommandLine="cd ..\java &amp;&amp; winmake.bat $(PlatformName)\$(ConfigurationName)"
 				CleanCommandLine=""
 				Output="javaviewer.exe"
 				PreprocessorDefinitions="WIN32;NDEBUG"
@@ -81,7 +81,7 @@
 		<Configuration
 			Name="ReleaseJava|x64"
 			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
 			ConfigurationType="0"
 			>
 			<Tool
diff --git a/platform/win32/javaviewerlib.vcproj b/platform/win32/javaviewerlib.vcproj
index 08b6f9d8..1af255e0 100644
--- a/platform/win32/javaviewerlib.vcproj
+++ b/platform/win32/javaviewerlib.vcproj
@@ -20,8 +20,8 @@
 	<Configurations>
 		<Configuration
 			Name="DebugJava|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
 			ConfigurationType="2"
 			CharacterSet="1"
 			>
@@ -96,7 +96,7 @@
 		</Configuration>
 		<Configuration
 			Name="DebugJava|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
 			ConfigurationType="2"
 			CharacterSet="1"
@@ -141,7 +141,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				TargetMachine="17"
@@ -173,7 +173,7 @@
 		</Configuration>
 		<Configuration
 			Name="ReleaseJava|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			OutputDirectory="$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
 			ConfigurationType="2"
 			CharacterSet="1"
@@ -249,8 +249,8 @@
 		</Configuration>
 		<Configuration
 			Name="ReleaseJava|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
 			ConfigurationType="2"
 			CharacterSet="1"
 			WholeProgramOptimization="1"
@@ -336,11 +336,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\java\src\com\artifex\mupdf\fitz\BufferInputStream.java"
+				RelativePath="..\java\src\com\artifex\mupdf\fitz\Buffer.java"
 				>
 			</File>
 			<File
-				RelativePath="..\java\src\com\artifex\mupdf\fitz\Buffer.java"
+				RelativePath="..\java\src\com\artifex\mupdf\fitz\BufferInputStream.java"
 				>
 			</File>
 			<File
diff --git a/platform/win32/libfonts.vcproj b/platform/win32/libfonts.vcproj
index a3528042..dfbf5b3d 100644
--- a/platform/win32/libfonts.vcproj
+++ b/platform/win32/libfonts.vcproj
@@ -47,6 +47,7 @@
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
+				OmitDefaultLibName="true"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -108,6 +109,7 @@
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
+				OmitDefaultLibName="true"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
diff --git a/platform/win32/libmupdf.vcproj b/platform/win32/libmupdf.vcproj
index e1e01f7f..f7134220 100644
--- a/platform/win32/libmupdf.vcproj
+++ b/platform/win32/libmupdf.vcproj
@@ -26,7 +26,6 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine=""
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -88,7 +87,6 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine=""
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -712,7 +710,7 @@
 		<Configuration
 			Name="DebugGProof|x64"
 			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
 			ConfigurationType="4"
 			CharacterSet="2"
 			>
@@ -964,7 +962,7 @@
 		<Configuration
 			Name="ReleaseJava|x64"
 			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
 			ConfigurationType="4"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -1090,7 +1088,7 @@
 		<Configuration
 			Name="MementoCommercial|x64"
 			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
 			ConfigurationType="4"
 			CharacterSet="2"
 			>
@@ -1215,7 +1213,7 @@
 		<Configuration
 			Name="DebugCommercial|x64"
 			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
 			ConfigurationType="4"
 			CharacterSet="2"
 			>
@@ -1343,7 +1341,7 @@
 		<Configuration
 			Name="ReleaseCommercial|x64"
 			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
 			ConfigurationType="4"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
diff --git a/platform/win32/libthirdparty.vcproj b/platform/win32/libthirdparty.vcproj
index 839f4023..71d5e70b 100644
--- a/platform/win32/libthirdparty.vcproj
+++ b/platform/win32/libthirdparty.vcproj
@@ -452,7 +452,7 @@
 		<Configuration
 			Name="DebugJava|x64"
 			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
 			ConfigurationType="4"
 			CharacterSet="2"
 			>
@@ -576,7 +576,7 @@
 		<Configuration
 			Name="ReleaseJava|x64"
 			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
 			ConfigurationType="4"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
diff --git a/platform/win32/mupdf.sln b/platform/win32/mupdf.sln
index 0dfe697e..89386b50 100644
--- a/platform/win32/mupdf.sln
+++ b/platform/win32/mupdf.sln
@@ -12,8 +12,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libthirdparty", "libthirdpa
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmupdf", "libmupdf.vcproj", "{5F615F91-DFF8-4F05-BF48-6222B7D86519}"
 	ProjectSection(ProjectDependencies) = postProject
-		{52DCAB29-C8EE-4422-954C-29AFA6B33E22} = {52DCAB29-C8EE-4422-954C-29AFA6B33E22}
 		{A5053AA7-02E5-4903-B596-04F17AEB1526} = {A5053AA7-02E5-4903-B596-04F17AEB1526}
+		{52DCAB29-C8EE-4422-954C-29AFA6B33E22} = {52DCAB29-C8EE-4422-954C-29AFA6B33E22}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mudraw", "mudraw.vcproj", "{0B51171B-B10E-4EAC-8FFA-19226A1828A3}"
@@ -555,25 +555,27 @@ Global
 		{CE3A76A8-A28F-4991-8FB9-C9453D922037}.ReleaseOpenssl|Win32.Build.0 = Release|Win32
 		{CE3A76A8-A28F-4991-8FB9-C9453D922037}.ReleaseOpenssl|x64.ActiveCfg = Release|x64
 		{CE3A76A8-A28F-4991-8FB9-C9453D922037}.ReleaseOpenssl|x64.Build.0 = Release|x64
-		{52DCAB29-C8EE-4422-954C-29AFA6B33E22}.Debug|Win32.ActiveCfg = Release|x64
+		{52DCAB29-C8EE-4422-954C-29AFA6B33E22}.Debug|Win32.ActiveCfg = Release|Win32
+		{52DCAB29-C8EE-4422-954C-29AFA6B33E22}.Debug|Win32.Build.0 = Release|Win32
 		{52DCAB29-C8EE-4422-954C-29AFA6B33E22}.Debug|x64.ActiveCfg = Release|x64
 		{52DCAB29-C8EE-4422-954C-29AFA6B33E22}.Debug|x64.Build.0 = Release|x64
-		{52DCAB29-C8EE-4422-954C-29AFA6B33E22}.DebugCommercial|Win32.ActiveCfg = Release|x64
+		{52DCAB29-C8EE-4422-954C-29AFA6B33E22}.DebugCommercial|Win32.ActiveCfg = Release|Win32
 		{52DCAB29-C8EE-4422-954C-29AFA6B33E22}.DebugCommercial|x64.ActiveCfg = Release|x64
 		{52DCAB29-C8EE-4422-954C-29AFA6B33E22}.DebugCommercial|x64.Build.0 = Release|x64
-		{52DCAB29-C8EE-4422-954C-29AFA6B33E22}.DebugGProof|Win32.ActiveCfg = Release|x64
+		{52DCAB29-C8EE-4422-954C-29AFA6B33E22}.DebugGProof|Win32.ActiveCfg = Release|Win32
 		{52DCAB29-C8EE-4422-954C-29AFA6B33E22}.DebugGProof|x64.ActiveCfg = Release|x64
 		{52DCAB29-C8EE-4422-954C-29AFA6B33E22}.DebugGProof|x64.Build.0 = Release|x64
-		{52DCAB29-C8EE-4422-954C-29AFA6B33E22}.DebugJava|Win32.ActiveCfg = Release|x64
+		{52DCAB29-C8EE-4422-954C-29AFA6B33E22}.DebugJava|Win32.ActiveCfg = Release|Win32
+		{52DCAB29-C8EE-4422-954C-29AFA6B33E22}.DebugJava|Win32.Build.0 = Release|Win32
 		{52DCAB29-C8EE-4422-954C-29AFA6B33E22}.DebugJava|x64.ActiveCfg = Release|x64
 		{52DCAB29-C8EE-4422-954C-29AFA6B33E22}.DebugJava|x64.Build.0 = Release|x64
-		{52DCAB29-C8EE-4422-954C-29AFA6B33E22}.DebugOpenssl|Win32.ActiveCfg = Release|x64
+		{52DCAB29-C8EE-4422-954C-29AFA6B33E22}.DebugOpenssl|Win32.ActiveCfg = Release|Win32
 		{52DCAB29-C8EE-4422-954C-29AFA6B33E22}.DebugOpenssl|x64.ActiveCfg = Release|x64
 		{52DCAB29-C8EE-4422-954C-29AFA6B33E22}.DebugOpenssl|x64.Build.0 = Release|x64
-		{52DCAB29-C8EE-4422-954C-29AFA6B33E22}.Memento|Win32.ActiveCfg = Release|x64
+		{52DCAB29-C8EE-4422-954C-29AFA6B33E22}.Memento|Win32.ActiveCfg = Release|Win32
 		{52DCAB29-C8EE-4422-954C-29AFA6B33E22}.Memento|x64.ActiveCfg = Release|x64
 		{52DCAB29-C8EE-4422-954C-29AFA6B33E22}.Memento|x64.Build.0 = Release|x64
-		{52DCAB29-C8EE-4422-954C-29AFA6B33E22}.MementoCommercial|Win32.ActiveCfg = Release|x64
+		{52DCAB29-C8EE-4422-954C-29AFA6B33E22}.MementoCommercial|Win32.ActiveCfg = Release|Win32
 		{52DCAB29-C8EE-4422-954C-29AFA6B33E22}.MementoCommercial|x64.ActiveCfg = Release|x64
 		{52DCAB29-C8EE-4422-954C-29AFA6B33E22}.MementoCommercial|x64.Build.0 = Release|x64
 		{52DCAB29-C8EE-4422-954C-29AFA6B33E22}.Release|Win32.ActiveCfg = Release|Win32