diff --git a/SCons/Config/gnu b/SCons/Config/gnu index 347132df..3fbb63f8 100644 --- a/SCons/Config/gnu +++ b/SCons/Config/gnu @@ -2,10 +2,6 @@ print "Using GNU tools configuration" Import('defenv') -# patch #1313856 for SCons -# http://sourceforge.net/tracker/?func=detail&aid=1313856&group_id=30337&atid=398973 -defenv['RCCOM'] = '$RC $_CPPDEFFLAGS $_CPPINCFLAGS ${INCPREFIX}${SOURCE.dir} $RCFLAGS -i $SOURCE -o $TARGET' - ### imports Import('FlagsConfigure') diff --git a/SConstruct b/SConstruct index 8629b912..f483d304 100644 --- a/SConstruct +++ b/SConstruct @@ -9,9 +9,9 @@ EnsurePythonVersion(1,6) try: - EnsureSConsVersion(0,96,91) + EnsureSConsVersion(0,96,92) except TypeError: # EnsureSConsVersion in older versions took only two parameters - print 'SCons 0.96.91 or greater is required, but you have an older version' + print 'SCons 0.96.92 or greater is required, but you have an older version' Exit(2) stubs = [