From f36e4322dc8e4fae14fe728009c7581e8a6c51ac Mon Sep 17 00:00:00 2001
From: Steven Knight <knight@baldmt.com>
Date: Sun, 6 Nov 2005 00:36:35 +0000
Subject: Add use of $CPPDEFINES to $RCCOM on MinGW.  (Amir Szekely)

---
 doc/man/scons.1                | 9 ++++++---
 src/CHANGES.txt                | 2 ++
 src/engine/SCons/Tool/mingw.py | 2 +-
 src/engine/SCons/Tool/msvc.xml | 9 ++++++---
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/doc/man/scons.1 b/doc/man/scons.1
index ef6e8b8..47a74d4 100644
--- a/doc/man/scons.1
+++ b/doc/man/scons.1
@@ -7066,13 +7066,16 @@ The archive indexer.
 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
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index f65e061..de7bf8e 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -710,6 +710,8 @@ RELEASE 0.97 - XXX
 
   - 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
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>
-- 
cgit v0.12