diff options
| author | sping <sping@xiph.org> | 2008-04-15 23:13:24 +0000 |
|---|---|---|
| committer | sping <sping@xiph.org> | 2008-04-15 23:13:24 +0000 |
| commit | bbf57f0a1b45f1fd67dcf7a5e5e481b599a4093f (patch) | |
| tree | bb1fcbee0d2178719666737c15c2a677d7114d0d /win32 | |
| parent | 6022ba22e6b8a6354827eaae5176572c2318ce6f (diff) | |
| download | libvorbis-git-bbf57f0a1b45f1fd67dcf7a5e5e481b599a4093f.tar.gz | |
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
svn path=/trunk/vorbis/; revision=14744
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/VS2003/libvorbis/libvorbis.vcproj | 20 | ||||
| -rw-r--r-- | win32/VS2003/libvorbisfile/libvorbisfile.vcproj | 12 | ||||
| -rw-r--r-- | win32/VS2003/vorbis.sln | 3 | ||||
| -rw-r--r-- | win32/VS2003/vorbisdec/vorbisdec.vcproj | 20 | ||||
| -rw-r--r-- | win32/VS2003/vorbisenc/vorbisenc.vcproj | 20 |
5 files changed, 39 insertions, 36 deletions
diff --git a/win32/VS2003/libvorbis/libvorbis.vcproj b/win32/VS2003/libvorbis/libvorbis.vcproj index 9926e488..8a68b196 100644 --- a/win32/VS2003/libvorbis/libvorbis.vcproj +++ b/win32/VS2003/libvorbis/libvorbis.vcproj @@ -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"
diff --git a/win32/VS2003/libvorbisfile/libvorbisfile.vcproj b/win32/VS2003/libvorbisfile/libvorbisfile.vcproj index 4fc85b79..6fe15d26 100644 --- a/win32/VS2003/libvorbisfile/libvorbisfile.vcproj +++ b/win32/VS2003/libvorbisfile/libvorbisfile.vcproj @@ -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"
diff --git a/win32/VS2003/vorbis.sln b/win32/VS2003/vorbis.sln index e399f43d..4f943386 100644 --- a/win32/VS2003/vorbis.sln +++ b/win32/VS2003/vorbis.sln @@ -5,14 +5,17 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libvorbis", "libvorbis\libv 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
diff --git a/win32/VS2003/vorbisdec/vorbisdec.vcproj b/win32/VS2003/vorbisdec/vorbisdec.vcproj index 02e8237c..36d4ae5e 100644 --- a/win32/VS2003/vorbisdec/vorbisdec.vcproj +++ b/win32/VS2003/vorbisdec/vorbisdec.vcproj @@ -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"
diff --git a/win32/VS2003/vorbisenc/vorbisenc.vcproj b/win32/VS2003/vorbisenc/vorbisenc.vcproj index c49ee09a..2edda13a 100644 --- a/win32/VS2003/vorbisenc/vorbisenc.vcproj +++ b/win32/VS2003/vorbisenc/vorbisenc.vcproj @@ -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"
|