diff options
| author | Steven Knight <knight@baldmt.com> | 2005-05-07 23:07:26 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2005-05-07 23:07:26 (GMT) |
| commit | b38acff111056cb09789d864e011837c43ebee35 (patch) | |
| tree | 051c87cde1af0020e813499dcbdae0457b01062f | |
| parent | 074bef6dcc8d7ae0ed9f37f3e99a5078b7e408ba (diff) | |
| download | SCons-b38acff111056cb09789d864e011837c43ebee35.zip SCons-b38acff111056cb09789d864e011837c43ebee35.tar.gz SCons-b38acff111056cb09789d864e011837c43ebee35.tar.bz2 | |
Add --include-dir and the source directory when calling the MinGW resource compiler. (Amir Szekely)
| -rw-r--r-- | src/CHANGES.txt | 5 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/mingw.py | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index cc3538f..3bd3f59 100644 --- 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 1fd1530..c8b044b 100644 --- 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: |