From a98a24e40df02fd59da99854476b5042058d7ee9 Mon Sep 17 00:00:00 2001 From: ruki Date: Fri, 18 Oct 2019 00:34:49 +0800 Subject: improve qt subsystem --- xmake/rules/qt/load.lua | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/xmake/rules/qt/load.lua b/xmake/rules/qt/load.lua index e05232ae9..93296f307 100644 --- a/xmake/rules/qt/load.lua +++ b/xmake/rules/qt/load.lua @@ -234,7 +234,18 @@ function main(target, opt) -- add -subsystem:windows for windows platform if is_plat("windows") then target:add("defines", "_WINDOWS") - target:add("ldflags", "-subsystem:windows", "-entry:mainCRTStartup", {force = true}) + local subsystem = false + for _, ldflag in ipairs(target:get("ldflags")) do + ldflag = ldflag:lower() + if ldflag:find("[/%-]subsystem:") then + subsystem = true + break + end + end + -- maybe user will set subsystem to console + if not subsystem then + target:add("ldflags", "-subsystem:windows", "-entry:mainCRTStartup", {force = true}) + end elseif is_plat("mingw") then target:add("ldflags", "-mwindows", {force = true}) end -- cgit v1.3.1