Swiftdiff options
| -rw-r--r-- | 3rdParty/SCons/scons-local/SCons/Tool/install.py | 2 | ||||
| -rw-r--r-- | SConstruct | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/3rdParty/SCons/scons-local/SCons/Tool/install.py b/3rdParty/SCons/scons-local/SCons/Tool/install.py index 3680b53..9596db1 100644 --- a/3rdParty/SCons/scons-local/SCons/Tool/install.py +++ b/3rdParty/SCons/scons-local/SCons/Tool/install.py @@ -83,13 +83,13 @@ def installFunc(target, source, env): return 0 def stringFunc(target, source, env): installstr = env.get('INSTALLSTR') if installstr: - return env.subst_target_source(installstr, 0, target, source) + return env.subst_target_source(installstr, 1, target, source) target = str(target[0]) source = str(source[0]) if os.path.isdir(source): type = 'directory' else: type = 'file' @@ -150,12 +150,13 @@ if int(ARGUMENTS.get("V", 0)) == 0: env["QT4_MOCFROMCXXCOMSTR"] = colorize("MOC", "$TARGET", "blue") env["GENCOMSTR"] = colorize("GEN", "$TARGET", "blue") env["RCCOMSTR"] = colorize("RC", "$TARGET", "blue") env["BUNDLECOMSTR"] = colorize("BUNDLE", "$TARGET", "blue") env["NIBCOMSTR"] = colorize("NIB", "$TARGET", "blue") env["NSISCOMSTR"] = colorize("NSIS", "$TARGET", "blue") + env["INSTALLSTR"] = colorize("INSTALL", "$TARGET", "blue") env["TESTCOMSTR"] = colorize("TEST", "$SOURCE", "yellow") #Progress(colorize("DEP", "$TARGET", "red") def checkObjCHeader(context, header) : context.Message("Checking for Objective-C header " + header + " ... ") ret = context.TryCompile("#include <Cocoa/Cocoa.h>\n#include <" + header + ">", ".m") |