From edcac7cfa99b41c877a264e10497d216aa910add Mon Sep 17 00:00:00 2001
From: Kapai <35865498+a952135763@users.noreply.github.com>
Date: Thu, 28 Jan 2021 10:29:04 +0800
Subject: [PATCH] Zlib mingw@windows support and mbedtls mingw@windows support
 (#259)

* Update xmake.lua

mingw@windows
Platform support

* Update xmake.lua

simplify

* Update xmake.lua

zlib
mingw@windows
support

* comments

#259
Revised according to comments

* Format modification

Format modification

* move import to the first line

move import to the first line
---
 packages/m/mbedtls/xmake.lua | 14 +++++++++++++-
 packages/z/zlib/xmake.lua    | 11 +++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/packages/m/mbedtls/xmake.lua b/packages/m/mbedtls/xmake.lua
index 7ed4250a6..f48317067 100644
--- a/packages/m/mbedtls/xmake.lua
+++ b/packages/m/mbedtls/xmake.lua
@@ -19,7 +19,19 @@ package("mbedtls")
             import("package.tools.cmake").install(package)
         end)
     end
-
+	
+    on_install("mingw@windows", function (package)
+        import("core.tool.toolchain")
+        local bindir = toolchain.load("mingw"):bindir()
+        local make = path.join(bindir, "mingw32-make.exe")
+        os.vrun(make.." no_test CC=gcc WINDOWS=1")
+        os.cp("include/mbedtls", package:installdir("include"))
+        os.mkdir(package:installdir().."/lib")
+        os.cp("library/libmbedtls.*", package:installdir("lib"))
+        os.cp("library/libmbedcrypto.*", package:installdir("lib"))
+        os.cp("library/libmbedx509.*", package:installdir("lib"))
+    end)
+	
     on_install("macosx", "linux", function (package)
         io.gsub("./Makefile", "DESTDIR=/usr/local", "DESTDIR=" .. package:installdir())
         import("package.tools.make").build(package)
diff --git a/packages/z/zlib/xmake.lua b/packages/z/zlib/xmake.lua
index e50a1ff2d..e36473231 100644
--- a/packages/z/zlib/xmake.lua
+++ b/packages/z/zlib/xmake.lua
@@ -15,6 +15,17 @@ package("zlib")
         os.cp("*.h", package:installdir("include"))
     end)
 
+    on_install("mingw@windows", function (package)
+        import("core.tool.toolchain")
+        io.gsub("win32/Makefile.gcc", "\nCC =.-\n",      "\nCC=" .. (package:build_getenv("cc") or "") .. "\n")
+        io.gsub("win32/Makefile.gcc", "\nAR =.-\n",      "\nAR=" .. (package:build_getenv("ar") or "") .. "\n")
+        local bindir = toolchain.load("mingw"):bindir()
+        local make = path.join(bindir, "mingw32-make.exe")
+        os.vrun(make.." -f win32/Makefile.gcc libz.a")
+        os.cp("libz.a", package:installdir("lib"))
+        os.cp("*.h", package:installdir("include"))
+    end)
+
     on_install("mingw@msys", function (package)
         io.gsub("win32/Makefile.gcc", "\nCC =.-\n",      "\nCC=" .. (package:build_getenv("cc") or "") .. "\n")
         io.gsub("win32/Makefile.gcc", "\nAR =.-\n",      "\nAR=" .. (package:build_getenv("ar") or "") .. "\n")