diff options
| author | ruki <[email protected]> | 2020-11-14 18:51:09 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2020-11-14 18:51:09 +0800 |
| commit | d3f2f44851b4b95d91f5fc47c23fe7dc980c57d8 (patch) | |
| tree | 6c72720ebb8b56507a69a116914c5b75c80bdfd5 /xmake/rules | |
| parent | b64d782bc0ae37950aa8d5c7e155a939348820d3 (diff) | |
improve qt/static
Diffstat (limited to 'xmake/rules')
| -rw-r--r-- | xmake/rules/qt/xmake.lua | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/xmake/rules/qt/xmake.lua b/xmake/rules/qt/xmake.lua index 89410eeaa..a77ea2fd2 100644 --- a/xmake/rules/qt/xmake.lua +++ b/xmake/rules/qt/xmake.lua @@ -106,14 +106,18 @@ rule("qt.widgetapp_static") after_load(function (target) local plugins = {} + local frameworks = {"QtGui", "QtWidgets", "QtCore"} if is_plat("macosx") then - plugins.QCocoaIntegrationPlugin = {linkdirs = "plugins/platforms", links = {"qcocoa", "Qt5PrintSupport", "Qt5PlatformSupport", "cups"}} + plugins.QCocoaIntegrationPlugin = {linkdirs = "plugins/platforms", links = {"qcocoa", "cups"}} + table.join2(frameworks, "QtPrintSupport", "QtPlatformSupport", "QtWidgets") elseif is_plat("windows") then - plugins.QWindowsIntegrationPlugin = {linkdirs = "plugins/platforms", links = {"Qt5PrintSupport", "Qt5PlatformSupport", "qwindows"}} + plugins.QWindowsIntegrationPlugin = {linkdirs = "plugins/platforms", links = {"qwindows"}} + table.join2(frameworks, "QtPrintSupport", "QtPlatformSupport", "QtWidgets") elseif is_plat("wasm") then - plugins.QWasmIntegrationPlugin = {linkdirs = "plugins/platforms", links = {"Qt5EventDispatcherSupport", "Qt5FontDatabaseSupport", "Qt5EglSupport", "qwasm"}} + plugins.QWasmIntegrationPlugin = {linkdirs = "plugins/platforms", links = {"qwasm"}} + table.join2(frameworks, "QtEventDispatcherSupport", "QtFontDatabaseSupport", "QtEglSupport") end - import("load")(target, {gui = true, plugins = plugins, frameworks = {"QtGui", "QtWidgets", "QtCore"}}) + import("load")(target, {gui = true, plugins = plugins, frameworks = frameworks}) end) -- deploy application @@ -154,14 +158,18 @@ rule("qt.quickapp_static") after_load(function (target) local plugins = {} + local frameworks = {"QtGui", "QtQuick", "QtQml", "QtQmlModels", "QtCore", "QtNetwork"} if is_plat("macosx") then - plugins.QCocoaIntegrationPlugin = {linkdirs = "plugins/platforms", links = {"qcocoa", "Qt5PrintSupport", "Qt5PlatformSupport", "Qt5Widgets", "cups"}} + plugins.QCocoaIntegrationPlugin = {linkdirs = "plugins/platforms", links = {"qcocoa", "cups"}} + table.join2(frameworks, "QtPrintSupport", "QtPlatformSupport", "QtWidgets") elseif is_plat("windows") then - plugins.QWindowsIntegrationPlugin = {linkdirs = "plugins/platforms", links = {"Qt5PrintSupport", "Qt5PlatformSupport", "Qt5Widgets", "qwindows"}} + plugins.QWindowsIntegrationPlugin = {linkdirs = "plugins/platforms", links = {"qwindows"}} + table.join2(frameworks, "QtPrintSupport", "QtPlatformSupport", "QtWidgets") elseif is_plat("wasm") then - plugins.QWasmIntegrationPlugin = {linkdirs = "plugins/platforms", links = {"Qt5EventDispatcherSupport", "Qt5FontDatabaseSupport", "Qt5EglSupport", "qwasm"}} + plugins.QWasmIntegrationPlugin = {linkdirs = "plugins/platforms", links = {"qwasm"}} + table.join2(frameworks, "QtEventDispatcherSupport", "QtFontDatabaseSupport", "QtEglSupport") end - import("load")(target, {gui = true, plugins = plugins, frameworks = {"QtGui", "QtQuick", "QtQml", "QtQmlModels", "QtCore", "QtNetwork"}}) + import("load")(target, {gui = true, plugins = plugins, frameworks = frameworks}) end) -- deploy application |