diff options
| author | Keith Whitwell <[email protected]> | 2009-12-21 19:18:41 +0000 |
|---|---|---|
| committer | Keith Whitwell <[email protected]> | 2009-12-21 19:18:41 +0000 |
| commit | a5585cb533af3d4e5d5324d5f526447b98597402 (patch) | |
| tree | 6706dbb8b4f994b919e247647c3e8853d067b45c /scons/generic.py | |
| parent | d288a30610767f87e3e7c069730d4bc255246568 (diff) | |
| parent | 574715d8368f99c0a5720a9676385d58d6cfdf30 (diff) | |
Merge commit 'origin/master' into i965g-restart
Conflicts:
SConstruct
configs/default
configs/linux-dri
Diffstat (limited to 'scons/generic.py')
| -rw-r--r-- | scons/generic.py | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/scons/generic.py b/scons/generic.py index a9c2244a74f..859bf2ae64e 100644 --- a/scons/generic.py +++ b/scons/generic.py @@ -335,7 +335,11 @@ def generate(env): if msvc: cppdefines += [ 'VC_EXTRALEAN', + '_USE_MATH_DEFINES', + '_CRT_SECURE_NO_WARNINGS', '_CRT_SECURE_NO_DEPRECATE', + '_SCL_SECURE_NO_WARNINGS', + '_SCL_SECURE_NO_DEPRECATE', ] if debug: cppdefines += ['_DEBUG'] @@ -402,8 +406,6 @@ def generate(env): ccflags += ['-O0', '-g3'] # mingw 4.2.1 optimizer is broken else: ccflags += ['-O3', '-g0'] - if env['profile']: - ccflags += ['-pg'] if env['machine'] == 'x86': ccflags += [ '-m32', @@ -446,11 +448,6 @@ def generate(env): '/Ot', # favor code speed #'/fp:fast', # fast floating point ] - if env['profile']: - ccflags += [ - '/Gh', # enable _penter hook function - '/GH', # enable _pexit hook function - ] ccflags += [ '/W3', # warning level #'/Wp64', # enable 64 bit porting warnings |