diff --git a/PKGLIST.md b/PKGLIST.md index 867922512..d6216088d 100755 --- a/PKGLIST.md +++ b/PKGLIST.md @@ -2,17 +2,17 @@ |linux|windows|mingw|iphoneos|macosx|android| |-----|-------|-----|--------|------|-------| -|autoconf|bzip2|doctest|doctest|autoconf|doctest|| -|automake|cairo|nlohmann_json|libcurl|automake|libjpeg|| -|bzip2|cmake|tbox|libev|bzip2|libpng|| -|cairo|doctest|zlib|libffi|cairo|libuv|| -|cjson|expat||libjpeg|cjson|nlohmann_json|| -|cmake(x86_64)|freeglut||libpng|cmake|tbox|| -|doctest|freetype||libuv|doctest|zlib|| -|expat|glew||nlohmann_json|expat||| -|ffmpeg|go||tbox|ffmpeg||| -|fontconfig|libcurl||zlib|fontconfig||| -|freeglut|libjpeg|||freetype||| +|autoconf|bzip2|doctest|cjson|autoconf|cjson|| +|automake|cairo|nlohmann_json|doctest|automake|doctest|| +|bzip2|cmake|tbox|libcurl|bzip2|libjpeg|| +|cairo|doctest|zlib|libev|cairo|libpng|| +|cjson|expat||libffi|cjson|libuv|| +|cmake(x86_64)|freeglut||libjpeg|cmake|lua|| +|doctest|freetype||libpng|doctest|nlohmann_json|| +|expat|glew||libuv|expat|tbox|| +|ffmpeg|go||nlohmann_json|ffmpeg|zlib|| +|fontconfig|libcurl||tbox|fontconfig||| +|freeglut|libjpeg||zlib|freetype||| |freetype|libpng|||glew||| |glew|libsdl|||go||| |go|libuv|||gperf||| diff --git a/packages/c/cjson/xmake.lua b/packages/c/cjson/xmake.lua index c02a439ef..7a8af8546 100644 --- a/packages/c/cjson/xmake.lua +++ b/packages/c/cjson/xmake.lua @@ -3,11 +3,16 @@ package("cjson") set_homepage("https://github.com/DaveGamble/cJSON") set_description("Ultralightweight JSON parser in ANSI C.") - set_urls("https://github.com/DaveGamble/cJSON/archive/v$(version).zip") + set_urls("https://github.com/DaveGamble/cJSON/archive/v$(version).zip", + "https://github.com/DaveGamble/cJSON.git") add_versions("1.7.10", "80a0584410656c8d8da2ba703744f44d7535fc4f0778d8bf4f980ce77c6a9f65") - on_install("macosx", "linux", function (package) - os.vrun("make static") + on_install("macosx", "linux", "iphoneos", "android", function (package) + import("package.tools.make").build(package, {"static"}) os.cp("*.a", package:installdir("lib")) os.cp("*.h", package:installdir("include")) end) + + on_test(function (package) + assert(package:has_cfuncs("cJSON_malloc", {includes = "cJSON.h"})) + end)