summaryrefslogtreecommitdiff
path: root/xmake/core/project/target.lua
diff options
context:
space:
mode:
authorruki <[email protected]>2018-04-17 22:40:53 +0800
committerruki <[email protected]>2018-04-17 10:05:23 +0800
commitacf8310347d557a731ded14acd283a073129bf29 (patch)
tree4e3664eba4d0d5068c3253f165fcbb2e085cc871 /xmake/core/project/target.lua
parent4d630e8c0844d946e422ad347aa7708eca412b38 (diff)
add qrc to quickapp
Diffstat (limited to 'xmake/core/project/target.lua')
-rw-r--r--xmake/core/project/target.lua12
1 files changed, 5 insertions, 7 deletions
diff --git a/xmake/core/project/target.lua b/xmake/core/project/target.lua
index 288b5bed7..1cea91ed2 100644
--- a/xmake/core/project/target.lua
+++ b/xmake/core/project/target.lua
@@ -351,9 +351,7 @@ function target:objectdir()
-- the object directory
local objectdir = self:get("objectdir")
if not objectdir then
-
- -- make the default object directory
- objectdir = path.join(config.get("buildir"), ".objs")
+ objectdir = path.join(config.buildir(), ".objs")
end
-- ok?
@@ -364,7 +362,7 @@ end
function target:depfile()
-- the target directory
- local targetdir = self:get("targetdir") or config.get("buildir")
+ local targetdir = self:get("targetdir") or config.buildir()
assert(targetdir and type(targetdir) == "string")
-- make the dependent file path
@@ -380,7 +378,7 @@ end
function target:targetdir()
-- the target directory
- local targetdir = self:get("targetdir") or config.get("buildir")
+ local targetdir = self:get("targetdir") or config.buildir()
assert(targetdir and type(targetdir) == "string")
-- ok?
@@ -408,7 +406,7 @@ end
function target:symbolfile()
-- the target directory
- local targetdir = self:get("targetdir") or config.get("buildir")
+ local targetdir = self:get("targetdir") or config.buildir()
assert(targetdir and type(targetdir) == "string")
-- the symbol file name
@@ -426,7 +424,7 @@ end
-- get header directory
function target:headerdir()
- return self:get("headerdir") or config.get("buildir")
+ return self:get("headerdir") or config.buildir()
end
-- get the source file rule name