From 12a608a3abac9ff29172c44afdea131d14805810 Mon Sep 17 00:00:00 2001 From: "U-ELIOT-019992DFC\\Administrator" Date: Tue, 10 Feb 2009 15:12:15 -0500 Subject: windows release option --- SConstruct | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/SConstruct b/SConstruct index 8320729ebe2..c598dc68d59 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 /MD /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" ]; -- cgit v1.2.1 From 014d06f1100a75a7aeb674303359f5f39bd114e8 Mon Sep 17 00:00:00 2001 From: "U-ELIOT-019992DFC\\Administrator" Date: Tue, 10 Feb 2009 15:38:20 -0500 Subject: MD -> MT --- SConstruct | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SConstruct b/SConstruct index c598dc68d59..c6006d459d8 100644 --- a/SConstruct +++ b/SConstruct @@ -243,7 +243,7 @@ elif "win32" == os.sys.platform: if release: env.Append( CPPDEFINES=[ "NDEBUG" ] ) - env.Append( CPPFLAGS= " /O2 /Oi /GL /FD /MD /Gy /nologo /Zi /TP /errorReport:prompt /Gm " ) + 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" ] ) -- cgit v1.2.1