[xiph-commits] r13494 - trunk/ezstream/win32

[moritz at svn.xiph.org]

Author: moritz
Date: 2007-08-09 04:13:38 -0700 (Thu, 09 Aug 2007)
New Revision: 13494

Modified:
   trunk/ezstream/win32/ezstream.sln
   trunk/ezstream/win32/ezstream.vcproj
Log:
More build tweaks. The only thing that still doesn't work by now is building
a static, thread-safe libshout. Bugger all, this can wait until if/when I need
threads.


Modified: trunk/ezstream/win32/ezstream.sln
===================================================================
--- trunk/ezstream/win32/ezstream.sln	2007-08-09 06:37:41 UTC (rev 13493)
+++ trunk/ezstream/win32/ezstream.sln	2007-08-09 11:13:38 UTC (rev 13494)
@@ -10,29 +10,39 @@
 		{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}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtheora", "..\..\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}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libvorbisfile", "..\..\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}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libvorbis", "..\..\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}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libogg", "..\..\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
+		{C6320F61-2939-4C52-A749-933377C12DEA} = {C6320F61-2939-4C52-A749-933377C12DEA}
+		{12329AC8-F4EC-4663-AEE2-93911D033E97} = {12329AC8-F4EC-4663-AEE2-93911D033E97}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\..\zlib\win32\zlib.vcproj", "{C6320F61-2939-4C52-A749-933377C12DEA}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libiconv", "..\..\libiconv\win32\libiconv.vcproj", "{12329AC8-F4EC-4663-AEE2-93911D033E97}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfiguration) = preSolution
 		Debug = Debug
@@ -67,6 +77,14 @@
 		{3E590C94-A4E0-4E79-839E-A7263F3CA6B1}.Debug.Build.0 = Debug|Win32
 		{3E590C94-A4E0-4E79-839E-A7263F3CA6B1}.Release.ActiveCfg = Release|Win32
 		{3E590C94-A4E0-4E79-839E-A7263F3CA6B1}.Release.Build.0 = Release|Win32
+		{C6320F61-2939-4C52-A749-933377C12DEA}.Debug.ActiveCfg = Debug|Win32
+		{C6320F61-2939-4C52-A749-933377C12DEA}.Debug.Build.0 = Debug|Win32
+		{C6320F61-2939-4C52-A749-933377C12DEA}.Release.ActiveCfg = Release|Win32
+		{C6320F61-2939-4C52-A749-933377C12DEA}.Release.Build.0 = Release|Win32
+		{12329AC8-F4EC-4663-AEE2-93911D033E97}.Debug.ActiveCfg = Debug|Win32
+		{12329AC8-F4EC-4663-AEE2-93911D033E97}.Debug.Build.0 = Debug|Win32
+		{12329AC8-F4EC-4663-AEE2-93911D033E97}.Release.ActiveCfg = Release|Win32
+		{12329AC8-F4EC-4663-AEE2-93911D033E97}.Release.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection

Modified: trunk/ezstream/win32/ezstream.vcproj
===================================================================
--- trunk/ezstream/win32/ezstream.vcproj	2007-08-09 06:37:41 UTC (rev 13493)
+++ trunk/ezstream/win32/ezstream.vcproj	2007-08-09 11:13:38 UTC (rev 13494)
@@ -4,6 +4,7 @@
 	Version="7.10"
 	Name="ezstream"
 	ProjectGUID="{4C27B249-0C17-4007-9D51-2ED145DF06C2}"
+	RootNamespace="ezstream"
 	SccProjectName=""
 	SccLocalPath="">
 	<Platforms>
@@ -26,7 +27,7 @@
 				GlobalOptimizations="TRUE"
 				InlineFunctionExpansion="1"
 				ImproveFloatingPointConsistency="TRUE"
-				AdditionalIncludeDirectories="../../ogg/include;../../vorbis/include;../../shout/include;../src;../../libxml2/include;.;../compat"
+				AdditionalIncludeDirectories="../../ogg/include;../../vorbis/include;../../shout/include;../src;../../libxml2/include;../../libiconv/include;.;../compat"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H"
 				StringPooling="TRUE"
 				ExceptionHandling="FALSE"
@@ -94,7 +95,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				ImproveFloatingPointConsistency="TRUE"
-				AdditionalIncludeDirectories="../../ogg/include;../../vorbis/include;../../shout/include;../src;../../libxml2/include;.;../compat"
+				AdditionalIncludeDirectories="../../ogg/include;../../vorbis/include;../../shout/include;../src;../../libxml2/include;../../libiconv/include;.;../compat"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H;XALLOC_DEBUG"
 				ExceptionHandling="FALSE"
 				BasicRuntimeChecks="3"
@@ -122,7 +123,7 @@
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories=""
 				IgnoreAllDefaultLibraries="FALSE"
-				IgnoreDefaultLibraryNames="LIBCMTD.lib"
+				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile=".\Debug/ezstream.pdb"
 				SubSystem="1"