1 files changed, 4 insertions, 2 deletions

diff --git a/linden/indra/cmake/ZLIB.cmake b/linden/indra/cmake/ZLIB.cmake
index 80d4191..48e5130 100644
--- a/linden/indra/cmake/ZLIB.cmake
+++ b/linden/indra/cmake/ZLIB.cmake
@@ -10,11 +10,13 @@ if (STANDALONE)
 else (STANDALONE)
   use_prebuilt_binary(zlib)
   if (WINDOWS)
-    set(ZLIB_LIBRARIES zlib)
+    set(ZLIB_LIBRARIES 
+      debug zlibd
+      optimized zlib)
   else (WINDOWS)
     set(ZLIB_LIBRARIES z)
   endif (WINDOWS)
   if (WINDOWS OR LINUX)
-    set(ZLIB_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/zlib)
+    set(ZLIB_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/zlib)
   endif (WINDOWS OR LINUX)
 endif (STANDALONE)