Mercurial > hg > truffle

changeset 2074:dbf8dcf069d1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author zgu
date Mon, 27 Dec 2010 09:56:29 -0500
parents e0c969b97f66 (diff) d6cd0d55d0b5 (current diff)
children 06e4b9c9db76
files make/windows/makefiles/compile.make
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/make/windows/makefiles/compile.make	Thu Dec 23 07:58:35 2010 -0800
+++ b/make/windows/makefiles/compile.make	Mon Dec 27 09:56:29 2010 -0500
@@ -152,7 +152,7 @@
 !endif
 
 # Always add the _STATIC_CPPLIB flag
-STATIC_CPPLIB_OPTION = /D _STATIC_CPPLIB
+STATIC_CPPLIB_OPTION = /D _STATIC_CPPLIB /D _DISABLE_DEPRECATE_STATIC_CPPLIB
 MS_RUNTIME_OPTION = $(MS_RUNTIME_OPTION) $(STATIC_CPPLIB_OPTION)
 CPP_FLAGS=$(CPP_FLAGS) $(MS_RUNTIME_OPTION)