add mingw platform

.travis.yml

@@ -12,7 +12,9 @@ install:
   - cd ./tboox/xmake
   - ./scripts/get.sh __local__
   - cd -
-  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then
+  - if [ "$TRAVIS_OS_NAME" = "osc" ]; then
+      brew install mingw-w64;
+    else
       wget -q https://dl.google.com/android/repository/android-ndk-r19c-linux-x86_64.zip;
       unzip -q ./android-ndk-r19c-linux-x86_64.zip;
     fi
@@ -21,6 +23,7 @@ script:
   - travis_wait 60 xmake l ./scripts/test.lua -D
   - if [ "$TRAVIS_OS_NAME" = "osx" ]; then
       travis_wait 60 xmake l ./scripts/test.lua -D -p iphoneos;
+      travis_wait 60 xmake l ./scripts/test.lua -D -p mingw;
     else
       travis_wait 60 xmake l ./scripts/test.lua -v -D -p android --ndk=`pwd`/android-ndk-r19c;
     fi

PKGLIST.md

@@ -1,53 +1,53 @@
 ## All Supported Packages
 
-|linux|windows|iphoneos|macosx|android|
-|-----|-------|--------|------|-------|
-|autoconf|bzip2|doctest|autoconf|doctest||
-|automake|cairo|libjpeg|automake|libjpeg||
-|bzip2|cmake|nlohmann_json|bzip2|nlohmann_json||
-|cairo|doctest|tbox|cairo|tbox||
-|cjson|expat|zlib|cjson|zlib||
-|cmake(x86_64)|freeglut||cmake|||
-|doctest|freetype||doctest|||
-|expat|glew||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|||
-|libev|nlohmann_json||libiconv|||
-|libiconv|patch||libjpeg|||
-|libjpeg|pcre||libmill|||
-|libmill|pixman||libpng|||
-|libpng|python||libsdl|||
-|libsdl|sqlite3||libtask|||
-|libtask|tbox||libtool|||
-|libtool|zlib||libuv|||
-|libuv|||libxml2|||
-|libxml2|||lua|||
-|lua|||luajit|||
-|luajit|||make|||
-|make|||mbedtls|||
-|mbedtls|||mysql|||
-|mysql|||nasm|||
-|nasm|||ncurses|||
-|ncurses|||nlohmann_json|||
-|nlohmann_json|||openssl|||
-|openssl|||patch|||
-|patch|||pcre|||
-|pcre|||pcre2|||
-|pcre2|||pixman|||
-|pixman|||pkg-config|||
-|pkg-config|||python|||
-|python|||sqlite3|||
-|sqlite3|||tbox|||
-|tbox|||util-linux|||
-|util-linux|||x264|||
-|x264|||x265|||
-|x265|||xz|||
-|xz|||yasm|||
-|yasm|||zlib|||
-|zlib||||||
+|linux|windows|mingw|iphoneos|macosx|android|
+|-----|-------|-----|--------|------|-------|
+|autoconf|bzip2|doctest|doctest|autoconf|doctest||
+|automake|cairo|libjpeg|libjpeg|automake|libjpeg||
+|bzip2|cmake|nlohmann_json|nlohmann_json|bzip2|nlohmann_json||
+|cairo|doctest|tbox|tbox|cairo|tbox||
+|cjson|expat|zlib|zlib|cjson|zlib||
+|cmake(x86_64)|freeglut|||cmake|||
+|doctest|freetype|||doctest|||
+|expat|glew|||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|||
+|libev|nlohmann_json|||libiconv|||
+|libiconv|patch|||libjpeg|||
+|libjpeg|pcre|||libmill|||
+|libmill|pixman|||libpng|||
+|libpng|python|||libsdl|||
+|libsdl|sqlite3|||libtask|||
+|libtask|tbox|||libtool|||
+|libtool|zlib|||libuv|||
+|libuv||||libxml2|||
+|libxml2||||lua|||
+|lua||||luajit|||
+|luajit||||make|||
+|make||||mbedtls|||
+|mbedtls||||mysql|||
+|mysql||||nasm|||
+|nasm||||ncurses|||
+|ncurses||||nlohmann_json|||
+|nlohmann_json||||openssl|||
+|openssl||||patch|||
+|patch||||pcre|||
+|pcre||||pcre2|||
+|pcre2||||pixman|||
+|pixman||||pkg-config|||
+|pkg-config||||python|||
+|python||||sqlite3|||
+|sqlite3||||tbox|||
+|tbox||||util-linux|||
+|util-linux||||x264|||
+|x264||||x265|||
+|x265||||xz|||
+|xz||||yasm|||
+|yasm||||zlib|||
+|zlib|||||||

README_zh.md

@@ -58,34 +58,34 @@ xmake-repo是一个官方的xmake包管理仓库，收录了常用的c/c++开发
 
 ## 被支持的包列表
 
-|linux|windows|iphoneos|macosx|android|
-|-----|-------|--------|------|-------|
-|autoconf|bzip2|doctest|autoconf|doctest||
-|automake|cairo|libjpeg|automake|libjpeg||
-|bzip2|cmake|nlohmann_json|bzip2|nlohmann_json||
-|cairo|doctest|tbox|cairo|tbox||
-|cjson|expat|zlib|cjson|zlib||
-|cmake(x86_64)|freeglut||cmake|||
-|doctest|freetype||doctest|||
-|expat|glew||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|||
-|libev|nlohmann_json||libiconv|||
-|libiconv|patch||libjpeg|||
-|libjpeg|pcre||libmill|||
-|libmill|pixman||libpng|||
-|libpng|python||libsdl|||
-|libsdl|sqlite3||libtask|||
-|libtask|tbox||libtool|||
-|libtool|zlib||libuv|||
-|libuv|||libxml2|||
-|libxml2|||lua|||
+|linux|windows|mingw|iphoneos|macosx|android|
+|-----|-------|-----|--------|------|-------|
+|autoconf|bzip2|doctest|doctest|autoconf|doctest||
+|automake|cairo|libjpeg|libjpeg|automake|libjpeg||
+|bzip2|cmake|nlohmann_json|nlohmann_json|bzip2|nlohmann_json||
+|cairo|doctest|tbox|tbox|cairo|tbox||
+|cjson|expat|zlib|zlib|cjson|zlib||
+|cmake(x86_64)|freeglut|||cmake|||
+|doctest|freetype|||doctest|||
+|expat|glew|||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|||
+|libev|nlohmann_json|||libiconv|||
+|libiconv|patch|||libjpeg|||
+|libjpeg|pcre|||libmill|||
+|libmill|pixman|||libpng|||
+|libpng|python|||libsdl|||
+|libsdl|sqlite3|||libtask|||
+|libtask|tbox|||libtool|||
+|libtool|zlib|||libuv|||
+|libuv||||libxml2|||
+|libxml2||||lua|||
 
 这里只显示了部分包，如果你想看所有包列表，可以看下：[PKGLIST.md](https://github.com/xmake-io/xmake-repo/blob/master/PKGLIST.md)
 

packages/z/zlib/xmake.lua

@@ -20,7 +20,7 @@ package("zlib")
         os.cp("*.h", package:installdir("include"))
     end)
 
-    on_install("iphoneos", "android", "cross", function (package)
+    on_install("iphoneos", "android", "mingw", function (package)
         import("package.tools.autoconf").configure(package, {host = "", "--static"})
         io.gsub("Makefile", "\nAR=.-\n",      "\nAR=" .. (package:build_getenv("ar") or "") .. "\n")
         io.gsub("Makefile", "\nARFLAGS=.-\n", "\nARFLAGS=cr\n")

scripts/packages.lua

@@ -50,7 +50,7 @@ function main(...)
         local packagefile = path.join(packagedir, "xmake.lua")
         local instance = package.load_from_repository(packagename, nil, packagedir, packagefile)
         if instance then
-            for _, plat in ipairs({"windows", "linux", "macosx", "iphoneos", "android"}) do
+            for _, plat in ipairs({"windows", "linux", "macosx", "iphoneos", "android", "mingw"}) do
                 local archs = platform.archs(plat)
                 if archs then
                     local package_archs = {}