diff options
| author | Dwight <dmerriman@gmail.com> | 2009-02-10 15:39:55 -0500 |
|---|---|---|
| committer | Dwight <dmerriman@gmail.com> | 2009-02-10 15:39:55 -0500 |
| commit | 6c62dd105dc8c397b4e36dececa2062b4c8a8c8e (patch) | |
| tree | e2435b2f8a8ef2c611a8535b978bb1222583b5bc | |
| parent | 2b96bea8d08a1f2426fd46a3a782bd408da9ea53 (diff) | |
| parent | 014d06f1100a75a7aeb674303359f5f39bd114e8 (diff) | |
| download | mongo-6c62dd105dc8c397b4e36dececa2062b4c8a8c8e.tar.gz | |
Merge branch 'master' of git.10gen.com:/data/gitroot/p
| -rw-r--r-- | SConstruct | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/SConstruct b/SConstruct index 8320729ebe2..c6006d459d8 100644 --- a/SConstruct +++ b/SConstruct @@ -238,10 +238,17 @@ elif "win32" == os.sys.platform: env.Append( CPPPATH=[ boostDir , javaHome + "/include" , javaHome + "/include/win32" , "pcre-7.4" , winSDKHome + "/Include" ] ) - # /Fo"Debug\\" /Fd"Debug\vc90.pdb" + env.Append( CPPFLAGS=" /EHsc /W3 " ) + env.Append( CPPDEFINES=["WIN32","_CONSOLE","_CRT_SECURE_NO_WARNINGS","HAVE_CONFIG_H","PCRE_STATIC","_UNICODE","UNICODE" ] ) - env.Append( CPPFLAGS=" /Od /EHsc /Gm /RTC1 /MDd /ZI /W3 " ) - env.Append( CPPDEFINES=["WIN32","_DEBUG","_CONSOLE","_CRT_SECURE_NO_WARNINGS","HAVE_CONFIG_H","PCRE_STATIC","_UNICODE","UNICODE" ] ) + if release: + env.Append( CPPDEFINES=[ "NDEBUG" ] ) + env.Append( CPPFLAGS= " /O2 /Oi /GL /FD /MT /Gy /nologo /Zi /TP /errorReport:prompt /Gm " ) + # /Yu"stdafx.h" /Fp"Release\db.pch" /Fo"Release\\" /Fd"Release\vc90.pdb" + else: + env.Append( CPPDEFINES=[ "_DEBUG" ] ) + env.Append( CPPFLAGS=" /Od /Gm /RTC1 /MDd /ZI " ) + # /Fo"Debug\\" /Fd"Debug\vc90.pdb" env.Append( LIBPATH=[ boostDir + "/Lib" , javaHome + "/Lib" , winSDKHome + "/Lib" ] ) javaLibs += [ "jvm" ]; |