Support and test zlib on windows

    * .github/workflows/windows.yml:
    * config/zlib.mpb:

1 files changed, 15 insertions, 6 deletions

diff --git a/config/zlib.mpb b/config/zlib.mpb
index af7711ac..ef207cb4 100644
--- a/config/zlib.mpb
+++ b/config/zlib.mpb
@@ -1,15 +1,24 @@
 // -*- MPC -*-
 feature(zlib) {
-  includes += "$(ZLIB_ROOT)/include"
-  libpaths += "$(ZLIB_ROOT)/lib"
+  expand(ZLIB_INCDIR) {
+    ZLIB_INCDIR
+    $(ZLIB_ROOT)/include
+  }
+  expand(ZLIB_LIBDIR) {
+    ZLIB_LIBDIR
+    $(ZLIB_ROOT)/lib
+  }
+
+  includes += "$(ZLIB_INCDIR)"
+  libpaths += "$(ZLIB_LIBDIR)"
   macros   += ZLIB
 
-  // @@ Notice: If you are building with Cygwin, you may need to manually
-  //            change the following library to zlib.
   specific(prop:windows) {
     zlibname = zlib
-    lit_libs += $(ZLIBNAME)
+    Debug::zlibname = zlibd
+
   } else {
-    lit_libs += z
+    zlibname = z
   }
+  lit_libs += $(ZLIBNAME)
 }