Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2013-07-15 18:04:19 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2013-07-15 18:04:19 (GMT) |
| commit | d31fe6a73cf29df1e7bf0edd76c30aa124bb0328 (patch) | |
| tree | 7075b946eb9909a276e754b65436d3d7455dc5d0 /Swift/QtUI/SConscript | |
| parent | ffb8c6b0cdcdfa133680d87a1cebe8fecff8426b (diff) | |
| download | swift-d31fe6a73cf29df1e7bf0edd76c30aa124bb0328.zip swift-d31fe6a73cf29df1e7bf0edd76c30aa124bb0328.tar.bz2 | |
Fixed Qt5 compilation on Windows.
Change-Id: I2d4de311e7d8c6909f6a35dbb650380e2b0b1da9
Diffstat (limited to 'Swift/QtUI/SConscript')
| -rw-r--r-- | Swift/QtUI/SConscript | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript index d71375d..ae674f3 100644 --- a/Swift/QtUI/SConscript +++ b/Swift/QtUI/SConscript @@ -359,7 +359,7 @@ if env.get("SWIFT_INSTALLDIR", "") : env.Install(os.path.join(env["SWIFT_INSTALLDIR"], "share", "swift", dir), resource) if env["PLATFORM"] == "win32" : - if env["DIST"] : + if env["DIST"] or ARGUMENTS.get("dump_trace") : commonResources[""] = commonResources.get("", []) + [ #os.path.join(env["OPENSSL_DIR"], "bin", "ssleay32.dll"), #os.path.join(env["OPENSSL_DIR"], "bin", "libeay32.dll"), @@ -368,12 +368,21 @@ if env["PLATFORM"] == "win32" : if env["SWIFTEN_DLL"] : commonResources[""] = commonResources.get("", []) + ["#/Swiften/${SWIFTEN_LIBRARY_FILE}"] qtimageformats = ["gif", "ico", "jpeg", "mng", "svg", "tiff"] - qtlibs = ["QtCore4", "QtGui4", "QtNetwork4", "QtWebKit4", "QtXMLPatterns4", "phonon4"] + qtlibs = ["QtCore", "QtGui", "QtNetwork", "QtWebKit", "QtXMLPatterns"] + if qt_version == '4' : + qtlibs.append("phonon") + qtlibs = [lib + '4' for lib in qtlibs] + else : + qtlibs += ['QtQuick', 'QtQml', 'QtV8', 'QtMultimedia', 'QtSql', 'QtSensors', 'QtWidgets', 'QtWebKitWidgets', 'QtMultimediaWidgets', 'QtOpenGL', 'QtPrintSupport'] + qtlibs = [lib.replace('Qt', 'Qt5') for lib in qtlibs] + qtlibs += ['icuin51', 'icuuc51', 'icudt51', 'libGLESv2', 'libEGL'] windowsBundleFiles = myenv.WindowsBundle("Swift", resources = commonResources, qtimageformats = qtimageformats, - qtlibs = qtlibs) + qtlibs = qtlibs, + qtversion = qt_version) + if env["DIST"] : #myenv.Append(NSIS_OPTIONS = [ # "/DmsvccRedistributableDir=\"" + env["vcredist"] + "\"", # "/DbuildVersion=" + myenv["SWIFT_VERSION"] |