diff options
author | liujisi@google.com <liujisi@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2012-12-05 07:02:32 +0000 |
---|---|---|
committer | liujisi@google.com <liujisi@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2012-12-05 07:02:32 +0000 |
commit | ed95d54e92b4ae97378a8b3966a45b359fd6d4f0 (patch) | |
tree | d6feb0fe6e31dc9c899e6f67365d561b2f21176b | |
parent | 6fb956d9dbc965ecf70441c442a0144d64f4f0f9 (diff) | |
download | protobuf-ed95d54e92b4ae97378a8b3966a45b359fd6d4f0.tar.gz protobuf-ed95d54e92b4ae97378a8b3966a45b359fd6d4f0.tar.bz2 protobuf-ed95d54e92b4ae97378a8b3966a45b359fd6d4f0.zip |
Define macros on more targets to make gtest work for vs2012
-rw-r--r-- | vsprojects/lite-test.vcproj | 4 | ||||
-rwxr-xr-x | 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 8020a500..0314b36d 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 44a18c3e..2dcf2ad6 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" |