ChangeLogTag: Mon Feb 27 17:35:55 UTC 2006 Chad Elliott <elliott_c@ociweb.com>

2 files changed, 13 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index f80be43d..d03dfcaa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Mon Feb 27 17:35:55 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
+
+        * config/zlib.mpb:
+
+          Changed the Windows section of the zlib library to use libs
+          instead of lit_libs.  It is necessary to match up debug to
+          debug and release to release when linking an application with this
+          library.
+
 Fri Feb 24 00:23:57 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
 
         * modules/ProjectCreator.pm:
diff --git a/config/zlib.mpb b/config/zlib.mpb
index 26362d78..bc0b1ab0 100644
--- a/config/zlib.mpb
+++ b/config/zlib.mpb
@@ -11,6 +11,9 @@ feature(zlib) {
   specific(gnuace, make, sle, automake, ghs) {
     lit_libs += z
   } else {
-    lit_libs += zlib
+    // For Windows, we need to ensure that the library has a decorator.
+    // Due to compilation flags used to build this library, we may have
+    // linkage conflicts if the release version is used with a debug build.
+    libs += zlib
   }
 }