X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=scons%2Fcrossmingw.py;h=a4ae74e8d5454e3fc729ffea864791fd6c04821a;hb=1a366701b81765a46afffff22073d05fc6c3de73;hp=bf81f16fd6404f5b981be197caa19d453ec9499b;hpb=76d8951fd3adbb91b2f71d461eec0f304619ca0b;p=mesa.git

diff --git a/scons/crossmingw.py b/scons/crossmingw.py
index bf81f16fd64..a4ae74e8d54 100644
--- a/scons/crossmingw.py
+++ b/scons/crossmingw.py
@@ -108,7 +108,7 @@ def shlib_emitter(target, source, env):
     return (target, source)
                          
 
-shlib_action = SCons.Action.Action(shlib_generator, generator=1)
+shlib_action = SCons.Action.Action(shlib_generator, '$SHLINKCOMSTR', generator=1)
 
 res_action = SCons.Action.Action('$RCCOM', '$RCCOMSTR')
 
@@ -177,7 +177,8 @@ def generate(env):
     # default in recent gcc versions
     env.AppendUnique(CFLAGS = ['-gstabs'])
 
-    env.AppendUnique(LIBS = ['iberty'])
+    env.AppendUnique(CPPDEFINES = [('__MSVCRT_VERSION__', '0x0700')])
+    #env.AppendUnique(LIBS = ['iberty'])
     env.AppendUnique(SHLINKFLAGS = ['-Wl,--enable-stdcall-fixup'])
     #env.AppendUnique(SHLINKFLAGS = ['-Wl,--kill-at'])