remove x86 filter for windows/cmake

pull/3/head
ruki 6 years ago
parent 440cf7ef46
commit 8652dfde13
  1. 2
      packages/l/libuv/xmake.lua
  2. 4
      packages/m/mbedtls/xmake.lua
  3. 4
      packages/p/pcre/xmake.lua
  4. 4
      packages/p/pcre2/xmake.lua

@ -15,7 +15,7 @@ package("libuv")
add_deps("autoconf", "automake", "libtool", "pkg-config")
end
on_install("windows|x86", function (package)
on_install("windows", function (package)
import("package.tools.cmake").install(package)
package:addvar("links", "uv_a")
os.cp("include", package:installdir())

@ -8,12 +8,12 @@ package("mbedtls")
add_versions("2.13.0", "6e747350bc13e8ff51799daa50f74230c6cd8e15977da55dd59f57b23dcf70a6")
add_versions("2.7.6", "e527d828ab82650102ca8031302e5d4bc68ea887b2d84e43d3da2a80a9e5a2c8")
if is_host("windows") and is_arch("x86") then
if is_host("windows") then
add_deps("cmake")
end
if is_plat("windows") and winos.version():gt("winxp") then
on_install("windows|x86", function (package)
on_install("windows", function (package)
import("package.tools.cmake").install(package)
end)
end

@ -9,11 +9,11 @@ package("pcre")
add_versions("8.40", "99e19194fa57d37c38e897d07ecb3366b18e8c395b36c6d555706a7f1df0a5d4")
add_versions("8.41", "0e914a3a5eb3387cad6ffac591c44b24bc384c4e828643643ebac991b57dfcc5")
if is_host("windows") and is_arch("x86") then
if is_host("windows") then
add_deps("cmake")
end
on_install("windows|x86", function (package)
on_install("windows", function (package)
import("package.tools.cmake").install(package)
end)

@ -10,12 +10,12 @@ package("pcre2")
add_versions("10.30", "3677ce17854fffa68fce6b66442858f48f0de1f537f18439e4bd2771f8b4c7fb")
add_versions("10.31", "b4b40695a5347a770407d492c1749e35ba3970ca03fe83eb2c35d44343a5a444")
if is_host("windows") and is_arch("x86") then
if is_host("windows") then
add_deps("cmake")
end
if is_plat("windows") and winos.version():gt("winxp") then
on_install("windows|x86", function (package)
on_install("windows", function (package)
import("package.tools.cmake").install(package)
package:addvar("links", "pcre2-8")
package:addvar("defines", "PCRE2_CODE_UNIT_WIDTH=8")

Loading…
Cancel
Save