summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-04-13 14:06:05 +0100
committerCaolán McNamara <caolanm@redhat.com>2012-04-13 14:06:55 +0100
commit3934efe28c70b1c21a60f38fe726a935c15f4e99 (patch)
treec322f38a215b05ff0c457366e08fab9255b64114 /solenv
parent134fe756a1659e352c96d0a6da34dd3c7d23e3a9 (diff)
sigh, need a 64bit zlib too on windows, reverting
Diffstat (limited to 'solenv')
-rw-r--r--solenv/inc/libs.mk6
1 files changed, 5 insertions, 1 deletions
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index 4b536fd990da..3adeb01d3a0e 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -193,7 +193,11 @@ EXPATASCII3RDLIB=-lexpat
EXPAT3RDLIB=-lexpat_xmlparse -lexpat_xmltok
EXPATASCII3RDLIB=-lascii_expat_xmlparse -lexpat_xmltok
.ENDIF
+.IF "$(SYSTEM_ZLIB)"=="YES"
ZLIB3RDLIB=-lz
+.ELSE
+ZLIB3RDLIB=-lzlib
+.ENDIF
.IF "$(SYSTEM_MINIZIP)"=="YES"
MINIZIP3RDLIB=$(MINIZIP_LIBS)
.ELSE
@@ -463,7 +467,7 @@ LNGLIB=ilng.lib
CLUCENELIB=iclucene.lib
EXPAT3RDLIB=expat_xmltok.lib expat_xmlparse.lib
EXPATASCII3RDLIB=expat_xmltok.lib ascii_expat_xmlparse.lib
-ZLIB3RDLIB=z.lib
+ZLIB3RDLIB=zlib.lib
JPEG3RDLIB=jpeglib.lib
NEON3RDLIB=ineon.lib
BERKELEYLIB=libdb47.lib