From f5f242caf80d96a6ec057fc746e5d53a34de7077 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Wed, 12 Oct 2011 11:23:49 +0800 Subject: [PATCH] Update VS projects Get rid of _CRT_SECURE_NO_WARNINGS and _CRT_NONSTDC_NO_WARNINGS from the preprocessor definitions as those two macros are now defined in msvc_recommended_pragmas.h, which is force-included in these projects via the property sheets. This will silence C4005 warnings on macro redefinition. --- build/win32/vs10/glib-compile-schemas.vcxproj | 8 ++++---- build/win32/vs10/gsettings.vcxproj | 8 ++++---- build/win32/vs10/gspawn-win32-helper-console.vcxproj | 8 ++++---- build/win32/vs10/gspawn-win32-helper.vcxproj | 8 ++++---- build/win32/vs10/testglib.vcxproj | 8 ++++---- build/win32/vs9/glib-compile-schemas.vcproj | 8 ++++---- build/win32/vs9/gsettings.vcproj | 8 ++++---- build/win32/vs9/gspawn-win32-helper-console.vcproj | 8 ++++---- build/win32/vs9/gspawn-win32-helper.vcproj | 8 ++++---- build/win32/vs9/testglib.vcproj | 8 ++++---- 10 files changed, 40 insertions(+), 40 deletions(-) diff --git a/build/win32/vs10/glib-compile-schemas.vcxproj b/build/win32/vs10/glib-compile-schemas.vcxproj index 888f35e1b..220abd617 100644 --- a/build/win32/vs10/glib-compile-schemas.vcxproj +++ b/build/win32/vs10/glib-compile-schemas.vcxproj @@ -72,7 +72,7 @@ Disabled ..\..\..\gmodule;%(AdditionalIncludeDirectories) - _DEBUG;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + _DEBUG;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -91,7 +91,7 @@ Disabled ..\..\..\gmodule;%(AdditionalIncludeDirectories) - DEBUG;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + DEBUG;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -115,7 +115,7 @@ MaxSpeed true ..\..\..\gmodule;%(AdditionalIncludeDirectories) - _CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + %(PreprocessorDefinitions) MultiThreadedDLL true @@ -134,7 +134,7 @@ ..\..\..\gmodule;%(AdditionalIncludeDirectories) - _CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + %(PreprocessorDefinitions) MultiThreadedDLL diff --git a/build/win32/vs10/gsettings.vcxproj b/build/win32/vs10/gsettings.vcxproj index 926610773..9348ff09e 100644 --- a/build/win32/vs10/gsettings.vcxproj +++ b/build/win32/vs10/gsettings.vcxproj @@ -72,7 +72,7 @@ Disabled ..\..\..\gmodule;%(AdditionalIncludeDirectories) - _DEBUG;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + _DEBUG;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -91,7 +91,7 @@ Disabled ..\..\..\gmodule;%(AdditionalIncludeDirectories) - DEBUG;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + DEBUG;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -115,7 +115,7 @@ MaxSpeed true ..\..\..\gmodule;%(AdditionalIncludeDirectories) - _CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + %(PreprocessorDefinitions) MultiThreadedDLL true @@ -135,7 +135,7 @@ ..\..\..\gmodule;%(AdditionalIncludeDirectories) - _CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + %(PreprocessorDefinitions) MultiThreadedDLL diff --git a/build/win32/vs10/gspawn-win32-helper-console.vcxproj b/build/win32/vs10/gspawn-win32-helper-console.vcxproj index 9c62fb321..b9ea865cf 100644 --- a/build/win32/vs10/gspawn-win32-helper-console.vcxproj +++ b/build/win32/vs10/gspawn-win32-helper-console.vcxproj @@ -71,7 +71,7 @@ Disabled - _CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + %(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -92,7 +92,7 @@ - _CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + %(PreprocessorDefinitions) MultiThreadedDLL @@ -114,7 +114,7 @@ Disabled - _CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + %(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -136,7 +136,7 @@ - _CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + %(PreprocessorDefinitions) MultiThreadedDLL diff --git a/build/win32/vs10/gspawn-win32-helper.vcxproj b/build/win32/vs10/gspawn-win32-helper.vcxproj index 8a50a44bb..591ae1bf3 100644 --- a/build/win32/vs10/gspawn-win32-helper.vcxproj +++ b/build/win32/vs10/gspawn-win32-helper.vcxproj @@ -71,7 +71,7 @@ Disabled - _CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + %(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -93,7 +93,7 @@ Disabled - _CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + %(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -115,7 +115,7 @@ - _CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + %(PreprocessorDefinitions) MultiThreadedDLL @@ -137,7 +137,7 @@ - _CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + %(PreprocessorDefinitions) MultiThreadedDLL diff --git a/build/win32/vs10/testglib.vcxproj b/build/win32/vs10/testglib.vcxproj index 297183caf..980113bd7 100644 --- a/build/win32/vs10/testglib.vcxproj +++ b/build/win32/vs10/testglib.vcxproj @@ -71,7 +71,7 @@ Disabled - _CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + _DEBUG;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -92,7 +92,7 @@ - _CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + %(PreprocessorDefinitions) MultiThreadedDLL @@ -114,7 +114,7 @@ Disabled - _CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + _DEBUG;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -135,7 +135,7 @@ - _CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + %(PreprocessorDefinitions) MultiThreadedDLL diff --git a/build/win32/vs9/glib-compile-schemas.vcproj b/build/win32/vs9/glib-compile-schemas.vcproj index 817cbe596..d96a743b4 100644 --- a/build/win32/vs9/glib-compile-schemas.vcproj +++ b/build/win32/vs9/glib-compile-schemas.vcproj @@ -32,7 +32,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\gmodule" - PreprocessorDefinitions="_DEBUG;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS" + PreprocessorDefinitions="_DEBUG" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -58,7 +58,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\gmodule" - PreprocessorDefinitions="DEBUG;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS" + PreprocessorDefinitions="_DEBUG" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -92,7 +92,7 @@ Optimization="2" AdditionalIncludeDirectories="..\..\..\gmodule" EnableIntrinsicFunctions="true" - PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS" + PreprocessorDefinitions="" RuntimeLibrary="2" EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" @@ -119,7 +119,7 @@