Commits

Steven Knight  committed 3787384

Add use of $CPPDEFINES to $RCCOM on MinGW. (Amir Szekely)

  • Participants
  • Parent commits 1daef21

Comments (0)

Files changed (4)

File doc/man/scons.1

 General options passed to the archive indexer.
 
 .IP RC
-The resource compiler used by the RES builder.
+The resource compiler used to build
+a Microsoft Visual C++ resource file.
 
 .IP RCCOM
-The command line used by the RES builder.
+The command line used to build
+a Microsoft Visual C++ resource file.
 
 .IP RCCOMSTR
-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 $RCCOM (the command line) is displayed.
 
 .IP RCFLAGS

File src/CHANGES.txt

 
   - Update EnsureSConsVersion() to support revision numbers.
 
+  - Add use of $CPPDEFINES to $RCCOM (resource file compilation) on MinGW.
+
   From Dobes Vandermeer:
 
   - Add support for SCC and other settings in Microsoft Visual

File src/engine/SCons/Tool/mingw.py

     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:

File src/engine/SCons/Tool/msvc.xml

 
 <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>