Mesa (master): scons: Build DLLs/ EXEs with more memory debugger friendlier settings.

[Jose Fonseca]

Module: Mesa
Branch: master
Commit: 73ccabc124f2c706d7fde490e4438413d2b94317
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=73ccabc124f2c706d7fde490e4438413d2b94317

Author: José Fonseca <jfonseca at vmware.com>
Date:   Thu Feb 12 11:57:45 2009 +0000

scons: Build DLLs/EXEs with more memory debugger friendlier settings.

---

 scons/gallium.py |    8 +++++++-
 scons/generic.py |    8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/scons/gallium.py b/scons/gallium.py
index fc1ed08..3fbac76 100644
--- a/scons/gallium.py
+++ b/scons/gallium.py
@@ -347,6 +347,7 @@ def generate(env):
               '/Od', # disable optimizations
               '/Oi', # enable intrinsic functions
               '/Oy-', # disable frame pointer omission
+              '/GL-', # disable whole program optimization
             ]
         else:
             cflags += [
@@ -437,10 +438,15 @@ def generate(env):
             linkflags += ['-m32']
         if env['machine'] == 'x86_64':
             linkflags += ['-m64']
-    if platform == 'winddk':
+    if platform == 'windows':
         # See also:
         # - http://msdn2.microsoft.com/en-us/library/y0zzbyt4.aspx
         linkflags += [
+            '/fixed:no',
+            '/incremental:no',
+        ]
+    if platform == 'winddk':
+        linkflags += [
             '/merge:_PAGE=PAGE',
             '/merge:_TEXT=.text',
             '/section:INIT,d',
diff --git a/scons/generic.py b/scons/generic.py
index 2323196..31a4a79 100644
--- a/scons/generic.py
+++ b/scons/generic.py
@@ -425,6 +425,7 @@ def generate(env):
               '/Od', # disable optimizations
               '/Oi', # enable intrinsic functions
               '/Oy-', # disable frame pointer omission
+              '/GL-', # disable whole program optimization
             ]
         else:
             ccflags += [
@@ -516,10 +517,15 @@ def generate(env):
             linkflags += ['-m32']
         if env['machine'] == 'x86_64':
             linkflags += ['-m64']
-    if platform == 'winddk':
+    if platform == 'windows':
         # See also:
         # - http://msdn2.microsoft.com/en-us/library/y0zzbyt4.aspx
         linkflags += [
+            '/fixed:no',
+            '/incremental:no',
+        ]
+    if platform == 'winddk':
+        linkflags += [
             '/merge:_PAGE=PAGE',
             '/merge:_TEXT=.text',
             '/section:INIT,d',