summaryrefslogtreecommitdiff
path: root/xmake/scripts/action
diff options
context:
space:
mode:
authorruki <[email protected]>2015-05-13 22:05:42 +0800
committerruki <[email protected]>2015-05-13 22:05:42 +0800
commit74ece0defa314bab78262d95bee517bdc09df689 (patch)
tree950684880d0193e60956a9b695cab50861208ff4 /xmake/scripts/action
parent1f45e3bf9b41a413804305fc23810639b977a9f1 (diff)
add preprocessor and update tbox
Diffstat (limited to 'xmake/scripts/action')
-rw-r--r--xmake/scripts/action/config.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/xmake/scripts/action/config.lua b/xmake/scripts/action/config.lua
index 030c1f9fa..13b5ffac5 100644
--- a/xmake/scripts/action/config.lua
+++ b/xmake/scripts/action/config.lua
@@ -35,7 +35,7 @@ function config._save()
assert(options)
-- open the configure file
- local path = options.project .. "/xmake.conf"
+ local path = options.project .. "/xmake.xconf"
local file = io.open(path, "w")
if not file then
-- error
@@ -70,7 +70,7 @@ function config._load()
assert(target)
-- open the configure file
- local path = options.project .. "/xmake.conf"
+ local path = options.project .. "/xmake.xconf"
local file = loadfile(path)
if file then
-- execute it