updated for scons 0.96.91
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4265 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
parent
f8062527fa
commit
c465e44e56
1 changed files with 3 additions and 3 deletions
|
@ -104,7 +104,7 @@ def shlib_emitter(target, source, env):
|
|||
return (target, source)
|
||||
|
||||
|
||||
shlib_action = SCons.Action.CommandGenerator(shlib_generator)
|
||||
shlib_action = SCons.Action.Action(shlib_generator, generator=1)
|
||||
|
||||
res_action = SCons.Action.Action('$RCCOM', '$RCCOMSTR')
|
||||
|
||||
|
@ -149,10 +149,10 @@ def generate(env):
|
|||
|
||||
env['RC'] = mingw_prefix + 'windres'
|
||||
env['RCFLAGS'] = SCons.Util.CLVar('')
|
||||
env['RCINCFLAGS'] = '$( ${_concat(RCINCPREFIX, CPPPATH, RCINCSUFFIX, __env__, RDirs, TARGET)} $)'
|
||||
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 $RCINCFLAGS $RCINCPREFIX ${SOURCE.dir} $RCFLAGS -i $SOURCE -o $TARGET'
|
||||
env['BUILDERS']['RES'] = res_builder
|
||||
|
||||
# Some setting from the platform also have to be overridden:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue