[xiph-commits] r14744 - in trunk/vorbis/win32/VS2003: . libvorbis libvorbisfile vorbisdec vorbisenc
sping at svn.xiph.org
sping at svn.xiph.org
Tue Apr 15 16:13:24 PDT 2008
Author: sping
Date: 2008-04-15 16:13:24 -0700 (Tue, 15 Apr 2008)
New Revision: 14744
Modified:
trunk/vorbis/win32/VS2003/
trunk/vorbis/win32/VS2003/libvorbis/libvorbis.vcproj
trunk/vorbis/win32/VS2003/libvorbisfile/libvorbisfile.vcproj
trunk/vorbis/win32/VS2003/vorbis.sln
trunk/vorbis/win32/VS2003/vorbisdec/vorbisdec.vcproj
trunk/vorbis/win32/VS2003/vorbisenc/vorbisenc.vcproj
Log:
6/3 libvorbis: Consistent use of $(ConfigurationName) for vs2k3, SSE and SSE2 releases now have their own folders
Also fix project dependencies to build in a sensible order
Property changes on: trunk/vorbis/win32/VS2003
___________________________________________________________________
Name: svn:ignore
- debug
release
*.ncb
*.suo
+ debug
release*
*.ncb
*.suo
Modified: trunk/vorbis/win32/VS2003/libvorbis/libvorbis.vcproj
===================================================================
--- trunk/vorbis/win32/VS2003/libvorbis/libvorbis.vcproj 2008-04-15 23:11:32 UTC (rev 14743)
+++ trunk/vorbis/win32/VS2003/libvorbis/libvorbis.vcproj 2008-04-15 23:13:24 UTC (rev 14744)
@@ -12,8 +12,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="..\debug"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="2">
<Tool
@@ -36,7 +36,7 @@
AdditionalDependencies="libogg.lib"
OutputFile="$(OutDir)/libvorbis.dll"
LinkIncremental="2"
- AdditionalLibraryDirectories="..\..\..\..\libogg\win32\VS2003\debug"
+ AdditionalLibraryDirectories="..\..\..\..\libogg\win32\VS2003\$(ConfigurationName)"
ModuleDefinitionFile="..\..\vorbis.def"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="$(OutDir)/libvorbis.pdb"
@@ -66,8 +66,8 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="..\release"
- IntermediateDirectory="Release"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="2"
WholeProgramOptimization="TRUE">
@@ -98,7 +98,7 @@
AdditionalDependencies="libogg.lib"
OutputFile="$(OutDir)/libvorbis.dll"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\..\..\..\libogg\win32\VS2003\release"
+ AdditionalLibraryDirectories="..\..\..\..\libogg\win32\VS2003\$(ConfigurationName)"
ModuleDefinitionFile="..\..\vorbis.def"
GenerateDebugInformation="FALSE"
SubSystem="2"
@@ -130,7 +130,7 @@
</Configuration>
<Configuration
Name="Release_SSE|Win32"
- OutputDirectory="..\release"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="2"
@@ -163,7 +163,7 @@
AdditionalDependencies="libogg.lib"
OutputFile="$(OutDir)/libvorbis.dll"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\..\..\..\libogg\win32\VS2003\release"
+ AdditionalLibraryDirectories="..\..\..\..\libogg\win32\VS2003\$(ConfigurationName)"
ModuleDefinitionFile="..\..\vorbis.def"
GenerateDebugInformation="FALSE"
SubSystem="2"
@@ -195,7 +195,7 @@
</Configuration>
<Configuration
Name="Release_SSE2|Win32"
- OutputDirectory="..\release"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="2"
@@ -228,7 +228,7 @@
AdditionalDependencies="libogg.lib"
OutputFile="$(OutDir)/libvorbis.dll"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\..\..\..\libogg\win32\VS2003\release"
+ AdditionalLibraryDirectories="..\..\..\..\libogg\win32\VS2003\$(ConfigurationName)"
ModuleDefinitionFile="..\..\vorbis.def"
GenerateDebugInformation="FALSE"
SubSystem="2"
Modified: trunk/vorbis/win32/VS2003/libvorbisfile/libvorbisfile.vcproj
===================================================================
--- trunk/vorbis/win32/VS2003/libvorbisfile/libvorbisfile.vcproj 2008-04-15 23:11:32 UTC (rev 14743)
+++ trunk/vorbis/win32/VS2003/libvorbisfile/libvorbisfile.vcproj 2008-04-15 23:13:24 UTC (rev 14744)
@@ -12,8 +12,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="..\debug"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="2">
<Tool
@@ -35,7 +35,7 @@
AdditionalDependencies="libogg.lib libvorbis.lib"
OutputFile="$(OutDir)/libvorbisfile.dll"
LinkIncremental="2"
- AdditionalLibraryDirectories="..\..\..\..\libogg\win32\VS2003\debug;..\debug"
+ AdditionalLibraryDirectories="..\..\..\..\libogg\win32\VS2003\$(ConfigurationName);..\$(ConfigurationName)"
ModuleDefinitionFile="libvorbisfile.def"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="$(OutDir)/libvorbisfile.pdb"
@@ -65,8 +65,8 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="..\release"
- IntermediateDirectory="Release"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="2">
<Tool
@@ -85,7 +85,7 @@
AdditionalDependencies="libogg.lib libvorbis.lib"
OutputFile="$(OutDir)/libvorbisfile.dll"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\..\..\..\libogg\win32\VS2003\release;..\release"
+ AdditionalLibraryDirectories="..\..\..\..\libogg\win32\VS2003\$(ConfigurationName);..\$(ConfigurationName)"
ModuleDefinitionFile="libvorbisfile.def"
GenerateDebugInformation="FALSE"
SubSystem="2"
Modified: trunk/vorbis/win32/VS2003/vorbis.sln
===================================================================
--- trunk/vorbis/win32/VS2003/vorbis.sln 2008-04-15 23:11:32 UTC (rev 14743)
+++ trunk/vorbis/win32/VS2003/vorbis.sln 2008-04-15 23:13:24 UTC (rev 14744)
@@ -5,14 +5,17 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libvorbisfile", "libvorbisfile\libvorbisfile.vcproj", "{CEBDE98B-A6AA-46E6-BC79-FAAF823DB9EC}"
ProjectSection(ProjectDependencies) = postProject
+ {3A214E06-B95E-4D61-A291-1F8DF2EC10FD} = {3A214E06-B95E-4D61-A291-1F8DF2EC10FD}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vorbisdec", "vorbisdec\vorbisdec.vcproj", "{5833EEA1-1068-431F-A6E5-316E7DC5D90A}"
ProjectSection(ProjectDependencies) = postProject
+ {3A214E06-B95E-4D61-A291-1F8DF2EC10FD} = {3A214E06-B95E-4D61-A291-1F8DF2EC10FD}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vorbisenc", "vorbisenc\vorbisenc.vcproj", "{E48B6A8B-F7FE-4DA8-8248-E64DBAC4F56C}"
ProjectSection(ProjectDependencies) = postProject
+ {3A214E06-B95E-4D61-A291-1F8DF2EC10FD} = {3A214E06-B95E-4D61-A291-1F8DF2EC10FD}
EndProjectSection
EndProject
Global
Modified: trunk/vorbis/win32/VS2003/vorbisdec/vorbisdec.vcproj
===================================================================
--- trunk/vorbis/win32/VS2003/vorbisdec/vorbisdec.vcproj 2008-04-15 23:11:32 UTC (rev 14743)
+++ trunk/vorbis/win32/VS2003/vorbisdec/vorbisdec.vcproj 2008-04-15 23:13:24 UTC (rev 14744)
@@ -12,8 +12,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="..\debug"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
CharacterSet="2"
WholeProgramOptimization="FALSE">
@@ -37,7 +37,7 @@
AdditionalDependencies="libogg.lib libvorbis.lib"
OutputFile="$(OutDir)/vorbisdec.exe"
LinkIncremental="2"
- AdditionalLibraryDirectories="..\..\..\..\libogg\win32\VS2003\debug;..\debug"
+ AdditionalLibraryDirectories="..\..\..\..\libogg\win32\VS2003\$(ConfigurationName);..\$(ConfigurationName)"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="$(OutDir)/vorbisdec.pdb"
SubSystem="1"
@@ -65,8 +65,8 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="..\release"
- IntermediateDirectory="Release"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
CharacterSet="2"
WholeProgramOptimization="TRUE">
@@ -96,7 +96,7 @@
AdditionalDependencies="libogg.lib libvorbis.lib"
OutputFile="$(OutDir)/vorbisdec.exe"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\..\..\..\libogg\win32\VS2003\release;..\release"
+ AdditionalLibraryDirectories="..\..\..\..\libogg\win32\VS2003\$(ConfigurationName);..\$(ConfigurationName)"
GenerateDebugInformation="FALSE"
SubSystem="1"
OptimizeReferences="2"
@@ -126,7 +126,7 @@
</Configuration>
<Configuration
Name="Release_SSE|Win32"
- OutputDirectory="..\release"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
CharacterSet="2"
@@ -158,7 +158,7 @@
AdditionalDependencies="libogg.lib libvorbis.lib"
OutputFile="$(OutDir)/vorbisdec.exe"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\..\..\..\libogg\win32\VS2003\release;..\release"
+ AdditionalLibraryDirectories="..\..\..\..\libogg\win32\VS2003\$(ConfigurationName);..\$(ConfigurationName)"
GenerateDebugInformation="FALSE"
SubSystem="1"
OptimizeReferences="2"
@@ -188,7 +188,7 @@
</Configuration>
<Configuration
Name="Release_SSE2|Win32"
- OutputDirectory="..\release"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
CharacterSet="2"
@@ -220,7 +220,7 @@
AdditionalDependencies="libogg.lib libvorbis.lib"
OutputFile="$(OutDir)/vorbisdec.exe"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\..\..\..\libogg\win32\VS2003\release;..\release"
+ AdditionalLibraryDirectories="..\..\..\..\libogg\win32\VS2003\$(ConfigurationName);..\$(ConfigurationName)"
GenerateDebugInformation="FALSE"
SubSystem="1"
OptimizeReferences="2"
Modified: trunk/vorbis/win32/VS2003/vorbisenc/vorbisenc.vcproj
===================================================================
--- trunk/vorbis/win32/VS2003/vorbisenc/vorbisenc.vcproj 2008-04-15 23:11:32 UTC (rev 14743)
+++ trunk/vorbis/win32/VS2003/vorbisenc/vorbisenc.vcproj 2008-04-15 23:13:24 UTC (rev 14744)
@@ -12,8 +12,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="..\debug"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
CharacterSet="2">
<Tool
@@ -37,7 +37,7 @@
AdditionalDependencies="libogg.lib libvorbis.lib"
OutputFile="$(OutDir)/vorbisenc.exe"
LinkIncremental="2"
- AdditionalLibraryDirectories="..\..\..\..\libogg\win32\VS2003\debug;..\debug"
+ AdditionalLibraryDirectories="..\..\..\..\libogg\win32\VS2003\$(ConfigurationName);..\$(ConfigurationName)"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="$(OutDir)/vorbisenc.pdb"
SubSystem="1"
@@ -65,8 +65,8 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="..\release"
- IntermediateDirectory="Release"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
CharacterSet="2"
WholeProgramOptimization="TRUE">
@@ -96,7 +96,7 @@
AdditionalDependencies="libogg.lib libvorbis.lib"
OutputFile="$(OutDir)/vorbisenc.exe"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\..\..\..\libogg\win32\VS2003\release;..\release"
+ AdditionalLibraryDirectories="..\..\..\..\libogg\win32\VS2003\$(ConfigurationName);..\$(ConfigurationName)"
GenerateDebugInformation="FALSE"
SubSystem="1"
OptimizeReferences="2"
@@ -126,7 +126,7 @@
</Configuration>
<Configuration
Name="Release_SSE|Win32"
- OutputDirectory="..\release"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
CharacterSet="2"
@@ -158,7 +158,7 @@
AdditionalDependencies="libogg.lib libvorbis.lib"
OutputFile="$(OutDir)/vorbisenc.exe"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\..\..\..\libogg\win32\VS2003\release;..\release"
+ AdditionalLibraryDirectories="..\..\..\..\libogg\win32\VS2003\$(ConfigurationName);..\$(ConfigurationName)"
GenerateDebugInformation="FALSE"
SubSystem="1"
OptimizeReferences="2"
@@ -188,7 +188,7 @@
</Configuration>
<Configuration
Name="Release_SSE2|Win32"
- OutputDirectory="..\release"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
CharacterSet="2"
@@ -220,7 +220,7 @@
AdditionalDependencies="libogg.lib libvorbis.lib"
OutputFile="$(OutDir)/vorbisenc.exe"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\..\..\..\libogg\win32\VS2003\release;..\release"
+ AdditionalLibraryDirectories="..\..\..\..\libogg\win32\VS2003\$(ConfigurationName);..\$(ConfigurationName)"
GenerateDebugInformation="FALSE"
SubSystem="1"
OptimizeReferences="2"
More information about the commits
mailing list