scons: Move MinGW flags from crossmingw.py to gallium.py

[mesa.git] / scons / crossmingw.py

diff --git a/scons/crossmingw.py b/scons/crossmingw.py
index 4a695a440d65c5788b1308fe0e345af7d2e7891c..893002f64a99c157aaa1904884e4eb9592f29351 100644 (file)
--- a/scons/crossmingw.py
+++ b/scons/crossmingw.py
@@ -57,10 +57,10 @@ prefixes32 = SCons.Util.Split("""
     i686-w64-mingw32-
 """)
 prefixes64 = SCons.Util.Split("""
+    x86_64-w64-mingw32-
     amd64-mingw32-
     amd64-mingw32msvc-
     amd64-pc-mingw32-
-    x86_64-w64-mingw32-
 """)
 
 def find(env):
@@ -225,14 +225,6 @@ def generate(env):
     # default in recent gcc versions
     env.AppendUnique(CCFLAGS = ['-gstabs'])
 
-    env.AppendUnique(CPPDEFINES = [('__MSVCRT_VERSION__', '0x0700')])
-    #env.AppendUnique(LIBS = ['iberty'])
-    env.AppendUnique(SHLINKFLAGS = ['-Wl,--enable-stdcall-fixup'])
-    #env.AppendUnique(SHLINKFLAGS = ['-Wl,--kill-at'])
-
-    # Avoid depending on gcc runtime DLLs
-    env.AppendUnique(LINKFLAGS = ['-static-libgcc'])
-
     env.AddMethod(compile_without_gstabs, 'compile_without_gstabs')
 
 def exists(env):