Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2009-08-10 06:39:34 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2009-08-10 06:39:34 (GMT) |
| commit | 2edf74915432242ba99e7820a7633a06c755c17b (patch) | |
| tree | 7bcfda9ab1bccae2c8315e2cdd35e0a547a1604b | |
| parent | 4e0d6417402bc410e6918a2f41a9db43568c23ab (diff) | |
| download | swift-contrib-2edf74915432242ba99e7820a7633a06c755c17b.zip swift-contrib-2edf74915432242ba99e7820a7633a06c755c17b.tar.bz2 | |
Fixed Linux SCons compilation.
| -rw-r--r-- | SConstruct | 14 | ||||
| -rw-r--r-- | site_scons/site_tools/qt4.py | 27 |
2 files changed, 16 insertions, 25 deletions
@@ -6,11 +6,15 @@ env.Dump() if ARGUMENTS.get("V") != "1": if sys.stdout.isatty() and env["PLATFORM"] != "win32": - env["CCCOMSTR"] = " \033[0;33;140mCC\033[0m $TARGET" - env["CXXCOMSTR"] = " \033[0;32;140mCXX\033[0m $TARGET" - env["LINKCOMSTR"] = " \033[0;31;140mLINK\033[0m $TARGET" - env["ARCOMSTR"] = " \033[0;31;140mAR\033[0m $TARGET" - env["RANLIBCOMSTR"] = " \033[0;31;140mRANLIB\033[0m $TARGET" + env["CCCOMSTR"] = " \033[0;33;140mCC\033[0m $TARGET" + env["CXXCOMSTR"] = " \033[0;32;140mCXX\033[0m $TARGET" + env["LINKCOMSTR"] = " \033[0;31;140mLINK\033[0m $TARGET" + env["ARCOMSTR"] = " \033[0;31;140mAR\033[0m $TARGET" + env["RANLIBCOMSTR"] = " \033[0;31;140mRANLIB\033[0m $TARGET" + env["QT4_RCCCOMSTR"] = " \033[0;34;140mRCC\033[0m $TARGET" + env["QT4_UICCOMSTR"] = " \033[0;34;140mUIC\033[0m $TARGET" + env["QT4_MOCFROMHCOMSTR"] = " \033[0;34;140mMOC\033[0m $TARGET" + env["QT4_MOCFROMCXXCOMSTR"] = " \033[0;34;140mMOC\033[0m $TARGET" #Progress(' \033[0;35;140mDEP\033[0m $TARGET\n', overwrite = True) else : env["CCCOMSTR"] = " CC $TARGET" diff --git a/site_scons/site_tools/qt4.py b/site_scons/site_tools/qt4.py index 2fd26aa..6df945b 100644 --- a/site_scons/site_tools/qt4.py +++ b/site_scons/site_tools/qt4.py @@ -334,7 +334,7 @@ def generate(env): argument = None, skeys = ['.qrc']) qrcbuilder = Builder( - action = SCons.Action.Action('$QT4_RCCCOM'), #, '$QT4_RCCCOMSTR'), + action = SCons.Action.Action('$QT4_RCCCOM', cmdstr = '$QT4_RCCCOMSTR'), source_scanner = qrcscanner, src_suffix = '$QT4_QRCSUFFIX', suffix = '$QT4_QRCCXXSUFFIX', @@ -345,7 +345,7 @@ def generate(env): # Interface builder uic4builder = Builder( - action = SCons.Action.Action('$QT4_UICCOM'), #, '$QT4_UICCOMSTR'), + action = SCons.Action.Action('$QT4_UICCOM', cmdstr = '$QT4_UICCOMSTR'), src_suffix='$QT4_UISUFFIX', suffix='$QT4_UICDECLSUFFIX', prefix='$QT4_UICDECLPREFIX', @@ -357,12 +357,12 @@ def generate(env): # Metaobject builder mocBld = Builder(action={}, prefix={}, suffix={}) for h in header_extensions: - act = SCons.Action.Action('$QT4_MOCFROMHCOM') #, '$QT4_MOCFROMHCOMSTR') + act = SCons.Action.Action('$QT4_MOCFROMHCOM', cmdstr = '$QT4_MOCFROMHCOMSTR') mocBld.add_action(h, act) mocBld.prefix[h] = '$QT4_MOCHPREFIX' mocBld.suffix[h] = '$QT4_MOCHSUFFIX' for cxx in cxx_suffixes: - act = SCons.Action.Action('$QT4_MOCFROMCXXCOM') #, '$QT4_MOCFROMCXXCOMSTR') + act = SCons.Action.Action('$QT4_MOCFROMCXXCOM', cmdstr = '$QT4_MOCFROMCXXCOMSTR') mocBld.add_action(cxx, act) mocBld.prefix[cxx] = '$QT4_MOCCXXPREFIX' mocBld.suffix[cxx] = '$QT4_MOCCXXSUFFIX' @@ -415,11 +415,6 @@ def enable_modules(self, modules, debug=False, crosscompiling=False) : 'QtHelp', 'QtScript', ] - pclessModules = [ -# in qt <= 4.3 designer and designerComponents are pcless, on qt4.4 they are not, so removed. -# 'QtDesigner', -# 'QtDesignerComponents', - ] staticModules = [ 'QtUiTools', ] @@ -448,20 +443,12 @@ def enable_modules(self, modules, debug=False, crosscompiling=False) : debugSuffix = '' if sys.platform in ["linux2"] and not crosscompiling : if debug : debugSuffix = '_debug' + self.AppendUnique(CPPPATH=[os.path.join("$QTDIR","include", "phonon")]) for module in modules : - if module not in pclessModules : continue self.AppendUnique(LIBS=[module+debugSuffix]) self.AppendUnique(LIBPATH=[os.path.join("$QTDIR","lib")]) - self.AppendUnique(CPPPATH=[os.path.join("$QTDIR","include","qt4")]) - self.AppendUnique(CPPPATH=[os.path.join("$QTDIR","include","qt4",module)]) - pcmodules = [module+debugSuffix for module in modules if module not in pclessModules ] - if 'QtDBus' in pcmodules: - self.AppendUnique(CPPPATH=[os.path.join("$QTDIR","include","qt4","QtDBus")]) - if "QtAssistant" in pcmodules: - self.AppendUnique(CPPPATH=[os.path.join("$QTDIR","include","qt4","QtAssistant")]) - pcmodules.remove("QtAssistant") - pcmodules.append("QtAssistantClient") - self.ParseConfig('pkg-config %s --libs --cflags'% ' '.join(pcmodules)) + self.AppendUnique(CPPPATH=[os.path.join("$QTDIR","include")]) + self.AppendUnique(CPPPATH=[os.path.join("$QTDIR","include",module)]) self["QT4_MOCCPPPATH"] = self["CPPPATH"] return if sys.platform == "win32" or crosscompiling : |