diff options
| author | ruki <[email protected]> | 2022-06-11 16:33:10 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2022-06-11 16:33:10 +0800 |
| commit | d21eaafda4c5797df7b7ef6131349d2752ec9b01 (patch) | |
| tree | 1535512c745604a684689d1ab7a0954e49bfcbb1 | |
| parent | 5b718c4f9ac86a13edc1ac5e7c135ac2a3022b4a (diff) | |
improve qt rule
| -rw-r--r-- | xmake/rules/qt/env/xmake.lua | 4 | ||||
| -rw-r--r-- | xmake/rules/qt/load.lua | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/xmake/rules/qt/env/xmake.lua b/xmake/rules/qt/env/xmake.lua index 47bc0760c..4cc39794c 100644 --- a/xmake/rules/qt/env/xmake.lua +++ b/xmake/rules/qt/env/xmake.lua @@ -34,10 +34,6 @@ rule("qt.env") target:add("runenvs", "PATH", qt.bindir) target:set("runenv", "QML2_IMPORT_PATH", qt.qmldir) target:set("runenv", "QML_IMPORT_TRACE", "1") - - if not target:is_plat("mingw") then - target:add("cxxflags", "/permissive-") - end elseif target:is_plat("msys", "cygwin") then raise("please run `xmake f -p mingw --mingw=/mingw64` to support Qt/Mingw64 on Msys!") end diff --git a/xmake/rules/qt/load.lua b/xmake/rules/qt/load.lua index e6b555ecf..ee4a3f601 100644 --- a/xmake/rules/qt/load.lua +++ b/xmake/rules/qt/load.lua @@ -139,6 +139,7 @@ function main(target, opt) -- @see https://github.com/xmake-io/xmake/issues/2071 if target:is_plat("windows") then target:add("cxxflags", "/Zc:__cplusplus") + target:add("cxxflags", "/permissive-") end else target:add("languages", "c++11") |