diff options
| author | ruki <[email protected]> | 2019-03-03 21:16:24 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2019-03-03 21:16:24 +0800 |
| commit | ee633ec6733376854fa8ea8a38da5b83fb47f5e4 (patch) | |
| tree | 9bbc43d494c8a4d4179968a74f7b6a95a8f0ecac | |
| parent | 76c2fdae16c324c721d22a8dc168dcd5216c4bc7 (diff) | |
add some win links for qt
| -rw-r--r-- | tests/projects/qt/quickapp_static/xmake.lua | 2 | ||||
| -rw-r--r-- | tests/projects/qt/widgetapp_static/xmake.lua | 2 | ||||
| -rw-r--r-- | xmake/rules/qt/load.lua | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/tests/projects/qt/quickapp_static/xmake.lua b/tests/projects/qt/quickapp_static/xmake.lua index de9f968a5..a7e447bfb 100644 --- a/tests/projects/qt/quickapp_static/xmake.lua +++ b/tests/projects/qt/quickapp_static/xmake.lua @@ -25,7 +25,7 @@ target("qt_demo") if is_plat("macosx") then qt_add_static_plugins("QCocoaIntegrationPlugin", {linkdirs = "plugins/platforms", links = {"qcocoa", "Qt5PrintSupport", "Qt5PlatformSupport", "Qt5Widgets", "cups"}}) elseif is_plat("windows") then - qt_add_static_plugins("QWindowsIntegrationPlugin", {linkdirs = "plugins/platforms", links = {"Qt5PrintSupport", "Qt5PlatformSupport", "Qt5Widgets", "cups"}}) + qt_add_static_plugins("QWindowsIntegrationPlugin", {linkdirs = "plugins/platforms", links = {"Qt5PrintSupport", "Qt5PlatformSupport", "Qt5Widgets", "qwindows"}}) end -- add plugin: qml.QtQuick diff --git a/tests/projects/qt/widgetapp_static/xmake.lua b/tests/projects/qt/widgetapp_static/xmake.lua index 8adc77d11..936b10e8e 100644 --- a/tests/projects/qt/widgetapp_static/xmake.lua +++ b/tests/projects/qt/widgetapp_static/xmake.lua @@ -28,7 +28,7 @@ target("qt_demo") if is_plat("macosx") then qt_add_static_plugins("QCocoaIntegrationPlugin", {linkdirs = "plugins/platforms", links = {"qcocoa", "Qt5PrintSupport", "Qt5PlatformSupport", "cups"}}) elseif is_plat("windows") then - qt_add_static_plugins("QWindowsIntegrationPlugin", {linkdirs = "plugins/platforms", links = {"Qt5PrintSupport", "Qt5PlatformSupport", "cups"}}) + qt_add_static_plugins("QWindowsIntegrationPlugin", {linkdirs = "plugins/platforms", links = {"Qt5PrintSupport", "Qt5PlatformSupport", "qwindows"}}) end -- add plugin: QSvgPlugin (optional) diff --git a/xmake/rules/qt/load.lua b/xmake/rules/qt/load.lua index b8f162672..bd0414904 100644 --- a/xmake/rules/qt/load.lua +++ b/xmake/rules/qt/load.lua @@ -184,6 +184,7 @@ function main(target, opt) target:add("includedirs", path.join(qt.sdkdir, "include")) target:add("includedirs", path.join(qt.sdkdir, "mkspecs/win32-msvc")) target:add("linkdirs", qt.linkdirs) + target:add("syslinks", "ws2_32", "gdi32", "ole32", "advapi32", "shell32", "user32", "OpenGL32", "imm32", "winmm") elseif is_plat("mingw") then target:set("frameworks", nil) target:add("includedirs", path.join(qt.sdkdir, "include")) |