Merge pull request #128 from jwillemsen/jwi-zlib

Test and support zlib on windows

1 files changed, 13 insertions, 6 deletions

diff --git a/config/zlib.mpb b/config/zlib.mpb
index af7711ac..731935a3 100644
--- a/config/zlib.mpb
+++ b/config/zlib.mpb
@@ -1,14 +1,21 @@
 // -*- 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::lit_libs += zlibd
+    Release::lit_libs += zlib
   } else {
     lit_libs += z
   }