Swiftdiff options
Diffstat (limited to 'BuildTools/SCons/Tools/qt4.py')
| -rw-r--r-- | BuildTools/SCons/Tools/qt4.py | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/BuildTools/SCons/Tools/qt4.py b/BuildTools/SCons/Tools/qt4.py index ea86223..e019b2c 100644 --- a/BuildTools/SCons/Tools/qt4.py +++ b/BuildTools/SCons/Tools/qt4.py @@ -468,12 +468,18 @@ def enable_modules(self, modules, debug=False, crosscompiling=False, version='4' } for module in modules : try : self.AppendUnique(CPPDEFINES=moduleDefines[module]) except: pass debugSuffix = '' + + include_flag = "-I" + if self["CC"] in ("gcc", "clang"): + include_flag = "-isystem" + + if sys.platform != "win32" and sys.platform != "darwin" and not crosscompiling : if self["qt"]: # The user specified qt path in config.py and we are going to use the # installation under that location. UsePkgConfig = False else: @@ -541,28 +547,28 @@ def enable_modules(self, modules, debug=False, crosscompiling=False, version='4' if sys.platform=="darwin" : if debug : debugSuffix = 'd' if len(self["QTDIR"]) > 0 : self.AppendUnique(LIBPATH=[os.path.join('$QTDIR','lib')]) self.AppendUnique(LINKFLAGS="-F$QTDIR/lib") - self.AppendUnique(CPPFLAGS="-F$QTDIR/lib") + self.AppendUnique(CPPFLAGS="-iframework$QTDIR/lib") self.AppendUnique(LINKFLAGS="-L$QTDIR/lib") #TODO clean! # FIXME: Phonon Hack if version == '4' : self.Append(LINKFLAGS=['-framework', "phonon"]) for module in modules : if module in staticModules : self.AppendUnique(LIBS=[module+debugSuffix]) # TODO: Add the debug suffix self.AppendUnique(LIBPATH=[os.path.join("$QTDIR","lib")]) else : if len(self["QTDIR"]) > 0 : - self.Append(CPPFLAGS = ["-I" + os.path.join("$QTDIR", "lib", module + ".framework", "Versions", version, "Headers")]) + self.Append(CPPFLAGS = [include_flag + os.path.join("$QTDIR", "lib", module + ".framework", "Versions", version, "Headers")]) else : - self.Append(CPPFLAGS = ["-I" + os.path.join("/Library/Frameworks", module + ".framework", "Versions", version, "Headers")]) + self.Append(CPPFLAGS = [include_flag + os.path.join("/Library/Frameworks", module + ".framework", "Versions", version, "Headers")]) self.Append(LINKFLAGS=['-framework', module]) if 'QtOpenGL' in modules: self.AppendUnique(LINKFLAGS="-F/System/Library/Frameworks") self.Append(LINKFLAGS=['-framework', 'AGL']) #TODO ughly kludge to avoid quotes self.Append(LINKFLAGS=['-framework', 'OpenGL']) self["QT4_MOCCPPPATH"] = self["CPPPATH"] |