diff options
| author | Brad Kittenbrink <brad@lindenlab.com> | 2009-02-18 21:10:16 +0000 |
|---|---|---|
| committer | Brad Kittenbrink <brad@lindenlab.com> | 2009-02-18 21:10:16 +0000 |
| commit | abdc99f21b542c4fea67030ddbd7166c9d1c6c63 (patch) | |
| tree | 3e984e405adfdec189ca8a047daca5250737ffbf /indra/cmake/ZLIB.cmake | |
| parent | 34412f0530cf6a411b4de906a8e9da59cbcb3a85 (diff) | |
Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 (maint-render-9) and QAR-1236 (dll-msvcrt-2)
svn merge -r 109838:112264 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-9-merge-r109833
Diffstat (limited to 'indra/cmake/ZLIB.cmake')
| -rw-r--r-- | indra/cmake/ZLIB.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/cmake/ZLIB.cmake b/indra/cmake/ZLIB.cmake index 80d4191971..c133248bed 100644 --- a/indra/cmake/ZLIB.cmake +++ b/indra/cmake/ZLIB.cmake @@ -10,7 +10,9 @@ 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) |