From 4ca02d0ee8d9430a1f22e11817d0546859e7b83e Mon Sep 17 00:00:00 2001
From: moritz <moritz@0101bb08-14d6-0310-b084-bc0e0c8e3800>
Date: Wed, 8 Aug 2007 21:33:38 +0000
Subject: [PATCH] More Win32 project and build cleanups.

git-svn-id: https://svn.xiph.org/trunk/ezstream@13466 0101bb08-14d6-0310-b084-bc0e0c8e3800
---
 win32/config.h        |   7 +-
 win32/ezstream.sln    | 216 +++++++++---------------------------------
 win32/ezstream.vcproj |  55 ++++++-----
 3 files changed, 82 insertions(+), 196 deletions(-)

diff --git a/win32/config.h b/win32/config.h
index ed58137..280c272 100644
--- a/win32/config.h
+++ b/win32/config.h
@@ -1,5 +1,6 @@
-#include <windows.h>
 #include <sys/types.h>
+#include <windows.h>
+#include <io.h>
 
 #define HAVE_INTTYPES_H 1
 #define HAVE_STAT 1
@@ -29,3 +30,7 @@
 
 /* Version number of package */
 #define VERSION "0.4.4"
+
+#ifdef XALLOC_DEBUG
+typedef long ssize_t;
+#endif
diff --git a/win32/ezstream.sln b/win32/ezstream.sln
index c052e26..73e426c 100644
--- a/win32/ezstream.sln
+++ b/win32/ezstream.sln
@@ -1,40 +1,34 @@
 Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ezstream", "ezstream.vcproj", "{4C27B249-0C17-4007-9D51-2ED145DF06C2}"
-	ProjectSection(ProjectDependencies) = postProject
-		{5E55AD4D-483E-466D-B3B7-EAD8B6128DC9} = {5E55AD4D-483E-466D-B3B7-EAD8B6128DC9}
-		{376BDB5E-7092-44EC-AF16-C087D2D80FC6} = {376BDB5E-7092-44EC-AF16-C087D2D80FC6}
-		{3E590C94-A4E0-4E79-839E-A7263F3CA6B1} = {3E590C94-A4E0-4E79-839E-A7263F3CA6B1}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libshout", "..\..\shout\win32\libshout.vcproj", "{376BDB5E-7092-44EC-AF16-C087D2D80FC6}"
-	ProjectSection(ProjectDependencies) = postProject
-		{5E55AD4D-483E-466D-B3B7-EAD8B6128DC9} = {5E55AD4D-483E-466D-B3B7-EAD8B6128DC9}
-		{FB2ECA7B-D98C-4341-84B7-005E037E25A7} = {FB2ECA7B-D98C-4341-84B7-005E037E25A7}
-		{63A539B9-C6CD-4DC9-80B2-B28DB92C151E} = {63A539B9-C6CD-4DC9-80B2-B28DB92C151E}
-		{A0144DD0-0064-46CF-93D3-78DB712034D4} = {A0144DD0-0064-46CF-93D3-78DB712034D4}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "theora_static", "..\..\theora\win32\theora_static.vcproj", "{63A539B9-C6CD-4DC9-80B2-B28DB92C151E}"
-	ProjectSection(ProjectDependencies) = postProject
-		{5E55AD4D-483E-466D-B3B7-EAD8B6128DC9} = {5E55AD4D-483E-466D-B3B7-EAD8B6128DC9}
-		{FB2ECA7B-D98C-4341-84B7-005E037E25A7} = {FB2ECA7B-D98C-4341-84B7-005E037E25A7}
-		{A0144DD0-0064-46CF-93D3-78DB712034D4} = {A0144DD0-0064-46CF-93D3-78DB712034D4}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vorbisfile_static", "..\..\vorbis\win32\vorbisfile_static.vcproj", "{5E55AD4D-483E-466D-B3B7-EAD8B6128DC9}"
-	ProjectSection(ProjectDependencies) = postProject
-		{FB2ECA7B-D98C-4341-84B7-005E037E25A7} = {FB2ECA7B-D98C-4341-84B7-005E037E25A7}
-	EndProjectSection
-EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ezstream", "ezstream.vcproj", "{4C27B249-0C17-4007-9D51-2ED145DF06C2}"
+	ProjectSection(ProjectDependencies) = postProject
+		{376BDB5E-7092-44EC-AF16-C087D2D80FC6} = {376BDB5E-7092-44EC-AF16-C087D2D80FC6}
+		{3E590C94-A4E0-4E79-839E-A7263F3CA6B1} = {3E590C94-A4E0-4E79-839E-A7263F3CA6B1}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libshout", "..\..\shout\win32\libshout.vcproj", "{376BDB5E-7092-44EC-AF16-C087D2D80FC6}"
+	ProjectSection(ProjectDependencies) = postProject
+		{63A539B9-C6CD-4DC9-80B2-B28DB92C151E} = {63A539B9-C6CD-4DC9-80B2-B28DB92C151E}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "theora_static", "..\..\theora\win32\theora_static.vcproj", "{63A539B9-C6CD-4DC9-80B2-B28DB92C151E}"
+	ProjectSection(ProjectDependencies) = postProject
+		{5E55AD4D-483E-466D-B3B7-EAD8B6128DC9} = {5E55AD4D-483E-466D-B3B7-EAD8B6128DC9}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vorbisfile_static", "..\..\vorbis\win32\vorbisfile_static.vcproj", "{5E55AD4D-483E-466D-B3B7-EAD8B6128DC9}"
+	ProjectSection(ProjectDependencies) = postProject
+		{FB2ECA7B-D98C-4341-84B7-005E037E25A7} = {FB2ECA7B-D98C-4341-84B7-005E037E25A7}
+	EndProjectSection
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vorbis_static", "..\..\vorbis\win32\vorbis_static.vcproj", "{FB2ECA7B-D98C-4341-84B7-005E037E25A7}"
 	ProjectSection(ProjectDependencies) = postProject
 		{A0144DD0-0064-46CF-93D3-78DB712034D4} = {A0144DD0-0064-46CF-93D3-78DB712034D4}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ogg_static", "..\..\ogg\win32\ogg_static.vcproj", "{A0144DD0-0064-46CF-93D3-78DB712034D4}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ogg_static", "..\..\ogg\win32\ogg_static.vcproj", "{A0144DD0-0064-46CF-93D3-78DB712034D4}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxml2", "..\..\libxml2\win32\VC7\libxml2.vcproj", "{3E590C94-A4E0-4E79-839E-A7263F3CA6B1}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
@@ -42,155 +36,35 @@ EndProject
 Global
 	GlobalSection(SolutionConfiguration) = preSolution
 		Debug = Debug
-		DLL ASM Debug = DLL ASM Debug
-		DLL ASM Release = DLL ASM Release
-		DLL Debug = DLL Debug
-		DLL Release = DLL Release
-		LIB ASM Debug = LIB ASM Debug
-		LIB ASM Release = LIB ASM Release
-		LIB Debug = LIB Debug
-		LIB Release = LIB Release
 		Release = Release
 	EndGlobalSection
 	GlobalSection(ProjectConfiguration) = postSolution
-		{A0144DD0-0064-46CF-93D3-78DB712034D4}.Debug.ActiveCfg = Debug|Win32
-		{A0144DD0-0064-46CF-93D3-78DB712034D4}.Debug.Build.0 = Debug|Win32
-		{A0144DD0-0064-46CF-93D3-78DB712034D4}.DLL ASM Debug.ActiveCfg = Debug|Win32
-		{A0144DD0-0064-46CF-93D3-78DB712034D4}.DLL ASM Debug.Build.0 = Debug|Win32
-		{A0144DD0-0064-46CF-93D3-78DB712034D4}.DLL ASM Release.ActiveCfg = Release|Win32
-		{A0144DD0-0064-46CF-93D3-78DB712034D4}.DLL ASM Release.Build.0 = Release|Win32
-		{A0144DD0-0064-46CF-93D3-78DB712034D4}.DLL Debug.ActiveCfg = Debug|Win32
-		{A0144DD0-0064-46CF-93D3-78DB712034D4}.DLL Debug.Build.0 = Debug|Win32
-		{A0144DD0-0064-46CF-93D3-78DB712034D4}.DLL Release.ActiveCfg = Release|Win32
-		{A0144DD0-0064-46CF-93D3-78DB712034D4}.DLL Release.Build.0 = Release|Win32
-		{A0144DD0-0064-46CF-93D3-78DB712034D4}.LIB ASM Debug.ActiveCfg = Debug|Win32
-		{A0144DD0-0064-46CF-93D3-78DB712034D4}.LIB ASM Debug.Build.0 = Debug|Win32
-		{A0144DD0-0064-46CF-93D3-78DB712034D4}.LIB ASM Release.ActiveCfg = Release|Win32
-		{A0144DD0-0064-46CF-93D3-78DB712034D4}.LIB ASM Release.Build.0 = Release|Win32
-		{A0144DD0-0064-46CF-93D3-78DB712034D4}.LIB Debug.ActiveCfg = Debug|Win32
-		{A0144DD0-0064-46CF-93D3-78DB712034D4}.LIB Debug.Build.0 = Debug|Win32
-		{A0144DD0-0064-46CF-93D3-78DB712034D4}.LIB Release.ActiveCfg = Release|Win32
-		{A0144DD0-0064-46CF-93D3-78DB712034D4}.LIB Release.Build.0 = Release|Win32
-		{A0144DD0-0064-46CF-93D3-78DB712034D4}.Release.ActiveCfg = Release|Win32
-		{A0144DD0-0064-46CF-93D3-78DB712034D4}.Release.Build.0 = Release|Win32
-		{FB2ECA7B-D98C-4341-84B7-005E037E25A7}.Debug.ActiveCfg = Debug|Win32
-		{FB2ECA7B-D98C-4341-84B7-005E037E25A7}.Debug.Build.0 = Debug|Win32
-		{FB2ECA7B-D98C-4341-84B7-005E037E25A7}.DLL ASM Debug.ActiveCfg = Debug|Win32
-		{FB2ECA7B-D98C-4341-84B7-005E037E25A7}.DLL ASM Debug.Build.0 = Debug|Win32
-		{FB2ECA7B-D98C-4341-84B7-005E037E25A7}.DLL ASM Release.ActiveCfg = Release|Win32
-		{FB2ECA7B-D98C-4341-84B7-005E037E25A7}.DLL ASM Release.Build.0 = Release|Win32
-		{FB2ECA7B-D98C-4341-84B7-005E037E25A7}.DLL Debug.ActiveCfg = Debug|Win32
-		{FB2ECA7B-D98C-4341-84B7-005E037E25A7}.DLL Debug.Build.0 = Debug|Win32
-		{FB2ECA7B-D98C-4341-84B7-005E037E25A7}.DLL Release.ActiveCfg = Release|Win32
-		{FB2ECA7B-D98C-4341-84B7-005E037E25A7}.DLL Release.Build.0 = Release|Win32
-		{FB2ECA7B-D98C-4341-84B7-005E037E25A7}.LIB ASM Debug.ActiveCfg = Debug|Win32
-		{FB2ECA7B-D98C-4341-84B7-005E037E25A7}.LIB ASM Debug.Build.0 = Debug|Win32
-		{FB2ECA7B-D98C-4341-84B7-005E037E25A7}.LIB ASM Release.ActiveCfg = Release|Win32
-		{FB2ECA7B-D98C-4341-84B7-005E037E25A7}.LIB ASM Release.Build.0 = Release|Win32
-		{FB2ECA7B-D98C-4341-84B7-005E037E25A7}.LIB Debug.ActiveCfg = Debug|Win32
-		{FB2ECA7B-D98C-4341-84B7-005E037E25A7}.LIB Debug.Build.0 = Debug|Win32
-		{FB2ECA7B-D98C-4341-84B7-005E037E25A7}.LIB Release.ActiveCfg = Release|Win32
-		{FB2ECA7B-D98C-4341-84B7-005E037E25A7}.LIB Release.Build.0 = Release|Win32
-		{FB2ECA7B-D98C-4341-84B7-005E037E25A7}.Release.ActiveCfg = Release|Win32
-		{FB2ECA7B-D98C-4341-84B7-005E037E25A7}.Release.Build.0 = Release|Win32
-		{5E55AD4D-483E-466D-B3B7-EAD8B6128DC9}.Debug.ActiveCfg = Debug|Win32
-		{5E55AD4D-483E-466D-B3B7-EAD8B6128DC9}.Debug.Build.0 = Debug|Win32
-		{5E55AD4D-483E-466D-B3B7-EAD8B6128DC9}.DLL ASM Debug.ActiveCfg = Debug|Win32
-		{5E55AD4D-483E-466D-B3B7-EAD8B6128DC9}.DLL ASM Debug.Build.0 = Debug|Win32
-		{5E55AD4D-483E-466D-B3B7-EAD8B6128DC9}.DLL ASM Release.ActiveCfg = Release|Win32
-		{5E55AD4D-483E-466D-B3B7-EAD8B6128DC9}.DLL ASM Release.Build.0 = Release|Win32
-		{5E55AD4D-483E-466D-B3B7-EAD8B6128DC9}.DLL Debug.ActiveCfg = Debug|Win32
-		{5E55AD4D-483E-466D-B3B7-EAD8B6128DC9}.DLL Debug.Build.0 = Debug|Win32
-		{5E55AD4D-483E-466D-B3B7-EAD8B6128DC9}.DLL Release.ActiveCfg = Release|Win32
-		{5E55AD4D-483E-466D-B3B7-EAD8B6128DC9}.DLL Release.Build.0 = Release|Win32
-		{5E55AD4D-483E-466D-B3B7-EAD8B6128DC9}.LIB ASM Debug.ActiveCfg = Debug|Win32
-		{5E55AD4D-483E-466D-B3B7-EAD8B6128DC9}.LIB ASM Debug.Build.0 = Debug|Win32
-		{5E55AD4D-483E-466D-B3B7-EAD8B6128DC9}.LIB ASM Release.ActiveCfg = Release|Win32
-		{5E55AD4D-483E-466D-B3B7-EAD8B6128DC9}.LIB ASM Release.Build.0 = Release|Win32
-		{5E55AD4D-483E-466D-B3B7-EAD8B6128DC9}.LIB Debug.ActiveCfg = Debug|Win32
-		{5E55AD4D-483E-466D-B3B7-EAD8B6128DC9}.LIB Debug.Build.0 = Debug|Win32
-		{5E55AD4D-483E-466D-B3B7-EAD8B6128DC9}.LIB Release.ActiveCfg = Release|Win32
-		{5E55AD4D-483E-466D-B3B7-EAD8B6128DC9}.LIB Release.Build.0 = Release|Win32
-		{5E55AD4D-483E-466D-B3B7-EAD8B6128DC9}.Release.ActiveCfg = Release|Win32
-		{5E55AD4D-483E-466D-B3B7-EAD8B6128DC9}.Release.Build.0 = Release|Win32
-		{63A539B9-C6CD-4DC9-80B2-B28DB92C151E}.Debug.ActiveCfg = Debug|Win32
-		{63A539B9-C6CD-4DC9-80B2-B28DB92C151E}.Debug.Build.0 = Debug|Win32
-		{63A539B9-C6CD-4DC9-80B2-B28DB92C151E}.DLL ASM Debug.ActiveCfg = Debug|Win32
-		{63A539B9-C6CD-4DC9-80B2-B28DB92C151E}.DLL ASM Debug.Build.0 = Debug|Win32
-		{63A539B9-C6CD-4DC9-80B2-B28DB92C151E}.DLL ASM Release.ActiveCfg = Release|Win32
-		{63A539B9-C6CD-4DC9-80B2-B28DB92C151E}.DLL ASM Release.Build.0 = Release|Win32
-		{63A539B9-C6CD-4DC9-80B2-B28DB92C151E}.DLL Debug.ActiveCfg = Debug|Win32
-		{63A539B9-C6CD-4DC9-80B2-B28DB92C151E}.DLL Debug.Build.0 = Debug|Win32
-		{63A539B9-C6CD-4DC9-80B2-B28DB92C151E}.DLL Release.ActiveCfg = Release|Win32
-		{63A539B9-C6CD-4DC9-80B2-B28DB92C151E}.DLL Release.Build.0 = Release|Win32
-		{63A539B9-C6CD-4DC9-80B2-B28DB92C151E}.LIB ASM Debug.ActiveCfg = Debug|Win32
-		{63A539B9-C6CD-4DC9-80B2-B28DB92C151E}.LIB ASM Debug.Build.0 = Debug|Win32
-		{63A539B9-C6CD-4DC9-80B2-B28DB92C151E}.LIB ASM Release.ActiveCfg = Release|Win32
-		{63A539B9-C6CD-4DC9-80B2-B28DB92C151E}.LIB ASM Release.Build.0 = Release|Win32
-		{63A539B9-C6CD-4DC9-80B2-B28DB92C151E}.LIB Debug.ActiveCfg = Debug|Win32
-		{63A539B9-C6CD-4DC9-80B2-B28DB92C151E}.LIB Debug.Build.0 = Debug|Win32
-		{63A539B9-C6CD-4DC9-80B2-B28DB92C151E}.LIB Release.ActiveCfg = Release|Win32
-		{63A539B9-C6CD-4DC9-80B2-B28DB92C151E}.LIB Release.Build.0 = Release|Win32
-		{63A539B9-C6CD-4DC9-80B2-B28DB92C151E}.Release.ActiveCfg = Release|Win32
-		{63A539B9-C6CD-4DC9-80B2-B28DB92C151E}.Release.Build.0 = Release|Win32
-		{376BDB5E-7092-44EC-AF16-C087D2D80FC6}.Debug.ActiveCfg = Debug|Win32
-		{376BDB5E-7092-44EC-AF16-C087D2D80FC6}.Debug.Build.0 = Debug|Win32
-		{376BDB5E-7092-44EC-AF16-C087D2D80FC6}.DLL ASM Debug.ActiveCfg = Debug|Win32
-		{376BDB5E-7092-44EC-AF16-C087D2D80FC6}.DLL ASM Debug.Build.0 = Debug|Win32
-		{376BDB5E-7092-44EC-AF16-C087D2D80FC6}.DLL ASM Release.ActiveCfg = Release|Win32
-		{376BDB5E-7092-44EC-AF16-C087D2D80FC6}.DLL ASM Release.Build.0 = Release|Win32
-		{376BDB5E-7092-44EC-AF16-C087D2D80FC6}.DLL Debug.ActiveCfg = Debug|Win32
-		{376BDB5E-7092-44EC-AF16-C087D2D80FC6}.DLL Debug.Build.0 = Debug|Win32
-		{376BDB5E-7092-44EC-AF16-C087D2D80FC6}.DLL Release.ActiveCfg = Release|Win32
-		{376BDB5E-7092-44EC-AF16-C087D2D80FC6}.DLL Release.Build.0 = Release|Win32
-		{376BDB5E-7092-44EC-AF16-C087D2D80FC6}.LIB ASM Debug.ActiveCfg = Debug|Win32
-		{376BDB5E-7092-44EC-AF16-C087D2D80FC6}.LIB ASM Debug.Build.0 = Debug|Win32
-		{376BDB5E-7092-44EC-AF16-C087D2D80FC6}.LIB ASM Release.ActiveCfg = Release|Win32
-		{376BDB5E-7092-44EC-AF16-C087D2D80FC6}.LIB ASM Release.Build.0 = Release|Win32
-		{376BDB5E-7092-44EC-AF16-C087D2D80FC6}.LIB Debug.ActiveCfg = Debug|Win32
-		{376BDB5E-7092-44EC-AF16-C087D2D80FC6}.LIB Debug.Build.0 = Debug|Win32
-		{376BDB5E-7092-44EC-AF16-C087D2D80FC6}.LIB Release.ActiveCfg = Release|Win32
-		{376BDB5E-7092-44EC-AF16-C087D2D80FC6}.LIB Release.Build.0 = Release|Win32
-		{376BDB5E-7092-44EC-AF16-C087D2D80FC6}.Release.ActiveCfg = Release|Win32
-		{376BDB5E-7092-44EC-AF16-C087D2D80FC6}.Release.Build.0 = Release|Win32
 		{4C27B249-0C17-4007-9D51-2ED145DF06C2}.Debug.ActiveCfg = Debug|Win32
 		{4C27B249-0C17-4007-9D51-2ED145DF06C2}.Debug.Build.0 = Debug|Win32
-		{4C27B249-0C17-4007-9D51-2ED145DF06C2}.DLL ASM Debug.ActiveCfg = Debug|Win32
-		{4C27B249-0C17-4007-9D51-2ED145DF06C2}.DLL ASM Debug.Build.0 = Debug|Win32
-		{4C27B249-0C17-4007-9D51-2ED145DF06C2}.DLL ASM Release.ActiveCfg = Release|Win32
-		{4C27B249-0C17-4007-9D51-2ED145DF06C2}.DLL ASM Release.Build.0 = Release|Win32
-		{4C27B249-0C17-4007-9D51-2ED145DF06C2}.DLL Debug.ActiveCfg = Debug|Win32
-		{4C27B249-0C17-4007-9D51-2ED145DF06C2}.DLL Debug.Build.0 = Debug|Win32
-		{4C27B249-0C17-4007-9D51-2ED145DF06C2}.DLL Release.ActiveCfg = Release|Win32
-		{4C27B249-0C17-4007-9D51-2ED145DF06C2}.DLL Release.Build.0 = Release|Win32
-		{4C27B249-0C17-4007-9D51-2ED145DF06C2}.LIB ASM Debug.ActiveCfg = Debug|Win32
-		{4C27B249-0C17-4007-9D51-2ED145DF06C2}.LIB ASM Debug.Build.0 = Debug|Win32
-		{4C27B249-0C17-4007-9D51-2ED145DF06C2}.LIB ASM Release.ActiveCfg = Release|Win32
-		{4C27B249-0C17-4007-9D51-2ED145DF06C2}.LIB ASM Release.Build.0 = Release|Win32
-		{4C27B249-0C17-4007-9D51-2ED145DF06C2}.LIB Debug.ActiveCfg = Debug|Win32
-		{4C27B249-0C17-4007-9D51-2ED145DF06C2}.LIB Debug.Build.0 = Debug|Win32
-		{4C27B249-0C17-4007-9D51-2ED145DF06C2}.LIB Release.ActiveCfg = Release|Win32
-		{4C27B249-0C17-4007-9D51-2ED145DF06C2}.LIB Release.Build.0 = Release|Win32
 		{4C27B249-0C17-4007-9D51-2ED145DF06C2}.Release.ActiveCfg = Release|Win32
 		{4C27B249-0C17-4007-9D51-2ED145DF06C2}.Release.Build.0 = Release|Win32
+		{376BDB5E-7092-44EC-AF16-C087D2D80FC6}.Debug.ActiveCfg = Debug|Win32
+		{376BDB5E-7092-44EC-AF16-C087D2D80FC6}.Debug.Build.0 = Debug|Win32
+		{376BDB5E-7092-44EC-AF16-C087D2D80FC6}.Release.ActiveCfg = Release|Win32
+		{376BDB5E-7092-44EC-AF16-C087D2D80FC6}.Release.Build.0 = Release|Win32
+		{63A539B9-C6CD-4DC9-80B2-B28DB92C151E}.Debug.ActiveCfg = Debug|Win32
+		{63A539B9-C6CD-4DC9-80B2-B28DB92C151E}.Debug.Build.0 = Debug|Win32
+		{63A539B9-C6CD-4DC9-80B2-B28DB92C151E}.Release.ActiveCfg = Release|Win32
+		{63A539B9-C6CD-4DC9-80B2-B28DB92C151E}.Release.Build.0 = Release|Win32
+		{5E55AD4D-483E-466D-B3B7-EAD8B6128DC9}.Debug.ActiveCfg = Debug|Win32
+		{5E55AD4D-483E-466D-B3B7-EAD8B6128DC9}.Debug.Build.0 = Debug|Win32
+		{5E55AD4D-483E-466D-B3B7-EAD8B6128DC9}.Release.ActiveCfg = Release|Win32
+		{5E55AD4D-483E-466D-B3B7-EAD8B6128DC9}.Release.Build.0 = Release|Win32
+		{FB2ECA7B-D98C-4341-84B7-005E037E25A7}.Debug.ActiveCfg = Debug|Win32
+		{FB2ECA7B-D98C-4341-84B7-005E037E25A7}.Debug.Build.0 = Debug|Win32
+		{FB2ECA7B-D98C-4341-84B7-005E037E25A7}.Release.ActiveCfg = Release|Win32
+		{FB2ECA7B-D98C-4341-84B7-005E037E25A7}.Release.Build.0 = Release|Win32
+		{A0144DD0-0064-46CF-93D3-78DB712034D4}.Debug.ActiveCfg = Debug|Win32
+		{A0144DD0-0064-46CF-93D3-78DB712034D4}.Debug.Build.0 = Debug|Win32
+		{A0144DD0-0064-46CF-93D3-78DB712034D4}.Release.ActiveCfg = Release|Win32
+		{A0144DD0-0064-46CF-93D3-78DB712034D4}.Release.Build.0 = Release|Win32
 		{3E590C94-A4E0-4E79-839E-A7263F3CA6B1}.Debug.ActiveCfg = Debug|Win32
 		{3E590C94-A4E0-4E79-839E-A7263F3CA6B1}.Debug.Build.0 = Debug|Win32
-		{3E590C94-A4E0-4E79-839E-A7263F3CA6B1}.DLL ASM Debug.ActiveCfg = Debug|Win32
-		{3E590C94-A4E0-4E79-839E-A7263F3CA6B1}.DLL ASM Debug.Build.0 = Debug|Win32
-		{3E590C94-A4E0-4E79-839E-A7263F3CA6B1}.DLL ASM Release.ActiveCfg = Release|Win32
-		{3E590C94-A4E0-4E79-839E-A7263F3CA6B1}.DLL ASM Release.Build.0 = Release|Win32
-		{3E590C94-A4E0-4E79-839E-A7263F3CA6B1}.DLL Debug.ActiveCfg = Debug|Win32
-		{3E590C94-A4E0-4E79-839E-A7263F3CA6B1}.DLL Debug.Build.0 = Debug|Win32
-		{3E590C94-A4E0-4E79-839E-A7263F3CA6B1}.DLL Release.ActiveCfg = Release|Win32
-		{3E590C94-A4E0-4E79-839E-A7263F3CA6B1}.DLL Release.Build.0 = Release|Win32
-		{3E590C94-A4E0-4E79-839E-A7263F3CA6B1}.LIB ASM Debug.ActiveCfg = Debug|Win32
-		{3E590C94-A4E0-4E79-839E-A7263F3CA6B1}.LIB ASM Debug.Build.0 = Debug|Win32
-		{3E590C94-A4E0-4E79-839E-A7263F3CA6B1}.LIB ASM Release.ActiveCfg = Release|Win32
-		{3E590C94-A4E0-4E79-839E-A7263F3CA6B1}.LIB ASM Release.Build.0 = Release|Win32
-		{3E590C94-A4E0-4E79-839E-A7263F3CA6B1}.LIB Debug.ActiveCfg = Debug|Win32
-		{3E590C94-A4E0-4E79-839E-A7263F3CA6B1}.LIB Debug.Build.0 = Debug|Win32
-		{3E590C94-A4E0-4E79-839E-A7263F3CA6B1}.LIB Release.ActiveCfg = Release|Win32
-		{3E590C94-A4E0-4E79-839E-A7263F3CA6B1}.LIB Release.Build.0 = Release|Win32
 		{3E590C94-A4E0-4E79-839E-A7263F3CA6B1}.Release.ActiveCfg = Release|Win32
 		{3E590C94-A4E0-4E79-839E-A7263F3CA6B1}.Release.Build.0 = Release|Win32
 	EndGlobalSection
diff --git a/win32/ezstream.vcproj b/win32/ezstream.vcproj
index 08a209f..e8797fa 100644
--- a/win32/ezstream.vcproj
+++ b/win32/ezstream.vcproj
@@ -16,26 +16,29 @@
 			OutputDirectory=".\Release"
 			IntermediateDirectory=".\Release"
 			ConfigurationType="1"
-			UseOfMFC="1"
+			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			CharacterSet="2"
+			WholeProgramOptimization="TRUE">
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
+				GlobalOptimizations="TRUE"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../ogg/include;../../vorbis/include;../../shout/include;../src;../../libxml2/include;."
+				ImproveFloatingPointConsistency="TRUE"
+				AdditionalIncludeDirectories="../../ogg/include;../../vorbis/include;../../shout/include;../src;../../libxml2/include;.;../compat"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H"
 				StringPooling="TRUE"
 				ExceptionHandling="FALSE"
 				BasicRuntimeChecks="0"
-				RuntimeLibrary="4"
+				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="FALSE"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\Release/ezstream.pch"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile=""
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
 				ProgramDataBaseFileName=".\Release/"
-				WarningLevel="2"
+				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
 				CompileAs="0"/>
@@ -43,18 +46,17 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib libshout.lib ogg_static.lib vorbis_static.lib ws2_32.lib winmm.lib libxml2.lib vorbisfile_static.lib"
+				AdditionalDependencies="WS2_32.lib WinMM.lib"
 				OutputFile=".\Release/ezstream.exe"
-				LinkIncremental="1"
+				LinkIncremental="0"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="../../theora/win32/Static_Release,../../shout/win32/Release,../../ogg/win32/Static_Release,../../vorbis/win32/Vorbis_Static_Release,../../vorbis/win32/VorbisFile_Static_Release,../../libxml2/win32/VC7/Release"
-				IgnoreDefaultLibraryNames="libcmt.lib;msvcrt.lib;libcd.lib;libcmtd.lib;msvcrtd.lib"
+				AdditionalLibraryDirectories=""
+				IgnoreDefaultLibraryNames=""
 				ProgramDatabaseFile=".\Release/ezstream.pdb"
 				SubSystem="1"
 				LargeAddressAware="2"
 				SetChecksum="TRUE"
-				SupportUnloadOfDelayLoadedDLL="FALSE"
-				TargetMachine="1"/>
+				TargetMachine="0"/>
 			<Tool
 				Name="VCMIDLTool"
 				TypeLibraryName=".\Release/ezstream.tlb"
@@ -85,42 +87,47 @@
 			OutputDirectory=".\Debug"
 			IntermediateDirectory=".\Debug"
 			ConfigurationType="1"
-			UseOfMFC="1"
+			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../ogg/include,../../vorbis/include,../../shout/include,../src,../../libxml2/include"
+				ImproveFloatingPointConsistency="TRUE"
+				AdditionalIncludeDirectories="../../ogg/include;../../vorbis/include;../../shout/include;../src;../../libxml2/include;.;../compat"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H;XALLOC_DEBUG"
 				ExceptionHandling="FALSE"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="4"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
 				BufferSecurityCheck="TRUE"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\Debug/ezstream.pch"
+				EnableFunctionLevelLinking="TRUE"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderThrough=""
+				PrecompiledHeaderFile=""
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
 				ProgramDataBaseFileName=".\Debug/"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
 				DebugInformationFormat="4"
 				CompileAs="0"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib libshout.lib ogg_static_d.lib vorbis_static_d.lib pthreadVC2.lib ws2_32.lib winmm.lib libxml2.lib iconv.lib vorbisfile_static_d.lib"
+				AdditionalDependencies="WS2_32.lib WinMM.lib"
 				OutputFile=".\Debug/ezstream.exe"
-				LinkIncremental="2"
+				LinkIncremental="0"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="../../shout/win32/Debug,../../../lib,../../ogg/win32/Static_Debug,../../vorbis/win32/Vorbis_Static_Debug,../../vorbis/win32/VorbisFile_Static_Debug"
+				AdditionalLibraryDirectories=""
 				IgnoreAllDefaultLibraries="FALSE"
-				IgnoreDefaultLibraryNames="libc.lib;libcmt.lib;msvcrt.lib;libcd.lib;msvcrtd.lib"
+				IgnoreDefaultLibraryNames="LIBCMTD.lib"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile=".\Debug/ezstream.pdb"
 				SubSystem="1"
-				TargetMachine="1"/>
+				LargeAddressAware="2"
+				TargetMachine="0"/>
 			<Tool
 				Name="VCMIDLTool"
 				TypeLibraryName=".\Debug/ezstream.tlb"