From 83c939d53c89d794fa9d1f6a242b55e840bb5c4c Mon Sep 17 00:00:00 2001
From: halleyscometsw <halleyscometsw@51a99a44-fe44-0410-b1ba-c3e57ba2b86b>
Date: Sun, 15 Jun 2008 08:29:18 +0000
Subject: [PATCH] make the configurations more consistent

git-svn-id: https://vgmstream.svn.sourceforge.net/svnroot/vgmstream@238 51a99a44-fe44-0410-b1ba-c3e57ba2b86b
---
 ext_libs/ext_libs.vcproj   | 48 ++++----------------------------------
 src/libvgmstream.vcproj    |  1 +
 winamp/in_vgmstream.vcproj |  2 ++
 3 files changed, 7 insertions(+), 44 deletions(-)

diff --git a/ext_libs/ext_libs.vcproj b/ext_libs/ext_libs.vcproj
index 2aa2455f..62b86c06 100644
--- a/ext_libs/ext_libs.vcproj
+++ b/ext_libs/ext_libs.vcproj
@@ -15,7 +15,9 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			ConfigurationType="1"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="10"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -23,51 +25,9 @@
 			<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"
 			/>
@@ -107,7 +67,7 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Building library stub for libvorbis"
-					CommandLine="lib /def:libvorbis.def /machine:x86"
+					CommandLine="lib /def:libvorbis.def /machine:x86&#x0D;&#x0A;"
 					Outputs="libvorbis.lib libvorbis.exp"
 				/>
 			</FileConfiguration>
diff --git a/src/libvgmstream.vcproj b/src/libvgmstream.vcproj
index b726b002..c85bc8dc 100644
--- a/src/libvgmstream.vcproj
+++ b/src/libvgmstream.vcproj
@@ -39,6 +39,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
+				AdditionalIncludeDirectories="../ext_includes"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
diff --git a/winamp/in_vgmstream.vcproj b/winamp/in_vgmstream.vcproj
index 6ed3375f..eb0bbc3c 100644
--- a/winamp/in_vgmstream.vcproj
+++ b/winamp/in_vgmstream.vcproj
@@ -39,6 +39,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
+				AdditionalIncludeDirectories="../ext_includes"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;IN_VGMSTREAM_EXPORTS;"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -59,6 +60,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="../ext_libs/libvorbis.lib"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="2"