From ed95d54e92b4ae97378a8b3966a45b359fd6d4f0 Mon Sep 17 00:00:00 2001 From: "liujisi@google.com" Date: Wed, 5 Dec 2012 07:02:32 +0000 Subject: [PATCH] Define macros on more targets to make gtest work for vs2012 --- vsprojects/lite-test.vcproj | 4 ++-- vsprojects/test_plugin.vcproj | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/vsprojects/lite-test.vcproj b/vsprojects/lite-test.vcproj index 8020a500a8..0314b36d10 100644 --- a/vsprojects/lite-test.vcproj +++ b/vsprojects/lite-test.vcproj @@ -46,7 +46,7 @@ AdditionalOptions="/wd4244 /wd4267 /wd4018 /wd4355 /wd4800 /wd4251 /wd4996 /wd4146 /wd4305" Optimization="0" AdditionalIncludeDirectories="../src;.;../gtest/include" - PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_VARIADIC_MAX=10;" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -122,7 +122,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/wd4244 /wd4267 /wd4018 /wd4355 /wd4800 /wd4251 /wd4996 /wd4146 /wd4305" AdditionalIncludeDirectories="../src;.;../gtest/include" - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_VARIADIC_MAX=10;" RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" diff --git a/vsprojects/test_plugin.vcproj b/vsprojects/test_plugin.vcproj index 44a18c3e0d..2dcf2ad6d1 100755 --- a/vsprojects/test_plugin.vcproj +++ b/vsprojects/test_plugin.vcproj @@ -46,7 +46,7 @@ AdditionalOptions="/wd4244 /wd4267 /wd4018 /wd4355 /wd4800 /wd4251 /wd4996 /wd4146 /wd4305" Optimization="0" AdditionalIncludeDirectories="../src;.;../gtest/include" - PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_VARIADIC_MAX=10;" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -122,7 +122,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/wd4244 /wd4267 /wd4018 /wd4355 /wd4800 /wd4251 /wd4996 /wd4146 /wd4305" AdditionalIncludeDirectories="../src;.;../gtest/include" - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_VARIADIC_MAX=10;" RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3"