diff options
| author | Michal Krol <michal@vmware.com> | 2009-12-12 16:48:32 +0100 |
|---|---|---|
| committer | Michal Krol <michal@vmware.com> | 2009-12-12 16:48:32 +0100 |
| commit | a3eb0f718e19653a2ad8e49396c904183be456f3 (patch) | |
| tree | 0092574c469ea586a6cab8b8ebb7ac62b8221a2a /scons/generic.py | |
| parent | 491f384c3958067e6c4c994041f5d8d413b806bc (diff) | |
| parent | 784cca9fa527de771754d76545970f78094b9adf (diff) | |
Merge branch 'master' into glsl-pp-rework-2
Conflicts:
progs/perf/drawoverhead.c
progs/perf/teximage.c
progs/perf/vbo.c
progs/perf/vertexrate.c
src/mesa/shader/slang/library/slang_common_builtin_gc.h
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 a9c2244a74..859bf2ae64 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 |