From af3dbd0034176ec1b325911de40284983762a315 Mon Sep 17 00:00:00 2001
From: halleyscometsw <halleyscometsw@51a99a44-fe44-0410-b1ba-c3e57ba2b86b>
Date: Sun, 15 Jun 2008 07:51:10 +0000
Subject: [PATCH] make linking with libvorbis possible on MSVC

git-svn-id: https://vgmstream.svn.sourceforge.net/svnroot/vgmstream@234 51a99a44-fe44-0410-b1ba-c3e57ba2b86b
---
 ext_libs/ext_libs.vcproj   | 118 +++++++++++++++++++++++++++++++++++++
 src/libvgmstream.vcproj    |  25 ++++----
 src/streamtypes.h          |   2 +-
 vgmstream.sln              |   7 +++
 winamp/in_vgmstream.vcproj |  12 ++--
 5 files changed, 144 insertions(+), 20 deletions(-)
 create mode 100644 ext_libs/ext_libs.vcproj

diff --git a/ext_libs/ext_libs.vcproj b/ext_libs/ext_libs.vcproj
new file mode 100644
index 00000000..2aa2455f
--- /dev/null
+++ b/ext_libs/ext_libs.vcproj
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="ext_libs"
+	ProjectGUID="{10E6BFC6-1E5B-46E4-BA42-F04DFBD0ABFF}"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			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|Win32"
+			OutputDirectory="$(SolutionDir)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="10"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+				CommandLine=""
+				AdditionalDependencies=""
+				Outputs=""
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<File
+			RelativePath=".\libvorbis.def"
+			>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Building library stub for libvorbis"
+					CommandLine="lib /def:libvorbis.def /machine:x86"
+					Outputs="libvorbis.lib libvorbis.exp"
+				/>
+			</FileConfiguration>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/src/libvgmstream.vcproj b/src/libvgmstream.vcproj
index c9500475..b726b002 100644
--- a/src/libvgmstream.vcproj
+++ b/src/libvgmstream.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="8.00"
 	Name="libvgmstream"
 	ProjectGUID="{54A6AD11-5369-4895-A06F-E255ABB99B11}"
 	RootNamespace="libvgmstream"
@@ -99,6 +99,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="../ext_includes"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -160,12 +161,6 @@
 				>
 			</File>
 		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
 		<Filter
 			Name="Source Files"
 			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
@@ -230,6 +225,10 @@
 					RelativePath=".\meta\gcsw.c"
 					>
 				</File>
+				<File
+					RelativePath=".\meta\genh.c"
+					>
+				</File>
 				<File
 					RelativePath=".\meta\halpst.c"
 					>
@@ -250,6 +249,10 @@
 					RelativePath=".\meta\ngc_dsp_std.c"
 					>
 				</File>
+				<File
+					RelativePath=".\meta\ogg_vorbis_file.c"
+					>
+				</File>
 				<File
 					RelativePath=".\meta\ps2_ads.c"
 					>
@@ -306,10 +309,6 @@
 					RelativePath=".\meta\psx_cdxa.c"
 					>
 				</File>
-				<File
-					RelativePath=".\meta\genh.c"
-					>
-				</File>
 				<File
 					RelativePath=".\meta\psx_gms.c"
 					>
@@ -386,6 +385,10 @@
 					RelativePath=".\coding\ngc_dtk_decoder.c"
 					>
 				</File>
+				<File
+					RelativePath=".\coding\ogg_vorbis_decoder.c"
+					>
+				</File>
 				<File
 					RelativePath=".\coding\pcm_decoder.c"
 					>
diff --git a/src/streamtypes.h b/src/streamtypes.h
index 9a73720d..e87e4d39 100644
--- a/src/streamtypes.h
+++ b/src/streamtypes.h
@@ -7,7 +7,7 @@
 #define _STREAMTYPES_H
 
 #ifdef _MSC_VER
-#include "../ext_includes/pstdint.h"
+#include <pstdint.h>
 #define inline _inline
 #define strcasecmp _stricmp
 #define snprintf _snprintf
diff --git a/vgmstream.sln b/vgmstream.sln
index b5715bdb..7f68f660 100644
--- a/vgmstream.sln
+++ b/vgmstream.sln
@@ -5,9 +5,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libvgmstream", "src\libvgms
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "in_vgmstream", "winamp\in_vgmstream.vcproj", "{42D86561-8CE4-40F5-86CE-58C986B77502}"
 	ProjectSection(ProjectDependencies) = postProject
+		{10E6BFC6-1E5B-46E4-BA42-F04DFBD0ABFF} = {10E6BFC6-1E5B-46E4-BA42-F04DFBD0ABFF}
 		{54A6AD11-5369-4895-A06F-E255ABB99B11} = {54A6AD11-5369-4895-A06F-E255ABB99B11}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ext_libs", "ext_libs\ext_libs.vcproj", "{10E6BFC6-1E5B-46E4-BA42-F04DFBD0ABFF}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -22,6 +25,10 @@ Global
 		{42D86561-8CE4-40F5-86CE-58C986B77502}.Debug|Win32.Build.0 = Debug|Win32
 		{42D86561-8CE4-40F5-86CE-58C986B77502}.Release|Win32.ActiveCfg = Release|Win32
 		{42D86561-8CE4-40F5-86CE-58C986B77502}.Release|Win32.Build.0 = Release|Win32
+		{10E6BFC6-1E5B-46E4-BA42-F04DFBD0ABFF}.Debug|Win32.ActiveCfg = Debug|Win32
+		{10E6BFC6-1E5B-46E4-BA42-F04DFBD0ABFF}.Debug|Win32.Build.0 = Debug|Win32
+		{10E6BFC6-1E5B-46E4-BA42-F04DFBD0ABFF}.Release|Win32.ActiveCfg = Release|Win32
+		{10E6BFC6-1E5B-46E4-BA42-F04DFBD0ABFF}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/winamp/in_vgmstream.vcproj b/winamp/in_vgmstream.vcproj
index 0a3aff4f..6ed3375f 100644
--- a/winamp/in_vgmstream.vcproj
+++ b/winamp/in_vgmstream.vcproj
@@ -4,6 +4,7 @@
 	Version="8.00"
 	Name="in_vgmstream"
 	ProjectGUID="{42D86561-8CE4-40F5-86CE-58C986B77502}"
+	RootNamespace="in_vgmstream"
 	Keyword="Win32Proj"
 	>
 	<Platforms>
@@ -111,6 +112,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="../ext_includes"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;IN_VGMSTREAM_EXPORTS;"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -129,7 +131,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="../ext_libs/libvorbis.lib"
 				LinkIncremental="2"
+				ModuleDefinitionFile=""
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
@@ -170,14 +174,6 @@
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
-			<File
-				RelativePath=".\in2.h"
-				>
-			</File>
-			<File
-				RelativePath=".\out.h"
-				>
-			</File>
 			<File
 				RelativePath=".\resource.h"
 				>