Kaynağa Gözat

improve libcurl

ruki 6 yıl önce
ebeveyn
işleme
baf09fa812
2 değiştirilmiş dosya ile 23 ekleme ve 15 silme
  1. 16 15
      PKGLIST.md
  2. 7 0
      packages/l/libcurl/xmake.lua

+ 16 - 15
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|||

+ 7 - 0
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"}