summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2025-09-06 19:24:15 +0800
committerruki <[email protected]>2025-09-06 19:24:15 +0800
commit8412d57c5c011240111820288b658f74ae8dc05e (patch)
tree20bcd55348bb4ca57baaa226a17ceceed81eaa30
parent76f10432e1ad6b20b8e1c8ed7b7576dc274fe31b (diff)
fix qt rule order
-rw-r--r--xmake/rules/platform/windows/subsystem/xmake.lua2
-rw-r--r--xmake/rules/qt/xmake.lua10
2 files changed, 1 insertions, 11 deletions
diff --git a/xmake/rules/platform/windows/subsystem/xmake.lua b/xmake/rules/platform/windows/subsystem/xmake.lua
index 60fa59dc4..6ee96324a 100644
--- a/xmake/rules/platform/windows/subsystem/xmake.lua
+++ b/xmake/rules/platform/windows/subsystem/xmake.lua
@@ -22,7 +22,7 @@
-- set any of "boot_application" "console" "efi_application" "efi_boot_service_driver" "efi_rom" "efi_runtime_driver" "native" "posix" "windows"
-- with target:set_values("windows.subsystem", <your value>) and the rule will pass the proper flag to the linker
rule("platform.windows.subsystem")
- on_config("mingw", "windows", function(target)
+ after_config("mingw", "windows", function(target)
local subsystems = {
"BOOT_APPLICATION", "CONSOLE", "EFI_APPLICATION", "EFI_BOOT_SERVICE_DRIVER", "EFI_ROM", "EFI_RUNTIME_DRIVER", "NATIVE", "POSIX", "WINDOWS"
}
diff --git a/xmake/rules/qt/xmake.lua b/xmake/rules/qt/xmake.lua
index 619e4c1b6..69c8ff03a 100644
--- a/xmake/rules/qt/xmake.lua
+++ b/xmake/rules/qt/xmake.lua
@@ -68,8 +68,6 @@ rule("qt.shared")
-- define rule: qt console
rule("qt.console")
add_deps("qt.qrc", "qt.ui", "qt.moc", "qt.ts")
- --add_orders("qt.console", "platform.windows.subsystem")
- add_deps("platform.windows.subsystem")
-- we must set kind before target.on_load(), may we will use target in on_load()
on_load(function (target)
@@ -86,8 +84,6 @@ rule("qt.console")
-- define rule: qt widgetapp
rule("qt.widgetapp")
add_deps("qt.ui", "qt.moc", "qt._wasm_app", "qt.qrc", "qt.ts")
- --add_orders("qt.widgetapp", "platform.windows.subsystem")
- add_deps("platform.windows.subsystem")
-- we must set kind before target.on_load(), may we will use target in on_load()
on_load(function (target)
@@ -123,8 +119,6 @@ rule("qt.widgetapp")
-- define rule: qt static widgetapp
rule("qt.widgetapp_static")
add_deps("qt.ui", "qt.moc", "qt._wasm_app", "qt.qrc", "qt.ts")
- --add_orders("qt.widgetapp_static", "platform.windows.subsystem")
- add_deps("platform.windows.subsystem")
-- we must set kind before target.on_load(), may we will use target in on_load()
on_load(function (target)
@@ -153,8 +147,6 @@ rule("qt.widgetapp_static")
-- define rule: qt quickapp
rule("qt.quickapp")
add_deps("qt.qrc", "qt.moc", "qt._wasm_app", "qt.ts")
- --add_orders("qt.quickapp", "platform.windows.subsystem")
- add_deps("platform.windows.subsystem")
-- we must set kind before target.on_load(), may we will use target in on_load()
on_load(function (target)
@@ -177,8 +169,6 @@ rule("qt.quickapp")
-- define rule: qt static quickapp
rule("qt.quickapp_static")
add_deps("qt.qrc", "qt.moc", "qt._wasm_app", "qt.ts")
- --add_orders("qt.quickapp_static", "platform.windows.subsystem")
- add_deps("platform.windows.subsystem")
-- we must set kind before target.on_load(), may we will use target in on_load()
on_load(function (target)