diff options
| author | ruki <[email protected]> | 2018-06-22 23:17:37 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2018-06-22 13:45:45 +0800 |
| commit | fec34dfad0f105455805980831698b363e8b485e (patch) | |
| tree | 3e9610e83698df3f3f810bafbf1fa7386f17a3e9 | |
| parent | 0c615084d9d02daf7851e41bf2cf2ee55aa02824 (diff) | |
support mingw for qt
| -rw-r--r-- | CHANGELOG.md | 8 | ||||
| -rw-r--r-- | xmake/rules/qt/load.lua | 1 | ||||
| -rw-r--r-- | xmake/rules/qt/xmake.lua | 3 |
3 files changed, 10 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 10f41b44c..2c962ce9f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## master (unreleased) +### Changes + +* Improve to detect Qt envirnoment and support mingw + ## v2.2.1 ### New features @@ -457,6 +461,10 @@ ## master (开发中) +### 改进 + +* 改进Qt编译编译环境探测，增加对mingw sdk的支持 + ## v2.2.1 ### 新特性 diff --git a/xmake/rules/qt/load.lua b/xmake/rules/qt/load.lua index f1373b711..855f01cbb 100644 --- a/xmake/rules/qt/load.lua +++ b/xmake/rules/qt/load.lua @@ -120,6 +120,7 @@ function main(target, opt) target:add("includedirs", path.join(qt.sdkdir, "include")) target:add("includedirs", path.join(qt.sdkdir, "mkspecs/win32-g++")) target:add("linkdirs", qt.linkdirs) + target:add("links", "mingw32") end end diff --git a/xmake/rules/qt/xmake.lua b/xmake/rules/qt/xmake.lua index fe8a38d16..e86e2e6f7 100644 --- a/xmake/rules/qt/xmake.lua +++ b/xmake/rules/qt/xmake.lua @@ -72,8 +72,7 @@ rule("qt.application") target:add("defines", "_WINDOWS") target:add("ldflags", "-subsystem:windows", "-entry:mainCRTStartup", {force = true}) elseif is_plat("mingw") then - target:add("defines", "_WINDOWS") - target:add("ldflags", "-Wl,-subsystem:windows", "-Wl,-entry:mainCRTStartup", {force = true}) + target:add("ldflags", "-Wl,-subsystem:windows", {force = true}) end end) |