1 files changed, 8 insertions, 0 deletions
diff --git a/scons/gallium.py b/scons/gallium.py
index 7135251d7a3..5103b924855 100755
--- a/scons/gallium.py
+++ b/scons/gallium.py
@@ -279,6 +279,8 @@ def generate(env):
             ('_WIN32_WINNT', '0x0601'),
             ('WINVER', '0x0601'),
         ]
+        if gcc:
+            cppdefines += [('__MSVCRT_VERSION__', '0x0700')]
         if msvc and env['toolchain'] != 'winddk':
             cppdefines += [
                 'VC_EXTRALEAN',
@@ -532,6 +534,12 @@ def generate(env):
             pass
         else:
             env['_LIBFLAGS'] = '-Wl,--start-group ' + env['_LIBFLAGS'] + ' -Wl,--end-group'
+        if env['platform'] == 'windows':
+            # Avoid depending on gcc runtime DLLs
+            linkflags += ['-static-libgcc']
+            # Handle the @xx symbol munging of DLL exports
+            shlinkflags += ['-Wl,--enable-stdcall-fixup']
+            #shlinkflags += ['-Wl,--kill-at']
     if msvc:
         if env['build'] == 'release':
             # enable Link-time Code Generation