aboutsummaryrefslogtreecommitdiff
path: root/externals/zlib
diff options
context:
space:
mode:
authorXanadu <none@none>2010-07-17 22:58:24 +0200
committerXanadu <none@none>2010-07-17 22:58:24 +0200
commitb5f8bfd66561e4a63fa8c28961b829a35ceb2fb0 (patch)
tree6691fda7c0985077aeb6ff3a93e829447dddd736 /externals/zlib
parentec244dbe366e84a93c8fa1ef294af4a2e4e3b0b1 (diff)
parentdc510c9a143de1977daedea0aefb9589c01adde2 (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"
>