From c8fa4b59f54e57340623bf061c75a2f4567063cb Mon Sep 17 00:00:00 2001 From: Ambal Date: Sat, 18 Jul 2009 03:47:59 +0400 Subject: [PATCH] [8194] Use _SECURE_SCL=0 for speedup iterators work at Windows platform in release mode. Change added for VC80/VC90, but not added for VC10. --- src/shared/revision_nr.h | 2 +- win/VC80/framework.vcproj | 4 ++-- win/VC80/g3dlite.vcproj | 4 ++-- win/VC80/game.vcproj | 4 ++-- win/VC80/genrevision.vcproj | 4 ++-- win/VC80/mangosd.vcproj | 4 ++-- win/VC80/realmd.vcproj | 4 ++-- win/VC80/script.vcproj | 4 ++-- win/VC80/shared.vcproj | 4 ++-- win/VC80/sockets.vcproj | 4 ++-- win/VC90/framework.vcproj | 5 +++-- win/VC90/g3dlite.vcproj | 5 +++-- win/VC90/game.vcproj | 5 +++-- win/VC90/genrevision.vcproj | 5 +++-- win/VC90/mangosd.vcproj | 4 ++-- win/VC90/realmd.vcproj | 5 +++-- win/VC90/script.vcproj | 4 ++-- win/VC90/shared.vcproj | 5 +++-- win/VC90/sockets.vcproj | 5 +++-- 19 files changed, 44 insertions(+), 37 deletions(-) diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 47b1af20f..25f3a756f 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "8193" + #define REVISION_NR "8194" #endif // __REVISION_NR_H__ diff --git a/win/VC80/framework.vcproj b/win/VC80/framework.vcproj index 4b127d313..833262ea8 100644 --- a/win/VC80/framework.vcproj +++ b/win/VC80/framework.vcproj @@ -345,7 +345,7 @@ AdditionalOptions="/Zl /MP" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\src\framework;..\..\dep\ACE_wrappers" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0" StringPooling="true" MinimalRebuild="false" RuntimeLibrary="2" @@ -421,7 +421,7 @@ AdditionalOptions="/Zl /MP" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\src\framework;..\..\dep\ACE_wrappers" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0" StringPooling="true" MinimalRebuild="false" RuntimeLibrary="2" diff --git a/win/VC80/g3dlite.vcproj b/win/VC80/g3dlite.vcproj index 90a76ee44..5b76b6fb9 100644 --- a/win/VC80/g3dlite.vcproj +++ b/win/VC80/g3dlite.vcproj @@ -186,7 +186,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/MP" AdditionalIncludeDirectories="..\..\dep\include\g3dlite" - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_SECURE_SCL=0" RuntimeLibrary="2" EnableEnhancedInstructionSet="1" UsePrecompiledHeader="0" @@ -399,7 +399,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/MP" AdditionalIncludeDirectories="..\..\dep\include\g3dlite" - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_SECURE_SCL=0" RuntimeLibrary="2" EnableEnhancedInstructionSet="0" UsePrecompiledHeader="0" diff --git a/win/VC80/game.vcproj b/win/VC80/game.vcproj index e4b1c4567..7be6d53b9 100644 --- a/win/VC80/game.vcproj +++ b/win/VC80/game.vcproj @@ -130,7 +130,7 @@ AdditionalOptions="/MP /Zm200" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\shared\vmap;..\..\dep\ACE_wrappers" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;FASTBUILD" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;FASTBUILD;_SECURE_SCL=0" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -377,7 +377,7 @@ AdditionalOptions="/MP /bigobj /Zm200" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\shared\vmap;..\..\dep\ACE_wrappers" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;FASTBUILD" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;FASTBUILD;_SECURE_SCL=0" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" diff --git a/win/VC80/genrevision.vcproj b/win/VC80/genrevision.vcproj index a9ea44b72..2faca2dd6 100644 --- a/win/VC80/genrevision.vcproj +++ b/win/VC80/genrevision.vcproj @@ -187,7 +187,7 @@ Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_SECURE_SCL=0" RuntimeLibrary="2" EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" @@ -406,7 +406,7 @@ Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_SECURE_SCL=0" RuntimeLibrary="2" EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" diff --git a/win/VC80/mangosd.vcproj b/win/VC80/mangosd.vcproj index 9b49a8969..be3c37288 100644 --- a/win/VC80/mangosd.vcproj +++ b/win/VC80/mangosd.vcproj @@ -48,7 +48,7 @@ AdditionalOptions="/MP" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\dep\include,..\..\src\framework,..\..\src\shared,..\..\src\game,..\..\src\mangosd;..\..\dep\ACE_wrappers" - PreprocessorDefinitions="VERSION="0.14.0-DEV";WIN32;NDEBUG;_CONSOLE;ENABLE_CLI" + PreprocessorDefinitions="VERSION="0.14.0-DEV";WIN32;NDEBUG;_CONSOLE;ENABLE_CLI;_SECURE_SCL=0" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -352,7 +352,7 @@ AdditionalOptions="/MP" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\dep\include,..\..\src\framework,..\..\src\shared,..\..\src\game,..\..\src\mangosd;..\..\dep\ACE_wrappers" - PreprocessorDefinitions="VERSION="0.14.0-DEV";WIN32;NDEBUG;_CONSOLE;ENABLE_CLI" + PreprocessorDefinitions="VERSION="0.14.0-DEV";WIN32;NDEBUG;_CONSOLE;ENABLE_CLI;_SECURE_SCL=0" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" diff --git a/win/VC80/realmd.vcproj b/win/VC80/realmd.vcproj index 435fe0914..a2222e4e7 100644 --- a/win/VC80/realmd.vcproj +++ b/win/VC80/realmd.vcproj @@ -48,7 +48,7 @@ AdditionalOptions="/MP" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers" - PreprocessorDefinitions="VERSION="0.14.0-DEV",WIN32,NDEBUG,_CONSOLE" + PreprocessorDefinitions="VERSION="0.14.0-DEV",WIN32,NDEBUG,_CONSOLE;_SECURE_SCL=0" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -147,7 +147,7 @@ AdditionalOptions="/MP" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers" - PreprocessorDefinitions="VERSION="0.14.0-DEV",WIN32,NDEBUG,_CONSOLE" + PreprocessorDefinitions="VERSION="0.14.0-DEV",WIN32,NDEBUG,_CONSOLE;_SECURE_SCL=0" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" diff --git a/win/VC80/script.vcproj b/win/VC80/script.vcproj index 661cae4ed..811740ae6 100644 --- a/win/VC80/script.vcproj +++ b/win/VC80/script.vcproj @@ -375,7 +375,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/MP" AdditionalIncludeDirectories="..\..\src\shared;..\..\src\framework;..\..\dep\include;..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SCRIPT" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SCRIPT;_SECURE_SCL=0" RuntimeLibrary="2" EnableEnhancedInstructionSet="1" UsePrecompiledHeader="0" @@ -458,7 +458,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/MP" AdditionalIncludeDirectories="..\..\src\shared;..\..\src\framework;..\..\dep\include;..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SCRIPT" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SCRIPT;_SECURE_SCL=0" RuntimeLibrary="2" EnableEnhancedInstructionSet="0" UsePrecompiledHeader="0" diff --git a/win/VC80/shared.vcproj b/win/VC80/shared.vcproj index 6b4bc4e07..c0991b3bd 100644 --- a/win/VC80/shared.vcproj +++ b/win/VC80/shared.vcproj @@ -47,7 +47,7 @@ AdditionalOptions="/MP" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\dep\include;..\..\dep\include\g3dlite;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -130,7 +130,7 @@ AdditionalOptions="/MP" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\dep\include;..\..\dep\include\g3dlite;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" diff --git a/win/VC80/sockets.vcproj b/win/VC80/sockets.vcproj index 8d8f5fd6c..9d057f5dd 100644 --- a/win/VC80/sockets.vcproj +++ b/win/VC80/sockets.vcproj @@ -46,7 +46,7 @@ AdditionalOptions="/MP" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\dep\include\sockets" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -280,7 +280,7 @@ AdditionalOptions="/MP" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\dep\include\sockets" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" diff --git a/win/VC90/framework.vcproj b/win/VC90/framework.vcproj index 0244fa688..1d4ef0f81 100644 --- a/win/VC90/framework.vcproj +++ b/win/VC90/framework.vcproj @@ -6,6 +6,7 @@ ProjectGUID="{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}" RootNamespace="framework" Keyword="Win32Proj" + TargetFrameworkVersion="0" >