summaryrefslogtreecommitdiff
path: root/xmake/rules/xcode/application/load.lua
diff options
context:
space:
mode:
authorruki <[email protected]>2020-04-08 23:50:43 +0800
committerruki <[email protected]>2020-04-08 17:04:23 +0800
commite3e74b6dccfa877981a26896519414eab44ee2a7 (patch)
tree33e8c246483638206ef18a607cc59f28fb44a17c /xmake/rules/xcode/application/load.lua
parentefe6609bb668d34a4beb5b9b06f36b7556796c7b (diff)
improve xcode.framework rules
Diffstat (limited to 'xmake/rules/xcode/application/load.lua')
-rw-r--r--xmake/rules/xcode/application/load.lua18
1 files changed, 9 insertions, 9 deletions
diff --git a/xmake/rules/xcode/application/load.lua b/xmake/rules/xcode/application/load.lua
index d3026948e..071b94901 100644
--- a/xmake/rules/xcode/application/load.lua
+++ b/xmake/rules/xcode/application/load.lua
@@ -21,17 +21,17 @@
-- main entry
function main (target)
- -- get app directory
+ -- get bundle directory
local targetdir = target:targetdir()
- local appdir = path.join(targetdir, target:basename() .. ".app")
- target:data_set("xcode.bundle.rootdir", appdir)
+ local bundledir = path.join(targetdir, target:basename() .. ".app")
+ target:data_set("xcode.bundle.rootdir", bundledir)
-- get contents and resources directory
- local contentsdir = appdir
- local resourcesdir = appdir
+ local contentsdir = bundledir
+ local resourcesdir = bundledir
if is_plat("macosx") then
- contentsdir = path.join(appdir, "Contents")
- resourcesdir = path.join(appdir, "Contents", "Resources")
+ contentsdir = path.join(bundledir, "Contents")
+ resourcesdir = path.join(bundledir, "Contents", "Resources")
end
target:data_set("xcode.bundle.contentsdir", contentsdir)
target:data_set("xcode.bundle.resourcesdir", resourcesdir)
@@ -42,7 +42,7 @@ function main (target)
if is_plat("macosx") then
target:set("targetdir", path.join(contentsdir, "MacOS"))
else
- target:set("targetdir", appdir)
+ target:set("targetdir", bundledir)
end
-- add frameworks
@@ -53,5 +53,5 @@ function main (target)
end
-- register clean files for `xmake clean`
- target:add("cleanfiles", appdir)
+ target:add("cleanfiles", bundledir)
end