aboutsummaryrefslogtreecommitdiff
path: root/externals/zlib
diff options
context:
space:
mode:
authorXTZGZoReX <none@none>2010-06-06 22:58:12 +0200
committerXTZGZoReX <none@none>2010-06-06 22:58:12 +0200
commit58c15e71a60bd4d7bea5f5467b35f0d3c2220980 (patch)
tree0e7ea4d48efeb5b713a8e7ce0002fab6b85cf032 /externals/zlib
parent62200e8d022479ff057b6898380e1dd8374d2ec2 (diff)
parentfe3976b347642dfb04f5c22d0921b16944e4d52b (diff)
* Merge.
--HG-- branch : trunk
Diffstat (limited to 'externals/zlib')
-rw-r--r--externals/zlib/win/VC90/zlib.vcproj8
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"
>