diff options
| author | Steven Knight <knight@baldmt.com> | 2005-11-06 00:36:35 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2005-11-06 00:36:35 (GMT) |
| commit | f36e4322dc8e4fae14fe728009c7581e8a6c51ac (patch) | |
| tree | 67663a944a2f4d892e11bd160ffd2474781201f0 /src/engine | |
| parent | 568ec0ceb00075cc9fc807b247fe39d2adc087d2 (diff) | |
| download | SCons-f36e4322dc8e4fae14fe728009c7581e8a6c51ac.zip SCons-f36e4322dc8e4fae14fe728009c7581e8a6c51ac.tar.gz SCons-f36e4322dc8e4fae14fe728009c7581e8a6c51ac.tar.bz2 | |
Add use of $CPPDEFINES to $RCCOM on MinGW. (Amir Szekely)
Diffstat (limited to 'src/engine')
| -rw-r--r-- | src/engine/SCons/Tool/mingw.py | 2 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/msvc.xml | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/engine/SCons/Tool/mingw.py b/src/engine/SCons/Tool/mingw.py index 2e737e1..300198e 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, SOURCE)} $)' env['RCINCPREFIX'] = '--include-dir ' env['RCINCSUFFIX'] = '' - env['RCCOM'] = '$RC $RCINCFLAGS $RCINCPREFIX ${SOURCE.dir} $RCFLAGS -i $SOURCE -o $TARGET' + env['RCCOM'] = '$RC $_CPPDEFFLAGS $RCINCFLAGS ${RCINCPREFIX}${SOURCE.dir} $RCFLAGS -i $SOURCE -o $TARGET' env['BUILDERS']['RES'] = res_builder # Some setting from the platform also have to be overridden: diff --git a/src/engine/SCons/Tool/msvc.xml b/src/engine/SCons/Tool/msvc.xml index 426014b..76529b1 100644 --- a/src/engine/SCons/Tool/msvc.xml +++ b/src/engine/SCons/Tool/msvc.xml @@ -88,19 +88,22 @@ env['PCHSTOP'] = 'StdAfx.h' <cvar name="RC"> <summary> -The resource compiler used by the RES builder. +The resource compiler used to build +a Microsoft Visual C++ resource file. </summary> </cvar> <cvar name="RCCOM"> <summary> -The command line used by the RES builder. +The command line used to build +a Microsoft Visual C++ resource file. </summary> </cvar> <cvar name="RCCOMSTR"> <summary> -The string displayed when invoking the resource compiler. +The string displayed when invoking the resource compiler +to build a Microsoft Visual C++ resource file. If this is not set, then &cv-RCCOM; (the command line) is displayed. </summary> </cvar> |