summaryrefslogtreecommitdiff
path: root/xmake/scripts/base/main.lua
diff options
context:
space:
mode:
authorruki <[email protected]>2015-06-09 14:46:10 +0800
committerruki <[email protected]>2015-06-09 14:47:06 +0800
commitf6fec59106383347489ed77bb1896a9ccf5bbb2d (patch)
treed9465b98ec45ad0e08cc16b7864ea75e8d682214 /xmake/scripts/base/main.lua
parent2664a11c5ae2444241aa72346e7574279ac6b0bd (diff)
remove preprocessor
Diffstat (limited to 'xmake/scripts/base/main.lua')
-rw-r--r--xmake/scripts/base/main.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/xmake/scripts/base/main.lua b/xmake/scripts/base/main.lua
index 38470a909..d4945fc6a 100644
--- a/xmake/scripts/base/main.lua
+++ b/xmake/scripts/base/main.lua
@@ -409,7 +409,7 @@ function main._prepare_global()
assert(options)
-- load global configure
- global.loadxconf()
+ global.load()
-- xmake global?
if options._ACTION == "global" then