remove some addvar

pull/13/head
ruki 6 years ago
parent e00dee4bef
commit 5104b56bd6
No known key found for this signature in database
GPG Key ID: 33341DF9719963FA
  1. 4
      packages/f/ffmpeg/xmake.lua
  2. 6
      packages/l/libxml2/xmake.lua
  3. 4
      packages/m/mbedtls/xmake.lua
  4. 6
      packages/n/ncurses/xmake.lua
  5. 2
      packages/t/tbox/xmake.lua

@ -12,9 +12,7 @@ package("ffmpeg")
add_deps("x264", {optional = true})
add_deps("x265", {optional = true})
on_load(function (package)
package:addvar("links", "avfilter", "avdevice", "avformat", "avcodec", "swscale", "swresample", "avutil")
end)
add_links("avfilter", "avdevice", "avformat", "avcodec", "swscale", "swresample", "avutil")
on_install("linux", "macosx", function (package)
local configs = {"--disable-ffmpeg",

@ -12,10 +12,8 @@ package("libxml2")
add_deps("autoconf", "automake", "libtool", "pkg-config")
end
on_load(function (package)
package:addvar("includedirs", "include/libxml2")
package:addvar("links", "xml2")
end)
add_includedirs("include/libxml2")
add_links("xml2")
if is_plat("windows") and winos.version():gt("winxp") then
on_install("windows", function (package)

@ -12,9 +12,7 @@ package("mbedtls")
add_deps("cmake")
end
on_load(function (package)
package:addvar("links", "mbedcrypto", "mbedx509", "mbedtls")
end)
add_links("mbedcrypto", "mbedx509", "mbedtls")
if is_plat("windows") and winos.version():gt("winxp") then
on_install("windows", function (package)

@ -8,10 +8,8 @@ package("ncurses")
"ftp://ftp.gnu.org/gnu/ncurses/ncurses-$(version).tar.gz")
add_versions("6.1", "aa057eeeb4a14d470101eff4597d5833dcef5965331be3528c08d99cebaa0d17")
on_load(function (package)
package:addvar("includedirs", "include/ncurses", "include")
package:addvar("links", "ncurses", "form", "panel", "menu")
end)
add_includedirs("include/ncurses", "include")
add_links("ncurses", "form", "panel", "menu")
on_install("linux", "macosx", function (package)
import("package.tools.autoconf").install(package, {"--without-manpages"})

@ -13,7 +13,7 @@ package("tbox")
on_load(function (package)
if package:debug() then
package:addvar("defines", "__tb_debug__")
package:add("defines", "__tb_debug__")
end
end)

Loading…
Cancel
Save