summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2018-04-19 22:36:46 +0800
committerruki <[email protected]>2018-04-19 09:40:37 +0800
commit5223aac166782be25955bd6f662d02c21d44519e (patch)
tree4f308ee22816b5b3f2ece91bf9e3e1dd91bedf1b
parentf55f8a81c6743cccfcc0b76d440ebe997088f3a5 (diff)
add moc to qt console and libs
-rw-r--r--xmake/rules/qt/xmake.lua66
1 files changed, 33 insertions, 33 deletions
diff --git a/xmake/rules/qt/xmake.lua b/xmake/rules/qt/xmake.lua
index f5d33ba67..941e800c8 100644
--- a/xmake/rules/qt/xmake.lua
+++ b/xmake/rules/qt/xmake.lua
@@ -33,39 +33,6 @@ rule("qt.env")
end
end)
--- define rule: qt static library
-rule("qt.static")
-
- -- add rule: qt environment
- add_deps("qt.env")
-
- -- on load
- on_load(function (target)
- import("load")(target, {kind = "static", frameworks = {"QtCore"}})
- end)
-
--- define rule: qt shared library
-rule("qt.shared")
-
- -- add rule: qt environment
- add_deps("qt.env")
-
- -- on load
- on_load(function (target)
- import("load")(target, {kind = "shared", frameworks = {"QtCore"}})
- end)
-
--- define rule: qt console
-rule("qt.console")
-
- -- add rule: qt environment
- add_deps("qt.env")
-
- -- on load
- on_load(function (target)
- import("load")(target, {kind = "binary", frameworks = {"QtCore"}})
- end)
-
-- define rule: *.ui
rule("qt.ui")
@@ -224,6 +191,39 @@ rule("qt.qrc")
target:data_add("qt.cleanfiles", {sourcefile_cpp, objectfile})
end)
+-- define rule: qt static library
+rule("qt.static")
+
+ -- add rule: moc with qt environment
+ add_deps("qt.moc")
+
+ -- on load
+ on_load(function (target)
+ import("load")(target, {kind = "static", frameworks = {"QtCore"}})
+ end)
+
+-- define rule: qt shared library
+rule("qt.shared")
+
+ -- add rule: moc with qt environment
+ add_deps("qt.moc")
+
+ -- on load
+ on_load(function (target)
+ import("load")(target, {kind = "shared", frameworks = {"QtCore"}})
+ end)
+
+-- define rule: qt console
+rule("qt.console")
+
+ -- add rule: moc with qt environment
+ add_deps("qt.moc")
+
+ -- on load
+ on_load(function (target)
+ import("load")(target, {kind = "binary", frameworks = {"QtCore"}})
+ end)
+
-- define rule: qt application
rule("qt.application")