diff options
| author | marha <marha@users.sourceforge.net> | 2013-01-24 08:40:35 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-01-24 08:40:35 +0100 |
| commit | 3e3af07f7697e9d23dd62fcf8f3a055602ae3341 (patch) | |
| tree | 9ad4b80b0c4df6e2dae13cde8d248a72273f9aae /mesalib/scons/gallium.py | |
| parent | 7002c66cfba01e7d3b88dae498a195f78f0e83f5 (diff) | |
| parent | 06872e284da1c00ce03b234ca24aefeac64990d2 (diff) | |
| download | vcxsrv-3e3af07f7697e9d23dd62fcf8f3a055602ae3341.tar.gz vcxsrv-3e3af07f7697e9d23dd62fcf8f3a055602ae3341.tar.bz2 vcxsrv-3e3af07f7697e9d23dd62fcf8f3a055602ae3341.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa pixman xkbcomp xserver git update 24 jan 2013
Conflicts:
mesalib/src/glsl/.gitignore
Diffstat (limited to 'mesalib/scons/gallium.py')
| -rw-r--r-- | mesalib/scons/gallium.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/scons/gallium.py b/mesalib/scons/gallium.py index 7207c6bb2..a8b1f0301 100644 --- a/mesalib/scons/gallium.py +++ b/mesalib/scons/gallium.py @@ -399,7 +399,6 @@ def generate(env): ccflags += [ '/Od', # disable optimizations '/Oi', # enable intrinsic functions - '/Oy-', # disable frame pointer omission ] else: ccflags += [ @@ -411,6 +410,7 @@ def generate(env): ] else: ccflags += [ + '/Oy-', # disable frame pointer omission '/GL-', # disable whole program optimization ] ccflags += [ |