ref: d4145ee76cc5cf7110c25c25fc35332234610a1f
parent: 0c246861b71159f837a11436ff58daa6980f7be2
parent: 1e607d71d254e05666ae5b2633b22786dc99cdfc
author: huili2 <[email protected]>
date: Tue May 6 09:59:36 EDT 2014
Merge pull request #792 from zhilwang/msvc-gtest Fix gtest build error when OS=msvc.
--- a/build/platform-msvc-common.mk
+++ b/build/platform-msvc-common.mk
@@ -19,7 +19,7 @@
CXX=cl
AR=lib
CXX_O=-Fo$@
-CFLAGS += -nologo -W3 -EHsc -fp:precise -Zc:wchar_t -Zc:forScope -DGTEST_HAS_TR1_TUPLE=0
+CFLAGS += -nologo -W3 -EHsc -fp:precise -Zc:wchar_t -Zc:forScope -DGTEST_HAS_TR1_TUPLE=1 -DGTEST_USE_OWN_TR1_TUPLE=1
CXX_LINK_O=-nologo -Fe$@
AR_OPTS=-nologo -out:$@
CFLAGS_OPT=-O2 -Ob1 -Oy- -Zi -GF -Gm- -GS -Gy -DNDEBUG