diff options
| author | Tartalo <none@none> | 2010-06-06 22:38:27 +0200 |
|---|---|---|
| committer | Tartalo <none@none> | 2010-06-06 22:38:27 +0200 |
| commit | fe3976b347642dfb04f5c22d0921b16944e4d52b (patch) | |
| tree | feaf41fc0c5dbe617cfa93dc42b3955b32455081 | |
| parent | 12d1becdcf749106af9c5ac3fd2f1c3de42b5584 (diff) | |
| parent | 6501255bc57a881d6b1fbc8a54ea028558e2bdb6 (diff) | |
Merge, again
--HG--
branch : trunk
| -rw-r--r-- | externals/zlib/win/VC90/zlib.vcproj | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/externals/zlib/win/VC90/zlib.vcproj b/externals/zlib/win/VC90/zlib.vcproj index 8e89623915c..1b63254aa23 100644 --- a/externals/zlib/win/VC90/zlib.vcproj +++ b/externals/zlib/win/VC90/zlib.vcproj @@ -22,7 +22,7 @@ <Configuration Name="Debug|Win32" OutputDirectory="..\..\bin\$(PlatformName)_$(ConfigurationName)" - IntermediateDirectory=".\bzip2__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory=".\zlib__$(PlatformName)_$(ConfigurationName)" ConfigurationType="4" CharacterSet="2" > @@ -90,7 +90,7 @@ <Configuration Name="Debug|x64" OutputDirectory="..\..\bin\$(PlatformName)_$(ConfigurationName)" - IntermediateDirectory=".\bzip2__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory=".\zlib__$(PlatformName)_$(ConfigurationName)" ConfigurationType="4" CharacterSet="2" > @@ -159,7 +159,7 @@ <Configuration Name="Release|Win32" OutputDirectory="..\..\bin\$(PlatformName)_$(ConfigurationName)" - IntermediateDirectory=".\bzip2__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory=".\zlib__$(PlatformName)_$(ConfigurationName)" ConfigurationType="4" CharacterSet="2" > @@ -225,7 +225,7 @@ <Configuration Name="Release|x64" OutputDirectory="..\..\bin\$(PlatformName)_$(ConfigurationName)" - IntermediateDirectory=".\bzip2__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory=".\zlib__$(PlatformName)_$(ConfigurationName)" ConfigurationType="4" CharacterSet="2" > |