From baf09fa812024749c790b76829df8eb74dfd03e1 Mon Sep 17 00:00:00 2001 From: ruki Date: Sat, 4 May 2019 00:54:37 +0800 Subject: [PATCH] improve libcurl --- PKGLIST.md | 31 ++++++++++++++++--------------- packages/l/libcurl/xmake.lua | 7 +++++++ 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/PKGLIST.md b/PKGLIST.md index 5e86460e8..0b97711f1 100755 --- a/PKGLIST.md +++ b/PKGLIST.md @@ -3,21 +3,22 @@ |linux|windows|mingw|iphoneos|macosx|android| |-----|-------|-----|--------|------|-------| |autoconf|bzip2|doctest|doctest|autoconf|doctest|| -|automake|cairo|nlohmann_json|libev|automake|libjpeg|| -|bzip2|cmake|tbox|libjpeg|bzip2|libpng|| -|cairo|doctest|zlib|libpng|cairo|libuv|| -|cjson|expat||libuv|cjson|nlohmann_json|| -|cmake(x86_64)|freeglut||nlohmann_json|cmake|tbox|| -|doctest|freetype||tbox|doctest|zlib|| -|expat|glew||zlib|expat||| -|ffmpeg|go|||ffmpeg||| -|fontconfig|libjpeg|||fontconfig||| -|freeglut|libpng|||freetype||| -|freetype|libsdl|||glew||| -|glew|libuv|||go||| -|go|lua|||gperf||| -|gperf|luajit|||json-c||| -|json-c|make|||libev||| +|automake|cairo|nlohmann_json|libcurl|automake|libjpeg|| +|bzip2|cmake|tbox|libev|bzip2|libpng|| +|cairo|doctest|zlib|libjpeg|cairo|libuv|| +|cjson|expat||libpng|cjson|nlohmann_json|| +|cmake(x86_64)|freeglut||libuv|cmake|tbox|| +|doctest|freetype||nlohmann_json|doctest|zlib|| +|expat|glew||tbox|expat||| +|ffmpeg|go||zlib|ffmpeg||| +|fontconfig|libcurl|||fontconfig||| +|freeglut|libjpeg|||freetype||| +|freetype|libpng|||glew||| +|glew|libsdl|||go||| +|go|libuv|||gperf||| +|gperf|lua|||json-c||| +|json-c|luajit|||libcurl||| +|libcurl|make|||libev||| |libev|nlohmann_json|||libiconv||| |libiconv|patch|||libjpeg||| |libjpeg|pcre|||libmill||| diff --git a/packages/l/libcurl/xmake.lua b/packages/l/libcurl/xmake.lua index 0b17a6472..495d971ab 100644 --- a/packages/l/libcurl/xmake.lua +++ b/packages/l/libcurl/xmake.lua @@ -10,11 +10,18 @@ package("libcurl") if is_plat("linux") then add_deps("openssl") + elseif is_plat("windows") then + add_deps("cmake") end if is_plat("macosx") then add_frameworks("Security") end + + on_install("windows", function (package) + local configs = {} + import("package.tools.cmake").install(package, configs) + end) on_install("macosx", "linux", "iphoneos", function (package) local configs = {"--disable-silent-rules", "--disable-dependency-tracking", "--enable-shared=no"}