summaryrefslogtreecommitdiff
path: root/xmake/core/base
diff options
context:
space:
mode:
authorruki <[email protected]>2016-02-14 21:32:36 +0800
committerruki <[email protected]>2016-02-15 19:10:27 +0800
commit00db421c6d1fcb4604015e30fbc3ce80e9c00b41 (patch)
tree156038808d71a3bbdd66959604293ebc7aa31f94 /xmake/core/base
parent52c273079851f2b83b9c632aec8e37b7482f6a83 (diff)
rename add_target and add_option to def_xxx
Diffstat (limited to 'xmake/core/base')
-rw-r--r--xmake/core/base/package.lua2
-rw-r--r--xmake/core/base/project.lua8
2 files changed, 5 insertions, 5 deletions
diff --git a/xmake/core/base/package.lua b/xmake/core/base/package.lua
index 1b3f154af..5290ea47f 100644
--- a/xmake/core/base/package.lua
+++ b/xmake/core/base/package.lua
@@ -97,7 +97,7 @@ function package._done_library(target)
-- the xmake.lua template content
local template = [[
-- add [targetname] package
-add_option("[targetname]")
+def_option("[targetname]")
-- show menu
set_option_showmenu(true)
diff --git a/xmake/core/base/project.lua b/xmake/core/base/project.lua
index 621fc8b05..2bdbad5f6 100644
--- a/xmake/core/base/project.lua
+++ b/xmake/core/base/project.lua
@@ -149,7 +149,7 @@ function project._api_add_cfunc(interp, module, alias, links, includes, cfunc)
local scope = interp:scope_save()
-- make option
- interp:api_call("add_option", name)
+ interp:api_call("def_option", name)
interp:api_call("set_option_category", "cfuncs")
interp:api_call("add_option_cfuncs", cfunc)
if links then interp:api_call("add_option_links", links) end
@@ -195,7 +195,7 @@ function project._api_add_cfuncs(interp, module, links, includes, ...)
local scope = interp:scope_save()
-- make option
- interp:api_call("add_option", name)
+ interp:api_call("def_option", name)
interp:api_call("set_option_category", "cfuncs")
interp:api_call("add_option_cfuncs", cfunc)
if links then interp:api_call("add_option_links", links) end
@@ -236,7 +236,7 @@ function project._api_add_cxxfunc(interp, module, alias, links, includes, cxxfun
local scope = interp:scope_save()
-- make option
- interp:api_call("add_option", name)
+ interp:api_call("def_option", name)
interp:api_call("set_option_category", "cxxfuncs")
interp:api_call("add_option_cxxfuncs", cxxfunc)
if links then interp:api_call("add_option_links", links) end
@@ -282,7 +282,7 @@ function project._api_add_cxxfuncs(interp, module, links, includes, ...)
local scope = interp:scope_save()
-- make option
- interp:api_call("add_option", name)
+ interp:api_call("def_option", name)
interp:api_call("set_option_category", "cxxfuncs")
interp:api_call("add_option_cxxfuncs", cxxfunc)
if links then interp:api_call("add_option_links", links) end