Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-09-29 07:19:04 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2016-09-29 07:19:04 (GMT) |
| commit | 871c8955ae39e3eeb76a1bb72bf574764f5c30c3 (patch) | |
| tree | 66d7300d49c4b6cc4126487b4f13bab83fd11ae7 /BuildTools/SCons/Tools | |
| parent | 51670ef328e4ec12cc8283df04211030a2ea51a6 (diff) | |
| download | swift-871c8955ae39e3eeb76a1bb72bf574764f5c30c3.zip swift-871c8955ae39e3eeb76a1bb72bf574764f5c30c3.tar.bz2 | |
Support building against newer QtWebKit on macOS
Test-Information:
Tested with official Qt/QtWebKit 5.4.2 and Qt/QtWebKit 5.5.1.
Tested with official Qt 5.6.1 and QtWebKit from
https://github.com/annulen/webkit .
Change-Id: I2b8258faec71296591095e998e61da55ba0ca67c
Diffstat (limited to 'BuildTools/SCons/Tools')
| -rw-r--r-- | BuildTools/SCons/Tools/qt4.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/BuildTools/SCons/Tools/qt4.py b/BuildTools/SCons/Tools/qt4.py index f3678d7..b965e06 100644 --- a/BuildTools/SCons/Tools/qt4.py +++ b/BuildTools/SCons/Tools/qt4.py @@ -566,7 +566,7 @@ def enable_modules(self, modules, debug=False, crosscompiling=False, version='4' if len(self["QTDIR"]) > 0 : self.AppendUnique(LIBPATH=[os.path.join('$QTDIR','lib')]) self.AppendUnique(LINKFLAGS="-F$QTDIR/lib") - self.AppendUnique(CPPFLAGS="-iframework$QTDIR/lib") + self.AppendUnique(CPPFLAGS=["-iframework$QTDIR/lib", include_flag + os.path.join("$QTDIR", "include")]) self.Append(LINKFLAGS="-Wl,-rpath,$QTDIR/lib") # FIXME: Phonon Hack @@ -579,9 +579,9 @@ def enable_modules(self, modules, debug=False, crosscompiling=False, version='4' self.AppendUnique(LIBPATH=[os.path.join("$QTDIR","lib")]) else : if len(self["QTDIR"]) > 0 : - self.Append(CPPFLAGS = [include_flag + os.path.join("$QTDIR", "lib", module + ".framework", "Versions", version, "Headers")]) + self.Append(CPPFLAGS = [include_flag + os.path.join("$QTDIR", "lib", module + ".framework", "Headers")]) else : - self.Append(CPPFLAGS = [include_flag + os.path.join("/Library/Frameworks", module + ".framework", "Versions", version, "Headers")]) + self.Append(CPPFLAGS = [include_flag + os.path.join("/Library/Frameworks", module + ".framework", "Headers")]) self.Append(LINKFLAGS=['-framework', module]) if 'QtOpenGL' in modules: self.AppendUnique(LINKFLAGS="-F/System/Library/Frameworks") |