From 0a86da7f011c8e6722d7c54309b1560041704e09 Mon Sep 17 00:00:00 2001 From: kichik Date: Wed, 5 Oct 2005 13:42:04 +0000 Subject: [PATCH] use CPPDEFINES in RCCOM git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4305 212acab6-be3b-0410-9dea-997c60f758d6 --- SCons/Tools/crossmingw.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/SCons/Tools/crossmingw.py b/SCons/Tools/crossmingw.py index 92f9a8a7..74dc3f86 100644 --- a/SCons/Tools/crossmingw.py +++ b/SCons/Tools/crossmingw.py @@ -149,10 +149,7 @@ def generate(env): env['RC'] = mingw_prefix + 'windres' env['RCFLAGS'] = SCons.Util.CLVar('') - 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 $_CPPINCFLAGS ${INCPREFIX}${SOURCE.dir} $RCFLAGS -i $SOURCE -o $TARGET' env['BUILDERS']['RES'] = res_builder # Some setting from the platform also have to be overridden: