Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2011-08-13 21:35:46 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-08-13 21:35:46 (GMT) |
| commit | 946a94332761a058c6842e543d7e625bc5e9c9e1 (patch) | |
| tree | ea2102c4657a082df6dd81f48e9e11a41915a413 | |
| parent | 08536b4ed31c30a25a343c3c2619676e67a0c692 (diff) | |
| download | swift-contrib-946a94332761a058c6842e543d7e625bc5e9c9e1.zip swift-contrib-946a94332761a058c6842e543d7e625bc5e9c9e1.tar.bz2 | |
Fixed Qt SCons tool on Linux 3.0 systems.
Resolves: #961
| -rw-r--r-- | BuildTools/SCons/Tools/qt4.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/BuildTools/SCons/Tools/qt4.py b/BuildTools/SCons/Tools/qt4.py index 0f2e976..2c40454 100644 --- a/BuildTools/SCons/Tools/qt4.py +++ b/BuildTools/SCons/Tools/qt4.py @@ -439,19 +439,19 @@ def enable_modules(self, modules, debug=False, crosscompiling=False) : 'QtGui' : ['QT_GUI_LIB'], 'QtNetwork' : ['QT_NETWORK_LIB'], 'QtCore' : ['QT_CORE_LIB'], } for module in modules : try : self.AppendUnique(CPPDEFINES=moduleDefines[module]) except: pass debugSuffix = '' - if sys.platform in ["linux2"] and not crosscompiling : + if sys.platform.startswith("linux") and not crosscompiling : if debug : debugSuffix = '_debug' self.AppendUnique(CPPPATH=[os.path.join("$QTDIR","include", "phonon")]) for module in modules : self.AppendUnique(LIBS=[module+debugSuffix]) self.AppendUnique(LIBPATH=[os.path.join("$QTDIR","lib")]) self.AppendUnique(CPPPATH=[os.path.join("$QTDIR","include")]) self.AppendUnique(CPPPATH=[os.path.join("$QTDIR","include",module)]) self["QT4_MOCCPPPATH"] = self["CPPPATH"] return |