Index: SCons/Tools/crossmingw.py
===================================================================
RCS file: /cvsroot/nsis/NSIS/SCons/Tools/crossmingw.py,v
retrieving revision 1.1
diff -u -r1.1 crossmingw.py
--- SCons/Tools/crossmingw.py	20 May 2005 11:23:43 -0000	1.1
+++ SCons/Tools/crossmingw.py	16 Sep 2005 11:40:24 -0000
@@ -104,7 +104,7 @@
     return (target, source)
                          
 
-shlib_action = SCons.Action.CommandGenerator(shlib_generator)
+shlib_action = SCons.Action.Action(shlib_generator, generator=1)
 
 res_action = SCons.Action.Action('$RCCOM', '$RCCOMSTR')
 
@@ -149,10 +149,10 @@
 
     env['RC'] = mingw_prefix + 'windres'
     env['RCFLAGS'] = SCons.Util.CLVar('')
-    env['RCINCFLAGS'] = '$( ${_concat(RCINCPREFIX, CPPPATH, RCINCSUFFIX, __env__, RDirs, TARGET)} $)'
+    env['RCINCFLAGS'] = '$( ${_concat(RCINCPREFIX, CPPPATH, RCINCSUFFIX, __env__, RDirs, TARGET, SOURCE)} $)'
     env['RCINCPREFIX'] = '--include-dir '
     env['RCINCSUFFIX'] = ''
-    env['RCCOM'] = '$RC $RCINCFLAGS $RCINCPREFIX $SOURCE.dir $RCFLAGS -i $SOURCE -o $TARGET'
+    env['RCCOM'] = '$RC $RCINCFLAGS $RCINCPREFIX ${SOURCE.dir} $RCFLAGS -i $SOURCE -o $TARGET'
     env['BUILDERS']['RES'] = res_builder
     
     # Some setting from the platform also have to be overridden: