Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2009-06-07 08:15:07 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2009-06-07 08:15:07 (GMT) |
| commit | ad0f3588a1afeba7425025012266910930be4d01 (patch) | |
| tree | e08193fa9f9f22ea77383a47abe82469487a3531 /UI/Qt/qmakeish.py | |
| parent | 13ec84712a12272bd465f37503edad7a2763b322 (diff) | |
| download | swift-ad0f3588a1afeba7425025012266910930be4d01.zip swift-ad0f3588a1afeba7425025012266910930be4d01.tar.bz2 | |
Use bundled Expat with qmakeish.
Diffstat (limited to 'UI/Qt/qmakeish.py')
| -rwxr-xr-x | UI/Qt/qmakeish.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/UI/Qt/qmakeish.py b/UI/Qt/qmakeish.py index fb85c44..573e828 100755 --- a/UI/Qt/qmakeish.py +++ b/UI/Qt/qmakeish.py @@ -58,7 +58,7 @@ for line in makefile : conditional = "win32" elif conditional == "MACOSX" : conditional = "mac" - elif match.group(2).startswith("HAVE_") : + elif match.group(2).startswith("HAVE_") or match.group(2).startswith("USE_") : conditional = "!isEmpty(" + match.group(2) + ")" else : conditional = "DUMMY" @@ -80,7 +80,7 @@ for line in makefile : continue match = re.match("(\w+)_SOURCES (\+?)= (.*)", line) - if match and match.group(1) in ["SWIFTEN", "ZLIB", "LIBIDN", "BOOST"] : + if match and match.group(1) in ["SWIFTEN", "ZLIB", "LIBIDN", "BOOST", "EXPAT"] : inSources = processSourcesLine(match.group(3)) continue |