[xiph-commits] r14745 - in trunk/vorbis-tools/win32/VS2003: . oggdec oggenc ogginfo vcut vorbiscomment

sping at svn.xiph.org sping at svn.xiph.org
Tue Apr 15 16:52:56 PDT 2008 

Author: sping
Date: 2008-04-15 16:52:56 -0700 (Tue, 15 Apr 2008)
New Revision: 14745

Added:
   trunk/vorbis-tools/win32/VS2003/vcut/
   trunk/vorbis-tools/win32/VS2003/vcut/vcut.vcproj
   trunk/vorbis-tools/win32/VS2003/vorbis-tools.sln
Removed:
   trunk/vorbis-tools/win32/VS2003/oggenc/config.h
   trunk/vorbis-tools/win32/VS2003/vorbiscomment/config.h
Modified:
   trunk/vorbis-tools/win32/VS2003/
   trunk/vorbis-tools/win32/VS2003/oggdec/
   trunk/vorbis-tools/win32/VS2003/oggdec/oggdec.vcproj
   trunk/vorbis-tools/win32/VS2003/oggenc/
   trunk/vorbis-tools/win32/VS2003/oggenc/oggenc.vcproj
   trunk/vorbis-tools/win32/VS2003/ogginfo/
   trunk/vorbis-tools/win32/VS2003/ogginfo/ogginfo.vcproj
   trunk/vorbis-tools/win32/VS2003/vorbiscomment/
   trunk/vorbis-tools/win32/VS2003/vorbiscomment/vorbiscomment.vcproj
Log:
7/3 vorbis-tools: Consistent use of $(ConfigurationName) for vs2k3
vcut project
oggenc project fixes
config.h moved up to win32 (this will need a fix for vs2k5 in a minute)



Property changes on: trunk/vorbis-tools/win32/VS2003
___________________________________________________________________
Name: svn:ignore
   + debug
release
*.ncb
*.suo



Property changes on: trunk/vorbis-tools/win32/VS2003/oggdec
___________________________________________________________________
Name: svn:ignore
   + Debug
Release


Modified: trunk/vorbis-tools/win32/VS2003/oggdec/oggdec.vcproj
===================================================================
--- trunk/vorbis-tools/win32/VS2003/oggdec/oggdec.vcproj	2008-04-15 23:13:24 UTC (rev 14744)
+++ trunk/vorbis-tools/win32/VS2003/oggdec/oggdec.vcproj	2008-04-15 23:52:56 UTC (rev 14745)
@@ -12,15 +12,15 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="1"
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\libogg\include;..\..\..\include;..\..\..\..\libvorbis\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				AdditionalIncludeDirectories="..\..\..\..\libogg\include;..\..\..\include;..\..\..\..\libvorbis\include;..\.."
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -32,8 +32,10 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="libvorbisfile.lib"
 				OutputFile="$(OutDir)/oggdec.exe"
 				LinkIncremental="2"
+				AdditionalLibraryDirectories="..\..\..\..\libvorbis\win32\VS2003\$(ConfigurationName)"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile="$(OutDir)/oggdec.pdb"
 				SubSystem="1"
@@ -61,8 +63,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="1"
 			CharacterSet="2"
 			WholeProgramOptimization="TRUE">
@@ -74,8 +76,8 @@
 				EnableIntrinsicFunctions="TRUE"
 				FavorSizeOrSpeed="1"
 				OptimizeForProcessor="2"
-				AdditionalIncludeDirectories="..\..\..\..\libogg\include;..\..\..\include;..\..\..\..\libvorbis\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				AdditionalIncludeDirectories="..\..\..\..\libogg\include;..\..\..\include;..\..\..\..\libvorbis\include;..\.."
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -85,8 +87,10 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="libvorbisfile.lib"
 				OutputFile="$(OutDir)/oggdec.exe"
 				LinkIncremental="1"
+				AdditionalLibraryDirectories="..\..\..\..\libvorbis\win32\VS2003\$(ConfigurationName)"
 				GenerateDebugInformation="TRUE"
 				SubSystem="1"
 				OptimizeReferences="2"


Property changes on: trunk/vorbis-tools/win32/VS2003/oggenc
___________________________________________________________________
Name: svn:ignore
   + Debug
Release


Deleted: trunk/vorbis-tools/win32/VS2003/oggenc/config.h
===================================================================
--- trunk/vorbis-tools/win32/VS2003/oggenc/config.h	2008-04-15 23:13:24 UTC (rev 14744)
+++ trunk/vorbis-tools/win32/VS2003/oggenc/config.h	2008-04-15 23:52:56 UTC (rev 14745)
@@ -1,5 +0,0 @@
-#ifndef _CONFIG_H
-#define _CONFIG_H
-
-#define VERSION "1.2.0"
-#endif
\ No newline at end of file

Modified: trunk/vorbis-tools/win32/VS2003/oggenc/oggenc.vcproj
===================================================================
--- trunk/vorbis-tools/win32/VS2003/oggenc/oggenc.vcproj	2008-04-15 23:13:24 UTC (rev 14744)
+++ trunk/vorbis-tools/win32/VS2003/oggenc/oggenc.vcproj	2008-04-15 23:52:56 UTC (rev 14745)
@@ -12,14 +12,14 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="1"
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libvorbis\include;..\..\..\..\libogg\include;."
+				AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libvorbis\include;..\..\..\..\libogg\include;..\..\..\..\flac\include;..\.."
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -32,8 +32,10 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="libogg.lib libvorbis.lib libFlac.lib"
 				OutputFile="$(OutDir)/oggenc.exe"
 				LinkIncremental="2"
+				AdditionalLibraryDirectories="..\..\..\..\libogg\win32\VS2003\$(ConfigurationName);..\..\..\..\libvorbis\win32\VS2003\$(ConfigurationName);..\..\..\..\flac\obj\$(ConfigurationName)\lib"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile="$(OutDir)/oggenc.pdb"
 				SubSystem="1"
@@ -61,8 +63,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="1"
 			CharacterSet="2"
 			WholeProgramOptimization="TRUE">
@@ -73,7 +75,7 @@
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="1"
 				OptimizeForProcessor="2"
-				AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libvorbis\include;..\..\..\..\libogg\include;."
+				AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libvorbis\include;..\..\..\..\libogg\include;..\..\..\..\flac\include;..\.."
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
@@ -84,8 +86,10 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="libogg.lib libvorbis.lib libFlac.lib"
 				OutputFile="$(OutDir)/oggenc.exe"
 				LinkIncremental="1"
+				AdditionalLibraryDirectories="..\..\..\..\libogg\win32\VS2003\$(ConfigurationName);..\..\..\..\libvorbis\win32\VS2003\$(ConfigurationName);..\..\..\..\flac\obj\$(ConfigurationName)\lib"
 				GenerateDebugInformation="TRUE"
 				SubSystem="1"
 				OptimizeReferences="2"
@@ -125,9 +129,15 @@
 				RelativePath="..\..\..\oggenc\audio.c">
 			</File>
 			<File
+				RelativePath="..\..\..\oggenc\easyflac.c">
+			</File>
+			<File
 				RelativePath="..\..\..\oggenc\encode.c">
 			</File>
 			<File
+				RelativePath="..\..\..\oggenc\flac.c">
+			</File>
+			<File
 				RelativePath="..\..\..\share\getopt.c">
 			</File>
 			<File
@@ -143,6 +153,9 @@
 				RelativePath="..\..\..\oggenc\resample.c">
 			</File>
 			<File
+				RelativePath="..\..\..\oggenc\skeleton.c">
+			</File>
+			<File
 				RelativePath="..\..\..\share\utf8.c">
 			</File>
 		</Filter>
@@ -171,6 +184,9 @@
 			<File
 				RelativePath="..\..\..\oggenc\resample.h">
 			</File>
+			<File
+				RelativePath="..\..\..\oggenc\skeleton.h">
+			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"


Property changes on: trunk/vorbis-tools/win32/VS2003/ogginfo
___________________________________________________________________
Name: svn:ignore
   + Debug
Release


Modified: trunk/vorbis-tools/win32/VS2003/ogginfo/ogginfo.vcproj
===================================================================
--- trunk/vorbis-tools/win32/VS2003/ogginfo/ogginfo.vcproj	2008-04-15 23:13:24 UTC (rev 14744)
+++ trunk/vorbis-tools/win32/VS2003/ogginfo/ogginfo.vcproj	2008-04-15 23:52:56 UTC (rev 14745)
@@ -12,15 +12,15 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="1"
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\libogg\include;..\..\..\include;..\..\..\..\libvorbis\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				AdditionalIncludeDirectories="..\..\..\..\libogg\include;..\..\..\include;..\..\..\..\libvorbis\include;..\.."
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -32,8 +32,10 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="libogg.lib libvorbis.lib"
 				OutputFile="$(OutDir)/ogginfo.exe"
 				LinkIncremental="2"
+				AdditionalLibraryDirectories="..\..\..\..\libogg\win32\VS2003\$(ConfigurationName);..\..\..\..\libvorbis\win32\VS2003\$(ConfigurationName)"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile="$(OutDir)/ogginfo.pdb"
 				SubSystem="1"
@@ -61,8 +63,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="1"
 			CharacterSet="2"
 			WholeProgramOptimization="TRUE">
@@ -74,8 +76,8 @@
 				EnableIntrinsicFunctions="FALSE"
 				FavorSizeOrSpeed="1"
 				OptimizeForProcessor="2"
-				AdditionalIncludeDirectories="..\..\..\..\libogg\include;..\..\..\include;..\..\..\..\libvorbis\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				AdditionalIncludeDirectories="..\..\..\..\libogg\include;..\..\..\include;..\..\..\..\libvorbis\include;..\.."
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -85,8 +87,10 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="libogg.lib libvorbis.lib"
 				OutputFile="$(OutDir)/ogginfo.exe"
 				LinkIncremental="1"
+				AdditionalLibraryDirectories="..\..\..\..\libogg\win32\VS2003\$(ConfigurationName);..\..\..\..\libvorbis\win32\VS2003\$(ConfigurationName)"
 				GenerateDebugInformation="TRUE"
 				SubSystem="1"
 				OptimizeReferences="2"


Property changes on: trunk/vorbis-tools/win32/VS2003/vcut
___________________________________________________________________
Name: svn:ignore
   + Debug
Release


Added: trunk/vorbis-tools/win32/VS2003/vcut/vcut.vcproj
===================================================================
--- trunk/vorbis-tools/win32/VS2003/vcut/vcut.vcproj	                        (rev 0)
+++ trunk/vorbis-tools/win32/VS2003/vcut/vcut.vcproj	2008-04-15 23:52:56 UTC (rev 14745)
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="vcut"
+	ProjectGUID="{7691D0F6-A15F-4F9C-B529-9A9224CEFA48}"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\..\libogg\include;..\..\..\include;..\..\..\..\libvorbis\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="5"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="4"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libogg.lib libvorbis.lib"
+				OutputFile="$(OutDir)/vcut.exe"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="..\..\..\..\libogg\win32\VS2003\$(ConfigurationName);..\..\..\..\libvorbis\win32\VS2003\$(ConfigurationName)"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)/vcut.pdb"
+				SubSystem="1"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\..\..\..\libogg\include;..\..\..\include;..\..\..\..\libvorbis\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="4"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libogg.lib libvorbis.lib"
+				OutputFile="$(OutDir)/vcut.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="..\..\..\..\libogg\win32\VS2003\$(ConfigurationName);..\..\..\..\libvorbis\win32\VS2003\$(ConfigurationName)"
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+			<File
+				RelativePath="..\..\..\vcut\vcut.c">
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+			<File
+				RelativePath="..\..\..\vcut\vcut.h">
+			</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>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

Added: trunk/vorbis-tools/win32/VS2003/vorbis-tools.sln
===================================================================
--- trunk/vorbis-tools/win32/VS2003/vorbis-tools.sln	                        (rev 0)
+++ trunk/vorbis-tools/win32/VS2003/vorbis-tools.sln	2008-04-15 23:52:56 UTC (rev 14745)
@@ -0,0 +1,53 @@
+Microsoft Visual Studio Solution File, Format Version 8.00
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vorbiscomment", "vorbiscomment\vorbiscomment.vcproj", "{851A5E6A-C2D8-44C4-A7AC-A5F7E2001FA9}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "oggdec", "oggdec\oggdec.vcproj", "{D01454C5-2C94-45E1-917C-1C5CBC6990A0}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "oggenc", "oggenc\oggenc.vcproj", "{10DA267E-7738-4E7E-9C31-9D0DF49A0B96}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ogginfo", "ogginfo\ogginfo.vcproj", "{D60948A2-4781-435B-9609-786C0B564DBD}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vcut", "vcut\vcut.vcproj", "{7691D0F6-A15F-4F9C-B529-9A9224CEFA48}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfiguration) = preSolution
+		Debug = Debug
+		Release = Release
+	EndGlobalSection
+	GlobalSection(ProjectConfiguration) = postSolution
+		{851A5E6A-C2D8-44C4-A7AC-A5F7E2001FA9}.Debug.ActiveCfg = Debug|Win32
+		{851A5E6A-C2D8-44C4-A7AC-A5F7E2001FA9}.Debug.Build.0 = Debug|Win32
+		{851A5E6A-C2D8-44C4-A7AC-A5F7E2001FA9}.Release.ActiveCfg = Release|Win32
+		{851A5E6A-C2D8-44C4-A7AC-A5F7E2001FA9}.Release.Build.0 = Release|Win32
+		{D01454C5-2C94-45E1-917C-1C5CBC6990A0}.Debug.ActiveCfg = Debug|Win32
+		{D01454C5-2C94-45E1-917C-1C5CBC6990A0}.Debug.Build.0 = Debug|Win32
+		{D01454C5-2C94-45E1-917C-1C5CBC6990A0}.Release.ActiveCfg = Release|Win32
+		{D01454C5-2C94-45E1-917C-1C5CBC6990A0}.Release.Build.0 = Release|Win32
+		{10DA267E-7738-4E7E-9C31-9D0DF49A0B96}.Debug.ActiveCfg = Debug|Win32
+		{10DA267E-7738-4E7E-9C31-9D0DF49A0B96}.Debug.Build.0 = Debug|Win32
+		{10DA267E-7738-4E7E-9C31-9D0DF49A0B96}.Release.ActiveCfg = Release|Win32
+		{10DA267E-7738-4E7E-9C31-9D0DF49A0B96}.Release.Build.0 = Release|Win32
+		{D60948A2-4781-435B-9609-786C0B564DBD}.Debug.ActiveCfg = Debug|Win32
+		{D60948A2-4781-435B-9609-786C0B564DBD}.Debug.Build.0 = Debug|Win32
+		{D60948A2-4781-435B-9609-786C0B564DBD}.Release.ActiveCfg = Release|Win32
+		{D60948A2-4781-435B-9609-786C0B564DBD}.Release.Build.0 = Release|Win32
+		{7691D0F6-A15F-4F9C-B529-9A9224CEFA48}.Debug.ActiveCfg = Debug|Win32
+		{7691D0F6-A15F-4F9C-B529-9A9224CEFA48}.Debug.Build.0 = Debug|Win32
+		{7691D0F6-A15F-4F9C-B529-9A9224CEFA48}.Release.ActiveCfg = Release|Win32
+		{7691D0F6-A15F-4F9C-B529-9A9224CEFA48}.Release.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+	EndGlobalSection
+	GlobalSection(ExtensibilityAddIns) = postSolution
+	EndGlobalSection
+EndGlobal


Property changes on: trunk/vorbis-tools/win32/VS2003/vorbiscomment
___________________________________________________________________
Name: svn:ignore
   + Debug
Release
*.ncb


Deleted: trunk/vorbis-tools/win32/VS2003/vorbiscomment/config.h
===================================================================
--- trunk/vorbis-tools/win32/VS2003/vorbiscomment/config.h	2008-04-15 23:13:24 UTC (rev 14744)
+++ trunk/vorbis-tools/win32/VS2003/vorbiscomment/config.h	2008-04-15 23:52:56 UTC (rev 14745)
@@ -1,5 +0,0 @@
-#ifndef _CONFIG_H
-#define _CONFIG_H
-
-#define VERSION "1.2.0"
-#endif
\ No newline at end of file

Modified: trunk/vorbis-tools/win32/VS2003/vorbiscomment/vorbiscomment.vcproj
===================================================================
--- trunk/vorbis-tools/win32/VS2003/vorbiscomment/vorbiscomment.vcproj	2008-04-15 23:13:24 UTC (rev 14744)
+++ trunk/vorbis-tools/win32/VS2003/vorbiscomment/vorbiscomment.vcproj	2008-04-15 23:52:56 UTC (rev 14745)
@@ -12,14 +12,14 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="1"
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\libogg\include;..\..\..\include;..\..\..\..\libvorbis\include;."
+				AdditionalIncludeDirectories="..\..\..\..\libogg\include;..\..\..\include;..\..\..\..\libvorbis\include;..\.."
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -32,8 +32,10 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="libogg.lib libvorbis.lib"
 				OutputFile="$(OutDir)/vorbiscomment.exe"
 				LinkIncremental="2"
+				AdditionalLibraryDirectories="..\..\..\..\libogg\win32\VS2003\$(ConfigurationName);..\..\..\..\libvorbis\win32\VS2003\$(ConfigurationName)"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile="$(OutDir)/vorbiscomment.pdb"
 				SubSystem="1"
@@ -61,8 +63,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="1"
 			CharacterSet="2"
 			WholeProgramOptimization="TRUE">
@@ -72,7 +74,7 @@
 				GlobalOptimizations="TRUE"
 				FavorSizeOrSpeed="1"
 				OptimizeForProcessor="2"
-				AdditionalIncludeDirectories="..\..\..\..\libogg\include;..\..\..\include;..\..\..\..\libvorbis\include;."
+				AdditionalIncludeDirectories="..\..\..\..\libogg\include;..\..\..\include;..\..\..\..\libvorbis\include;..\.."
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
@@ -83,8 +85,10 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="libogg.lib libvorbis.lib"
 				OutputFile="$(OutDir)/vorbiscomment.exe"
 				LinkIncremental="1"
+				AdditionalLibraryDirectories="..\..\..\..\libogg\win32\VS2003\$(ConfigurationName);..\..\..\..\libvorbis\win32\VS2003\$(ConfigurationName)"
 				GenerateDebugInformation="TRUE"
 				SubSystem="1"
 				OptimizeReferences="2"

More information about the commits mailing list