Add --include-dir and the source directory when calling the MinGW resource compiler...

git-svn-id: http://scons.tigris.org/svn/scons/trunk@1290 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index cc3538f7e889b2e5edc108442ecf82397b4f38ec..3bd3f595f83b937a887b9b12f7fc3716b3d52fb6 100644 (file)
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -512,6 +512,11 @@ RELEASE 0.97 - XXX
 
   - Allow $JARCHDIR to be expanded to other construction variables.
 
+  From Amir Szekely:
+
+  - When calling the resource compiler on MinGW, add --include-dir and
+    the source directory so it finds the source file.
+
   From Greg Ward:
 
   - Fix a misplaced line in the man page.

diff --git a/src/engine/SCons/Tool/mingw.py b/src/engine/SCons/Tool/mingw.py
index 1fd1530c00d8ca5482fe6a730526f1acb9f30b97..c8b044be0671cb76a4c781f72af5d980b8d6b25d 100644 (file)
--- a/src/engine/SCons/Tool/mingw.py
+++ b/src/engine/SCons/Tool/mingw.py
@@ -142,7 +142,7 @@ def generate(env):
     env['RCINCFLAGS'] = '$( ${_concat(RCINCPREFIX, CPPPATH, RCINCSUFFIX, __env__, RDirs, TARGET)} $)'
     env['RCINCPREFIX'] = '--include-dir '
     env['RCINCSUFFIX'] = ''
-    env['RCCOM'] = '$RC $RCINCFLAGS $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: