Forráskód Böngészése

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
Kapai 4 éve
szülő
commit
edcac7cfa9
2 módosított fájl, 24 hozzáadás és 1 törlés
  1. 13 1
      packages/m/mbedtls/xmake.lua
  2. 11 0
      packages/z/zlib/xmake.lua

+ 13 - 1
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)

+ 11 - 0
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")