diff options
| author | Xanadu <none@none> | 2010-07-20 02:49:28 +0200 |
|---|---|---|
| committer | Xanadu <none@none> | 2010-07-20 02:49:28 +0200 |
| commit | 79622802f397258ee0f34327ba3ae6977ca3e7ff (patch) | |
| tree | 1868946c234ab9ee256a6b7766a15713eae94235 /externals/zlib/win | |
| parent | 7dd2dc91816ab8b3bc3b99a1b1c99c7ea314d5a8 (diff) | |
| parent | f906976837502fa5aa81b982b901d1509f5aa0c4 (diff) | |
Merge. Revision history for source files should be all back now.
--HG--
branch : trunk
rename : sql/CMakeLists.txt => sql/tools/CMakeLists.txt
rename : src/server/game/Pools/PoolHandler.cpp => src/server/game/Pools/PoolMgr.cpp
rename : src/server/game/Pools/PoolHandler.h => src/server/game/Pools/PoolMgr.h
rename : src/server/game/PrecompiledHeaders/NixCorePCH.cpp => src/server/game/PrecompiledHeaders/gamePCH.cpp
rename : src/server/game/PrecompiledHeaders/NixCorePCH.h => src/server/game/PrecompiledHeaders/gamePCH.h
Diffstat (limited to 'externals/zlib/win')
| -rw-r--r-- | externals/zlib/win/VC90/zlib.vcproj | 43 |
1 files changed, 25 insertions, 18 deletions
diff --git a/externals/zlib/win/VC90/zlib.vcproj b/externals/zlib/win/VC90/zlib.vcproj index 1b63254aa23..8ffe8163edc 100644 --- a/externals/zlib/win/VC90/zlib.vcproj +++ b/externals/zlib/win/VC90/zlib.vcproj @@ -21,8 +21,8 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory="..\..\bin\$(PlatformName)_$(ConfigurationName)" - IntermediateDirectory=".\zlib__$(PlatformName)_$(ConfigurationName)" + OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" ConfigurationType="4" CharacterSet="2" > @@ -45,14 +45,15 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" - MinimalRebuild="true" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE" + MinimalRebuild="false" BasicRuntimeChecks="3" RuntimeLibrary="3" EnableFunctionLevelLinking="true" + EnableEnhancedInstructionSet="0" RuntimeTypeInfo="true" UsePrecompiledHeader="0" - PrecompiledHeaderFile=".\zlib__$(PlatformName)_$(ConfigurationName)\zlib.pch" + PrecompiledHeaderFile="" WarningLevel="3" Detect64BitPortabilityProblems="false" DebugInformationFormat="3" @@ -89,8 +90,8 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="..\..\bin\$(PlatformName)_$(ConfigurationName)" - IntermediateDirectory=".\zlib__$(PlatformName)_$(ConfigurationName)" + OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" ConfigurationType="4" CharacterSet="2" > @@ -114,14 +115,15 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" - MinimalRebuild="true" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE" + MinimalRebuild="false" BasicRuntimeChecks="3" RuntimeLibrary="3" EnableFunctionLevelLinking="true" + EnableEnhancedInstructionSet="0" RuntimeTypeInfo="true" UsePrecompiledHeader="0" - PrecompiledHeaderFile=".\zlib__$(PlatformName)_$(ConfigurationName)\zlib.pch" + PrecompiledHeaderFile="" WarningLevel="3" Detect64BitPortabilityProblems="false" DebugInformationFormat="3" @@ -158,8 +160,8 @@ </Configuration> <Configuration Name="Release|Win32" - OutputDirectory="..\..\bin\$(PlatformName)_$(ConfigurationName)" - IntermediateDirectory=".\zlib__$(PlatformName)_$(ConfigurationName)" + OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" ConfigurationType="4" CharacterSet="2" > @@ -182,12 +184,14 @@ Name="VCCLCompilerTool" AdditionalOptions="/MP" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE" + StringPooling="true" RuntimeLibrary="2" + EnableFunctionLevelLinking="true" EnableEnhancedInstructionSet="1" RuntimeTypeInfo="true" UsePrecompiledHeader="0" - PrecompiledHeaderFile=".\zlib__$(PlatformName)_$(ConfigurationName)\zlib.pch" + PrecompiledHeaderFile="" WarningLevel="3" Detect64BitPortabilityProblems="false" DebugInformationFormat="3" @@ -205,6 +209,7 @@ <Tool Name="VCLibrarianTool" OutputFile="$(OutDir)\$(ProjectName).lib" + IgnoreAllDefaultLibraries="false" /> <Tool Name="VCALinkTool" @@ -224,8 +229,8 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="..\..\bin\$(PlatformName)_$(ConfigurationName)" - IntermediateDirectory=".\zlib__$(PlatformName)_$(ConfigurationName)" + OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" ConfigurationType="4" CharacterSet="2" > @@ -249,12 +254,14 @@ Name="VCCLCompilerTool" AdditionalOptions="/MP" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE" + StringPooling="true" RuntimeLibrary="2" + EnableFunctionLevelLinking="true" EnableEnhancedInstructionSet="0" RuntimeTypeInfo="true" UsePrecompiledHeader="0" - PrecompiledHeaderFile=".\zlib__$(PlatformName)_$(ConfigurationName)\zlib.pch" + PrecompiledHeaderFile="" WarningLevel="3" Detect64BitPortabilityProblems="false" DebugInformationFormat="3" |