summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/flac/flac.vcproj13
-rw-r--r--src/flac/iffscan.vcproj13
-rw-r--r--src/libFLAC++/libFLAC++_dynamic.vcproj9
-rw-r--r--src/libFLAC++/libFLAC++_static.vcproj11
-rw-r--r--src/libFLAC/libFLAC_dynamic.vcproj15
-rw-r--r--src/libFLAC/libFLAC_static.vcproj11
-rw-r--r--src/metaflac/metaflac.vcproj13
-rw-r--r--src/monkeys_audio_utilities/flac_mac/flac_mac.vcproj9
-rw-r--r--src/monkeys_audio_utilities/flac_ren/flac_ren.vcproj9
-rw-r--r--src/plugin_common/plugin_common_static.vcproj11
-rw-r--r--src/share/getopt/getopt_static.vcproj11
-rw-r--r--src/share/grabbag/grabbag_static.vcproj11
-rw-r--r--src/share/replaygain_analysis/replaygain_analysis_static.vcproj11
-rw-r--r--src/share/replaygain_synthesis/replaygain_synthesis_static.vcproj11
-rw-r--r--src/share/utf8/utf8_static.vcproj11
-rw-r--r--src/share/win_utf8_io/win_utf8_io_static.vcproj11
-rw-r--r--src/test_grabbag/cuesheet/test_cuesheet.vcproj9
-rw-r--r--src/test_grabbag/picture/test_picture.vcproj9
-rw-r--r--src/test_libFLAC++/test_libFLAC++.vcproj13
-rw-r--r--src/test_libFLAC/test_libFLAC.vcproj13
-rw-r--r--src/test_libs_common/test_libs_common_static.vcproj11
-rw-r--r--src/test_seeking/test_seeking.vcproj13
-rw-r--r--src/test_streams/test_streams.vcproj9
-rw-r--r--src/utils/flacdiff/flacdiff.vcproj13
-rw-r--r--src/utils/flactimer/flactimer.vcproj9
25 files changed, 142 insertions, 137 deletions
diff --git a/src/flac/flac.vcproj b/src/flac/flac.vcproj
index d0d50321..ace4e3c4 100644
--- a/src/flac/flac.vcproj
+++ b/src/flac/flac.vcproj
@@ -17,8 +17,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="..\..\objs\debug\bin"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(SolutionDir)objs\$(ConfigurationName)\bin"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
>
<Tool
@@ -62,7 +62,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="..\..\objs\release\lib\libogg_static.lib"
+ AdditionalDependencies="$(SolutionDir)objs\$(ConfigurationName)\lib\libogg_static.lib"
LinkIncremental="2"
IgnoreDefaultLibraryNames="uuid.lib"
GenerateDebugInformation="true"
@@ -93,9 +93,10 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="..\..\objs\release\bin"
- IntermediateDirectory="Release"
+ OutputDirectory="$(SolutionDir)objs\$(ConfigurationName)\bin"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -140,7 +141,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="..\..\objs\release\lib\libogg_static.lib"
+ AdditionalDependencies="$(SolutionDir)objs\$(ConfigurationName)\lib\libogg_static.lib"
LinkIncremental="1"
IgnoreDefaultLibraryNames="uuid.lib"
GenerateDebugInformation="true"
diff --git a/src/flac/iffscan.vcproj b/src/flac/iffscan.vcproj
index 3153029e..e7ed135a 100644
--- a/src/flac/iffscan.vcproj
+++ b/src/flac/iffscan.vcproj
@@ -17,8 +17,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="..\..\objs\debug\bin"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(SolutionDir)objs\$(ConfigurationName)\bin"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
>
<Tool
@@ -62,7 +62,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="..\..\objs\release\lib\libogg_static.lib"
+ AdditionalDependencies="$(SolutionDir)objs\$(ConfigurationName)\lib\libogg_static.lib"
LinkIncremental="2"
IgnoreDefaultLibraryNames="uuid.lib"
GenerateDebugInformation="true"
@@ -93,9 +93,10 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="..\..\objs\release\bin"
- IntermediateDirectory="Release"
+ OutputDirectory="$(SolutionDir)objs\$(ConfigurationName)\bin"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -140,7 +141,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="..\..\objs\release\lib\libogg_static.lib"
+ AdditionalDependencies="$(SolutionDir)objs\$(ConfigurationName)\lib\libogg_static.lib"
LinkIncremental="1"
IgnoreDefaultLibraryNames="uuid.lib"
GenerateDebugInformation="true"
diff --git a/src/libFLAC++/libFLAC++_dynamic.vcproj b/src/libFLAC++/libFLAC++_dynamic.vcproj
index 2b7575c3..56006e00 100644
--- a/src/libFLAC++/libFLAC++_dynamic.vcproj
+++ b/src/libFLAC++/libFLAC++_dynamic.vcproj
@@ -17,8 +17,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="..\..\objs\debug\lib"
- IntermediateDirectory="Debug_dynamic"
+ OutputDirectory="$(SolutionDir)objs\$(ConfigurationName)\lib"
+ IntermediateDirectory="$(ConfigurationName)_dynamic"
ConfigurationType="2"
>
<Tool
@@ -90,9 +90,10 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="..\..\objs\release\lib"
- IntermediateDirectory="Release_dynamic"
+ OutputDirectory="$(SolutionDir)objs\$(ConfigurationName)\lib"
+ IntermediateDirectory="$(ConfigurationName)_dynamic"
ConfigurationType="2"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
diff --git a/src/libFLAC++/libFLAC++_static.vcproj b/src/libFLAC++/libFLAC++_static.vcproj
index e2c26ce4..d0a1e997 100644
--- a/src/libFLAC++/libFLAC++_static.vcproj
+++ b/src/libFLAC++/libFLAC++_static.vcproj
@@ -17,8 +17,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="..\..\objs\debug\lib"
- IntermediateDirectory="Debug_static"
+ OutputDirectory="$(SolutionDir)objs\$(ConfigurationName)\lib"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="4"
>
<Tool
@@ -61,7 +61,6 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\objs\debug\lib\$(ProjectName).lib"
/>
<Tool
Name="VCALinkTool"
@@ -81,9 +80,10 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="..\..\objs\release\lib"
- IntermediateDirectory="Release_static"
+ OutputDirectory="$(SolutionDir)objs\$(ConfigurationName)\lib"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="4"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -127,7 +127,6 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\objs\release\lib\$(ProjectName).lib"
/>
<Tool
Name="VCALinkTool"
diff --git a/src/libFLAC/libFLAC_dynamic.vcproj b/src/libFLAC/libFLAC_dynamic.vcproj
index 46ec9a5b..693a10c8 100644
--- a/src/libFLAC/libFLAC_dynamic.vcproj
+++ b/src/libFLAC/libFLAC_dynamic.vcproj
@@ -17,8 +17,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="..\..\objs\debug\lib"
- IntermediateDirectory="Debug_dynamic"
+ OutputDirectory="$(SolutionDir)objs\$(ConfigurationName)\lib"
+ IntermediateDirectory="$(ConfigurationName)_dynamic"
ConfigurationType="2"
>
<Tool
@@ -63,9 +63,9 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="..\..\objs\release\lib\libogg_static.lib"
+ AdditionalDependencies="$(SolutionDir)objs\$(ConfigurationName)\lib\libogg_static.lib"
LinkIncremental="2"
- IgnoreDefaultLibraryNames="uuid.lib;libcmt.lib"
+ IgnoreDefaultLibraryNames="uuid.lib"
GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="1"
@@ -94,9 +94,10 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="..\..\objs\release\lib"
- IntermediateDirectory="Release_dynamic"
+ OutputDirectory="$(SolutionDir)objs\$(ConfigurationName)\lib"
+ IntermediateDirectory="$(ConfigurationName)_dynamic"
ConfigurationType="2"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -142,7 +143,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="..\..\objs\release\lib\libogg_static.lib"
+ AdditionalDependencies="$(SolutionDir)objs\$(ConfigurationName)\lib\libogg_static.lib"
LinkIncremental="1"
IgnoreDefaultLibraryNames="uuid.lib"
GenerateDebugInformation="true"
diff --git a/src/libFLAC/libFLAC_static.vcproj b/src/libFLAC/libFLAC_static.vcproj
index a173a798..4851755a 100644
--- a/src/libFLAC/libFLAC_static.vcproj
+++ b/src/libFLAC/libFLAC_static.vcproj
@@ -17,8 +17,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="..\..\objs\debug\lib"
- IntermediateDirectory="Debug_static"
+ OutputDirectory="$(SolutionDir)objs\$(ConfigurationName)\lib"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="4"
>
<Tool
@@ -63,7 +63,6 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\objs\debug\lib\$(ProjectName).lib"
/>
<Tool
Name="VCALinkTool"
@@ -83,9 +82,10 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="..\..\objs\release\lib"
- IntermediateDirectory="Release_static"
+ OutputDirectory="$(SolutionDir)objs\$(ConfigurationName)\lib"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="4"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -131,7 +131,6 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\objs\release\lib\$(ProjectName).lib"
/>
<Tool
Name="VCALinkTool"
diff --git a/src/metaflac/metaflac.vcproj b/src/metaflac/metaflac.vcproj
index d6637fe1..076406b8 100644
--- a/src/metaflac/metaflac.vcproj
+++ b/src/metaflac/metaflac.vcproj
@@ -17,8 +17,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="..\..\objs\debug\bin"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(SolutionDir)objs\$(ConfigurationName)\bin"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
>
<Tool
@@ -62,7 +62,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="..\..\objs\release\lib\libogg_static.lib"
+ AdditionalDependencies="$(SolutionDir)objs\$(ConfigurationName)\lib\libogg_static.lib"
LinkIncremental="2"
IgnoreDefaultLibraryNames="uuid.lib"
GenerateDebugInformation="true"
@@ -93,9 +93,10 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="..\..\objs\release\bin"
- IntermediateDirectory="Release"
+ OutputDirectory="$(SolutionDir)objs\$(ConfigurationName)\bin"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -140,7 +141,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="..\..\objs\release\lib\libogg_static.lib"
+ AdditionalDependencies="$(SolutionDir)objs\$(ConfigurationName)\lib\libogg_static.lib"
LinkIncremental="1"
IgnoreDefaultLibraryNames="uuid.lib"
GenerateDebugInformation="true"
diff --git a/src/monkeys_audio_utilities/flac_mac/flac_mac.vcproj b/src/monkeys_audio_utilities/flac_mac/flac_mac.vcproj
index cc6c2989..dc0c74db 100644
--- a/src/monkeys_audio_utilities/flac_mac/flac_mac.vcproj
+++ b/src/monkeys_audio_utilities/flac_mac/flac_mac.vcproj
@@ -17,8 +17,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="..\..\..\objs\debug\bin"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(SolutionDir)objs\$(ConfigurationName)\bin"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
>
<Tool
@@ -92,9 +92,10 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="..\..\..\objs\release\bin"
- IntermediateDirectory="Release"
+ OutputDirectory="$(SolutionDir)objs\$(ConfigurationName)\bin"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
diff --git a/src/monkeys_audio_utilities/flac_ren/flac_ren.vcproj b/src/monkeys_audio_utilities/flac_ren/flac_ren.vcproj
index 5fc7cbce..f4369934 100644
--- a/src/monkeys_audio_utilities/flac_ren/flac_ren.vcproj
+++ b/src/monkeys_audio_utilities/flac_ren/flac_ren.vcproj
@@ -17,8 +17,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="..\..\..\objs\debug\bin"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(SolutionDir)objs\$(ConfigurationName)\bin"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
>
<Tool
@@ -91,9 +91,10 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="..\..\..\objs\release\bin"
- IntermediateDirectory="Release"
+ OutputDirectory="$(SolutionDir)objs\$(ConfigurationName)\bin"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
diff --git a/src/plugin_common/plugin_common_static.vcproj b/src/plugin_common/plugin_common_static.vcproj
index 0a71c807..cf0e9413 100644
--- a/src/plugin_common/plugin_common_static.vcproj
+++ b/src/plugin_common/plugin_common_static.vcproj
@@ -17,8 +17,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="..\..\objs\debug\lib"
- IntermediateDirectory="Debug_static"
+ OutputDirectory="$(SolutionDir)objs\$(ConfigurationName)\lib"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="4"
>
<Tool
@@ -62,7 +62,6 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\objs\debug\lib\$(ProjectName).lib"
/>
<Tool
Name="VCALinkTool"
@@ -82,9 +81,10 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="..\..\objs\release\lib"
- IntermediateDirectory="Release_static"
+ OutputDirectory="$(SolutionDir)objs\$(ConfigurationName)\lib"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="4"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -129,7 +129,6 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\objs\release\lib\$(ProjectName).lib"
/>
<Tool
Name="VCALinkTool"
diff --git a/src/share/getopt/getopt_static.vcproj b/src/share/getopt/getopt_static.vcproj
index 6f0c7a77..7a95af25 100644
--- a/src/share/getopt/getopt_static.vcproj
+++ b/src/share/getopt/getopt_static.vcproj
@@ -17,8 +17,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="..\..\..\objs\debug\lib"
- IntermediateDirectory="Debug_static"
+ OutputDirectory="$(SolutionDir)objs\$(ConfigurationName)\lib"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="4"
>
<Tool
@@ -62,7 +62,6 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\debug\lib\$(ProjectName).lib"
/>
<Tool
Name="VCALinkTool"
@@ -82,9 +81,10 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="..\..\..\objs\release\lib"
- IntermediateDirectory="Release_static"
+ OutputDirectory="$(SolutionDir)objs\$(ConfigurationName)\lib"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="4"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -129,7 +129,6 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\release\lib\$(ProjectName).lib"
/>
<Tool
Name="VCALinkTool"
diff --git a/src/share/grabbag/grabbag_static.vcproj b/src/share/grabbag/grabbag_static.vcproj
index 284bbb85..bb707060 100644
--- a/src/share/grabbag/grabbag_static.vcproj
+++ b/src/share/grabbag/grabbag_static.vcproj
@@ -17,8 +17,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="..\..\..\objs\debug\lib"
- IntermediateDirectory="Debug_static"
+ OutputDirectory="$(SolutionDir)objs\$(ConfigurationName)\lib"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="4"
>
<Tool
@@ -62,7 +62,6 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\debug\lib\$(ProjectName).lib"
/>
<Tool
Name="VCALinkTool"
@@ -82,9 +81,10 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="..\..\..\objs\release\lib"
- IntermediateDirectory="Release_static"
+ OutputDirectory="$(SolutionDir)objs\$(ConfigurationName)\lib"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="4"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -129,7 +129,6 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\release\lib\$(ProjectName).lib"
/>
<Tool
Name="VCALinkTool"
diff --git a/src/share/replaygain_analysis/replaygain_analysis_static.vcproj b/src/share/replaygain_analysis/replaygain_analysis_static.vcproj
index 38846d9a..c51f3fbf 100644
--- a/src/share/replaygain_analysis/replaygain_analysis_static.vcproj
+++ b/src/share/replaygain_analysis/replaygain_analysis_static.vcproj
@@ -17,8 +17,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="..\..\..\objs\debug\lib"
- IntermediateDirectory="Debug_static"
+ OutputDirectory="$(SolutionDir)objs\$(ConfigurationName)\lib"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="4"
>
<Tool
@@ -62,7 +62,6 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\debug\lib\$(ProjectName).lib"
/>
<Tool
Name="VCALinkTool"
@@ -82,9 +81,10 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="..\..\..\objs\release\lib"
- IntermediateDirectory="Release_static"
+ OutputDirectory="$(SolutionDir)objs\$(ConfigurationName)\lib"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="4"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -129,7 +129,6 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\release\lib\$(ProjectName).lib"
/>
<Tool
Name="VCALinkTool"
diff --git a/src/share/replaygain_synthesis/replaygain_synthesis_static.vcproj b/src/share/replaygain_synthesis/replaygain_synthesis_static.vcproj
index 6c50b1e0..d2f40c8d 100644
--- a/src/share/replaygain_synthesis/replaygain_synthesis_static.vcproj
+++ b/src/share/replaygain_synthesis/replaygain_synthesis_static.vcproj
@@ -17,8 +17,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="..\..\..\objs\debug\lib"
- IntermediateDirectory="Debug_static"
+ OutputDirectory="$(SolutionDir)objs\$(ConfigurationName)\lib"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="4"
>
<Tool
@@ -62,7 +62,6 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\debug\lib\$(ProjectName).lib"
/>
<Tool
Name="VCALinkTool"
@@ -82,9 +81,10 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="..\..\..\objs\release\lib"
- IntermediateDirectory="Release_static"
+ OutputDirectory="$(SolutionDir)objs\$(ConfigurationName)\lib"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="4"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -129,7 +129,6 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\release\lib\$(ProjectName).lib"
/>
<Tool
Name="VCALinkTool"
diff --git a/src/share/utf8/utf8_static.vcproj b/src/share/utf8/utf8_static.vcproj
index 9fe4f8aa..f31e2d51 100644
--- a/src/share/utf8/utf8_static.vcproj
+++ b/src/share/utf8/utf8_static.vcproj
@@ -17,8 +17,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="..\..\..\objs\debug\lib"
- IntermediateDirectory="Debug_static"
+ OutputDirectory="$(SolutionDir)objs\$(ConfigurationName)\lib"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="4"
>
<Tool
@@ -62,7 +62,6 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\debug\lib\$(ProjectName).lib"
/>
<Tool
Name="VCALinkTool"
@@ -82,9 +81,10 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="..\..\..\objs\release\lib"
- IntermediateDirectory="Release_static"
+ OutputDirectory="$(SolutionDir)objs\$(ConfigurationName)\lib"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="4"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -129,7 +129,6 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\release\lib\$(ProjectName).lib"
/>
<Tool
Name="VCALinkTool"
diff --git a/src/share/win_utf8_io/win_utf8_io_static.vcproj b/src/share/win_utf8_io/win_utf8_io_static.vcproj
index 444e3fdf..63765563 100644
--- a/src/share/win_utf8_io/win_utf8_io_static.vcproj
+++ b/src/share/win_utf8_io/win_utf8_io_static.vcproj
@@ -17,8 +17,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="..\..\..\objs\debug\lib"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(SolutionDir)objs\$(ConfigurationName)\lib"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="4"
>
<Tool
@@ -62,7 +62,6 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\debug\lib\$(ProjectName).lib"
/>
<Tool
Name="VCALinkTool"
@@ -82,9 +81,10 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="..\..\..\objs\release\lib"
- IntermediateDirectory="Release"
+ OutputDirectory="$(SolutionDir)objs\$(ConfigurationName)\lib"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="4"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -129,7 +129,6 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\release\lib\$(ProjectName).lib"
/>
<Tool
Name="VCALinkTool"
diff --git a/src/test_grabbag/cuesheet/test_cuesheet.vcproj b/src/test_grabbag/cuesheet/test_cuesheet.vcproj
index 0d72363c..8644a23b 100644
--- a/src/test_grabbag/cuesheet/test_cuesheet.vcproj
+++ b/src/test_grabbag/cuesheet/test_cuesheet.vcproj
@@ -17,8 +17,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="..\..\..\objs\debug\bin"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(SolutionDir)objs\$(ConfigurationName)\bin"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
>
<Tool
@@ -92,9 +92,10 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="..\..\..\objs\release\bin"
- IntermediateDirectory="Release"
+ OutputDirectory="$(SolutionDir)objs\$(ConfigurationName)\bin"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
diff --git a/src/test_grabbag/picture/test_picture.vcproj b/src/test_grabbag/picture/test_picture.vcproj
index 6f73d078..1ada2edb 100644
--- a/src/test_grabbag/picture/test_picture.vcproj
+++ b/src/test_grabbag/picture/test_picture.vcproj
@@ -17,8 +17,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="..\..\..\objs\debug\bin"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(SolutionDir)objs\$(ConfigurationName)\bin"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
>
<Tool
@@ -92,9 +92,10 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="..\..\..\objs\release\bin"
- IntermediateDirectory="Release"
+ OutputDirectory="$(SolutionDir)objs\$(ConfigurationName)\bin"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
diff --git a/src/test_libFLAC++/test_libFLAC++.vcproj b/src/test_libFLAC++/test_libFLAC++.vcproj
index 46e44c73..0c8e55c5 100644
--- a/src/test_libFLAC++/test_libFLAC++.vcproj
+++ b/src/test_libFLAC++/test_libFLAC++.vcproj
@@ -17,8 +17,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="..\..\objs\debug\bin"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(SolutionDir)objs\$(ConfigurationName)\bin"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
>
<Tool
@@ -61,7 +61,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="..\..\objs\release\lib\libogg_static.lib"
+ AdditionalDependencies="$(SolutionDir)objs\$(ConfigurationName)\lib\libogg_static.lib"
LinkIncremental="2"
IgnoreDefaultLibraryNames="uuid.lib"
GenerateDebugInformation="true"
@@ -92,9 +92,10 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="..\..\objs\release\bin"
- IntermediateDirectory="Release"
+ OutputDirectory="$(SolutionDir)objs\$(ConfigurationName)\bin"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -138,7 +139,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="..\..\objs\release\lib\libogg_static.lib"
+ AdditionalDependencies="$(SolutionDir)objs\$(ConfigurationName)\lib\libogg_static.lib"
LinkIncremental="1"
IgnoreDefaultLibraryNames="uuid.lib"
GenerateDebugInformation="true"
diff --git a/src/test_libFLAC/test_libFLAC.vcproj b/src/test_libFLAC/test_libFLAC.vcproj
index 6a4097d5..bf960aac 100644
--- a/src/test_libFLAC/test_libFLAC.vcproj
+++ b/src/test_libFLAC/test_libFLAC.vcproj
@@ -17,8 +17,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="..\..\objs\debug\bin"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(SolutionDir)objs\$(ConfigurationName)\bin"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
>
<Tool
@@ -62,7 +62,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="..\..\objs\release\lib\libogg_static.lib"
+ AdditionalDependencies="$(SolutionDir)objs\$(ConfigurationName)\lib\libogg_static.lib"
LinkIncremental="2"
IgnoreDefaultLibraryNames="uuid.lib"
GenerateDebugInformation="true"
@@ -93,9 +93,10 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="..\..\objs\release\bin"
- IntermediateDirectory="Release"
+ OutputDirectory="$(SolutionDir)objs\$(ConfigurationName)\bin"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -140,7 +141,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="..\..\objs\release\lib\libogg_static.lib"
+ AdditionalDependencies="$(SolutionDir)objs\$(ConfigurationName)\lib\libogg_static.lib"
LinkIncremental="1"
IgnoreDefaultLibraryNames="uuid.lib"
GenerateDebugInformation="true"
diff --git a/src/test_libs_common/test_libs_common_static.vcproj b/src/test_libs_common/test_libs_common_static.vcproj
index 72599813..0f1d37c6 100644
--- a/src/test_libs_common/test_libs_common_static.vcproj
+++ b/src/test_libs_common/test_libs_common_static.vcproj
@@ -17,8 +17,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="..\..\objs\debug\lib"
- IntermediateDirectory="Debug_static"
+ OutputDirectory="$(SolutionDir)objs\$(ConfigurationName)\lib"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="4"
>
<Tool
@@ -62,7 +62,6 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\objs\debug\lib\$(ProjectName).lib"
/>
<Tool
Name="VCALinkTool"
@@ -82,9 +81,10 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="..\..\objs\release\lib"
- IntermediateDirectory="Release_static"
+ OutputDirectory="$(SolutionDir)objs\$(ConfigurationName)\lib"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="4"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -129,7 +129,6 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\objs\release\lib\$(ProjectName).lib"
/>
<Tool
Name="VCALinkTool"
diff --git a/src/test_seeking/test_seeking.vcproj b/src/test_seeking/test_seeking.vcproj
index f5939c62..bfeeef72 100644
--- a/src/test_seeking/test_seeking.vcproj
+++ b/src/test_seeking/test_seeking.vcproj
@@ -17,8 +17,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="..\..\objs\debug\bin"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(SolutionDir)objs\$(ConfigurationName)\bin"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
>
<Tool
@@ -62,7 +62,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="..\..\objs\release\lib\libogg_static.lib"
+ AdditionalDependencies="$(SolutionDir)objs\$(ConfigurationName)\lib\libogg_static.lib"
LinkIncremental="2"
IgnoreDefaultLibraryNames="uuid.lib"
GenerateDebugInformation="true"
@@ -93,9 +93,10 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="..\..\objs\release\bin"
- IntermediateDirectory="Release"
+ OutputDirectory="$(SolutionDir)objs\$(ConfigurationName)\bin"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -140,7 +141,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="..\..\objs\release\lib\libogg_static.lib"
+ AdditionalDependencies="$(SolutionDir)objs\$(ConfigurationName)\lib\libogg_static.lib"
LinkIncremental="1"
IgnoreDefaultLibraryNames="uuid.lib"
GenerateDebugInformation="true"
diff --git a/src/test_streams/test_streams.vcproj b/src/test_streams/test_streams.vcproj
index 9b27738c..415ecc06 100644
--- a/src/test_streams/test_streams.vcproj
+++ b/src/test_streams/test_streams.vcproj
@@ -17,8 +17,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="..\..\objs\debug\bin"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(SolutionDir)objs\$(ConfigurationName)\bin"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
>
<Tool
@@ -92,9 +92,10 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="..\..\objs\release\bin"
- IntermediateDirectory="Release"
+ OutputDirectory="$(SolutionDir)objs\$(ConfigurationName)\bin"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
diff --git a/src/utils/flacdiff/flacdiff.vcproj b/src/utils/flacdiff/flacdiff.vcproj
index b5c7d39b..0c79b2fd 100644
--- a/src/utils/flacdiff/flacdiff.vcproj
+++ b/src/utils/flacdiff/flacdiff.vcproj
@@ -17,8 +17,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="..\..\..\objs\debug\bin"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(SolutionDir)objs\$(ConfigurationName)\bin"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
>
<Tool
@@ -61,7 +61,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="..\..\..\objs\release\lib\libogg_static.lib"
+ AdditionalDependencies="$(SolutionDir)objs\$(ConfigurationName)\lib\libogg_static.lib"
LinkIncremental="2"
IgnoreDefaultLibraryNames="uuid.lib"
GenerateDebugInformation="true"
@@ -92,9 +92,10 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="..\..\..\objs\release\bin"
- IntermediateDirectory="Release"
+ OutputDirectory="$(SolutionDir)objs\$(ConfigurationName)\bin"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -138,7 +139,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="..\..\..\objs\release\lib\libogg_static.lib"
+ AdditionalDependencies="$(SolutionDir)objs\$(ConfigurationName)\lib\libogg_static.lib"
LinkIncremental="1"
IgnoreDefaultLibraryNames="uuid.lib"
GenerateDebugInformation="true"
diff --git a/src/utils/flactimer/flactimer.vcproj b/src/utils/flactimer/flactimer.vcproj
index 36fe55a0..edcc40da 100644
--- a/src/utils/flactimer/flactimer.vcproj
+++ b/src/utils/flactimer/flactimer.vcproj
@@ -17,8 +17,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="..\..\..\objs\debug\bin"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(SolutionDir)objs\$(ConfigurationName)\bin"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
>
<Tool
@@ -91,9 +91,10 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="..\..\..\objs\release\bin"
- IntermediateDirectory="Release"
+ OutputDirectory="$(SolutionDir)objs\$(ConfigurationName)\bin"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"