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

diff --git a/scons/gallium.py b/scons/gallium.py
index fc1ed08e478529595fc7e0d14081144a0e20c7f7..3fbac760fdb71237c969e0363385e365eacac6ad 100644 (file)
--- 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,9 +438,14 @@ 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',

diff --git a/scons/generic.py b/scons/generic.py
index 23231966731573b9a90532ed9d2cfdd686af0e53..31a4a79594048c65c3394a1de081c2b317fdc545 100644 (file)
--- 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,9 +517,14 @@ 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',