diff --git a/.appveyor.yml b/.appveyor.yml index 51c9487fe..5ba528611 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,4 +1,5 @@ os: + - Visual Studio 2017 - Visual Studio 2015 - Visual Studio 2013 diff --git a/PKGLIST.md b/PKGLIST.md index 9b9ff6bb4..9b60ba2ea 100755 --- a/PKGLIST.md +++ b/PKGLIST.md @@ -20,10 +20,10 @@ |libcurl|nlohmann_json|||gperf||| |libev|pcre|||json-c||| |libffi|pixman|||libcurl||| -|libiconv|sqlite3|||libev||| -|libjpeg|tbox|||libffi||| -|libmill|zlib|||libiconv||| -|libpng||||libjpeg||| +|libiconv|skia|||libev||| +|libjpeg|sqlite3|||libffi||| +|libmill|tbox|||libiconv||| +|libpng|zlib|||libjpeg||| |libsdl||||libmill||| |libtask||||libpng||| |libuv||||libsdl||| @@ -38,17 +38,18 @@ |pcre||||meson||| |pcre2||||mysql||| |pixman||||nasm||| -|sqlite3||||ncurses||| -|tbox||||ninja||| -|util-linux||||nlohmann_json||| -|x264||||openssl||| -|x265||||patch||| -|xz||||pcre||| -|zlib||||pcre2||| -|||||pixman||| +|skia||||ncurses||| +|sqlite3||||ninja||| +|tbox||||nlohmann_json||| +|util-linux||||openssl||| +|x264||||patch||| +|x265||||pcre||| +|xz||||pcre2||| +|zlib||||pixman||| |||||pkg-config||| |||||python||| |||||python2||| +|||||skia||| |||||sqlite3||| |||||tbox||| |||||util-linux||| diff --git a/packages/s/skia/xmake.lua b/packages/s/skia/xmake.lua index cf53de1ba..ba75124d0 100644 --- a/packages/s/skia/xmake.lua +++ b/packages/s/skia/xmake.lua @@ -28,7 +28,8 @@ package("skia") add_includedirs("include/svg") add_includedirs("include/third_party") add_includedirs("include/utils") - + + -- @note windows: only can build for vs2017 or vs2015 update 3 on_install("macosx", "linux", "windows", function (package) local pathes = os.getenv("PATH") or "" pathes = pathes .. path.envsep() .. path.join(os.curdir(), "depot_tools") @@ -53,7 +54,7 @@ package("skia") skia_use_zlib = false} args.cc = package:build_getenv("cc") args.cxx = package:build_getenv("cxx") - local argstr = "" + local argstr = "" for k, v in pairs(args) do if type(v) == "string" then argstr = argstr .. ' ' .. k .. '=\"' .. v .. "\"" @@ -65,14 +66,14 @@ package("skia") os.vrun("bin/gn gen build --args='%s'", argstr:trim()) os.vrun("ninja -C build") os.cp("include", package:installdir()) - os.cp("third_party", package:installdir()) + os.cp("third_party/skcms/*.h", package:installdir("third_party/skcms")) if is_plat("windows") then os.cp("build/*.lib", package:installdir("lib")) else os.cp("build/*.a", package:installdir("lib")) end end) - + on_test(function (package) assert(package:check_cxxsnippets({test = [[ static void test() {