From 6627f5cfb7db944367c5668be2267402dc1ed7f5 Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 28 Feb 2023 22:49:59 +0800 Subject: improve to find qt sdk from msys2/mingw64 --- xmake/modules/detect/sdks/find_qt.lua | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/xmake/modules/detect/sdks/find_qt.lua b/xmake/modules/detect/sdks/find_qt.lua index d6734b292..315c57f55 100644 --- a/xmake/modules/detect/sdks/find_qt.lua +++ b/xmake/modules/detect/sdks/find_qt.lua @@ -79,6 +79,14 @@ function _find_sdkdir(sdkdir, sdkver) end if is_host("windows") then + -- we find it from /mingw64 first + if is_subhost("msys") then + local mingw_prefix = os.getenv("MINGW_PREFIX") + if mingw_prefix and os.isdir(mingw_prefix) then + table.insert(paths, mingw_prefix) + end + end + -- add paths from registry local regs = { -- cgit v1.3.1