? SCons/Tools/crossmingw.py
Index: SConstruct
===================================================================
RCS file: /cvsroot/nsis/NSIS/SConstruct,v
retrieving revision 1.13
diff -u -r1.13 SConstruct
--- SConstruct	12 May 2005 16:27:34 -0000	1.13
+++ SConstruct	18 May 2005 02:40:40 -0000
@@ -29,7 +29,7 @@
 	'NSISdl',
 	'Splash',
 	'StartMenu',
-	'System',
+#	'System',
 	'UserInfo',
 	'VPatch/Source/Plugin'
 ]
Index: Contrib/NSISdl/SConscript
===================================================================
RCS file: /cvsroot/nsis/NSIS/Contrib/NSISdl/SConscript,v
retrieving revision 1.3
diff -u -r1.3 SConscript
--- Contrib/NSISdl/SConscript	30 Apr 2005 18:04:54 -0000	1.3
+++ Contrib/NSISdl/SConscript	18 May 2005 02:40:43 -0000
@@ -21,4 +21,4 @@
 
 Import('BuildPlugin')
 
-BuildPlugin(target, files, libs, docs = docs)
+BuildPlugin(target, files, libs, docs = docs, nodeflib = 0)
Index: Docs/src/SConscript
===================================================================
RCS file: /cvsroot/nsis/NSIS/Docs/src/SConscript,v
retrieving revision 1.3
diff -u -r1.3 SConscript
--- Docs/src/SConscript	30 Apr 2005 18:04:55 -0000	1.3
+++ Docs/src/SConscript	18 May 2005 02:40:44 -0000
@@ -65,7 +65,6 @@
 		Copy(build_dir, '${SOURCE.dir}/chmlink.js'),
 		Copy(build_dir, '${SOURCE.dir}/nsis.hhp'),
 		Action('cd "%s" && "%s" ${SOURCES.abspath}' % (build_dir, halibut[0].abspath)),
-		hhc_action
 	]
 )
 
Index: SCons/Config/gnu
===================================================================
RCS file: /cvsroot/nsis/NSIS/SCons/Config/gnu,v
retrieving revision 1.7
diff -u -r1.7 gnu
--- SCons/Config/gnu	7 May 2005 13:44:05 -0000	1.7
+++ SCons/Config/gnu	18 May 2005 02:40:46 -0000
@@ -10,26 +10,8 @@
 
 ### cross compiling
 
-import SCons.Util
-
-res_action = Action('$RCCOM', '$RCCOMSTR')
-res_builder = Builder(action=res_action, suffix='.o')
-
 def cross_env(env):
-	if env['MINGWPREFIX']:
-		prefix = env['MINGWPREFIX']
-
-		env['CC']   = prefix + '-gcc'
-		env['CXX']  = prefix + '-g++'
-		env['LINK'] = prefix + '-g++'
-		env['RC']   = prefix + '-windres'
-
-		env['RCFLAGS'] = SCons.Util.CLVar('')
-		env['RCINCFLAGS'] = '$( ${_concat(RCINCPREFIX, CPPPATH, RCINCSUFFIX, __env__, RDirs, TARGET)} $)'
-		env['RCINCPREFIX'] = '--include-dir '
-		env['RCINCSUFFIX'] = ''
-		env['RCCOM'] = '$RC $RCINCFLAGS $RCINCPREFIX $SOURCE.dir $RCFLAGS -i $SOURCE -o $TARGET'
-		env['BUILDERS']['RES'] = res_builder
+	env.Tool('crossmingw', toolpath = ['../Tools'])
 
 ### flags