diff --git a/packages/l/libpng/xmake.lua b/packages/l/libpng/xmake.lua
index 3f5f2938d..b10c84740 100644
--- a/packages/l/libpng/xmake.lua
+++ b/packages/l/libpng/xmake.lua
@@ -27,8 +27,19 @@ package("libpng")
         import("package.tools.cmake").install(package, configs)
     end)
 
-    on_install("macosx", "linux", "iphoneos", function (package)
-        import("package.tools.autoconf").install(package, {"--disable-dependency-tracking", "--disable-silent-rules"})
+    on_install("macosx", "linux", function (package)
+        import("package.tools.autoconf").install(package, {"--disable-dependency-tracking", "--disable-silent-rules", "--enable-shared=no"})
+    end)
+
+    on_install("iphoneos", "android", function (package)
+        import("package.tools.autoconf")
+        local zlib = package:dep("zlib")
+        local envs = autoconf.buildenvs(package)
+        if zlib then
+            envs.CPPFLAGS = (envs.CPPFLAGS or "") .. " -I" .. os.args(path.join(zlib:installdir(), "include"))
+            envs.LDFLAGS = (envs.LDFLAGS or "") .. " -L" .. os.args(path.join(zlib:installdir(), "lib"))
+        end
+        autoconf.install(package, {"--disable-dependency-tracking", "--disable-silent-rules", "--enable-shared=no"}, {envs = envs})
     end)
 
     on_test(function (package)
diff --git a/packages/z/zlib/xmake.lua b/packages/z/zlib/xmake.lua
index b64f7bc0f..320a1f0c7 100644
--- a/packages/z/zlib/xmake.lua
+++ b/packages/z/zlib/xmake.lua
@@ -9,18 +9,18 @@ package("zlib")
     add_versions("1.2.10", "8d7e9f698ce48787b6e1c67e6bff79e487303e66077e25cb9784ac8835978017")
     add_versions("1.2.11", "c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1")
 
-    on_install("linux", "macosx", function (package)
-        import("package.tools.autoconf").install(package, {"--static"})
-    end)
-
     on_install("windows", function (package)
         io.gsub("win32/Makefile.msc", "%-MD", "-" .. package:config("vs_runtime"))
         os.vrun("nmake -f win32\\Makefile.msc zlib.lib")
         os.cp("zlib.lib", package:installdir("lib"))
         os.cp("*.h", package:installdir("include"))
     end)
+
+    on_install("linux", "macosx", function (package)
+        import("package.tools.autoconf").install(package, {"--static"})
+    end)
  
-    on_install("iphoneos", "android", "mingw", function (package)
+    on_install("iphoneos", "android", 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")