Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-02-11 04:28:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge, again

Browse Source 
--HG--
branch : trunk
This commit is contained in:
Tartalo
2010-06-06 22:38:27 +02:00
parent 12d1becdcf 6501255bc5
commit fe3976b347
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
externals/zlib/win/VC90/zlib.vcproj vendored
View File

@@ -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"
>