Skip to content

Commit

Permalink
Merge pull request #4754 from xiaobfly/dev
Browse files Browse the repository at this point in the history
fixed #4753
  • Loading branch information
waruqi authored Feb 21, 2024
2 parents 416d1e6 + 7e3116f commit d070968
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 16 deletions.
10 changes: 6 additions & 4 deletions xmake/rules/qt/load.lua
Original file line number Diff line number Diff line change
Expand Up @@ -482,10 +482,12 @@ function main(target, opt)
target:add("defines", "_WINDOWS")
local subsystem = false
for _, ldflag in ipairs(target:get("ldflags")) do
ldflag = ldflag:lower()
if ldflag:find("[/%-]subsystem:") then
subsystem = true
break
if type(ldflag) == "string" then
ldflag = ldflag:lower()
if ldflag:find("[/%-]subsystem:") then
subsystem = true
break
end
end
end
-- maybe user will set subsystem to console
Expand Down
20 changes: 12 additions & 8 deletions xmake/rules/wdk/load.lua
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,12 @@ function driver_kmdf(target)
-- set default driver entry if does not exist
local entry = false
for _, ldflag in ipairs(target:get("ldflags")) do
ldflag = ldflag:lower()
if ldflag:find("[/%-]entry:") then
entry = true
break
if type(ldflag) == "string" then
ldflag = ldflag:lower()
if ldflag:find("[/%-]entry:") then
entry = true
break
end
end
end
if not entry then
Expand Down Expand Up @@ -120,10 +122,12 @@ function driver_wdm(target)
-- set default driver entry if does not exist
local entry = false
for _, ldflag in ipairs(target:get("ldflags")) do
ldflag = ldflag:lower()
if ldflag:find("[/%-]entry:") then
entry = true
break
if type(ldflag) == "string" then
ldflag = ldflag:lower()
if ldflag:find("[/%-]entry:") then
entry = true
break
end
end
end
if not entry then
Expand Down
10 changes: 6 additions & 4 deletions xmake/rules/winsdk/xmake.lua
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,12 @@ rule("win.sdk.application")
else
local subsystem = false
for _, ldflag in ipairs(target:get("ldflags")) do
ldflag = ldflag:lower()
if ldflag:find("[/%-]subsystem:") then
subsystem = true
break
if type(ldflag) == "string" then
ldflag = ldflag:lower()
if ldflag:find("[/%-]subsystem:") then
subsystem = true
break
end
end
end
if not subsystem then
Expand Down

0 comments on commit d070968

Please sign in to comment.