diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-04-12 16:05:31 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-04-13 13:15:25 +0100 |
| commit | 452af5f4522e750627d0c0ac9fbc794aeb1f1f8f (patch) | |
| tree | 950d062f9e183873d64b06e212568a3b0968bb58 /solenv/inc | |
| parent | 99b04ed2be3023bec874fce529d453123f48ac99 (diff) | |
gbuildize internal zlib
and stick headers into the solver in the same hierarchy as is "standard"
so we don't have to patch so much, similiarly rename to libz
Diffstat (limited to 'solenv/inc')
| -rw-r--r-- | solenv/inc/libs.mk | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk index 3adeb01d3a0e..4b536fd990da 100644 --- a/solenv/inc/libs.mk +++ b/solenv/inc/libs.mk @@ -193,11 +193,7 @@ 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 @@ -467,7 +463,7 @@ LNGLIB=ilng.lib CLUCENELIB=iclucene.lib EXPAT3RDLIB=expat_xmltok.lib expat_xmlparse.lib EXPATASCII3RDLIB=expat_xmltok.lib ascii_expat_xmlparse.lib -ZLIB3RDLIB=zlib.lib +ZLIB3RDLIB=z.lib JPEG3RDLIB=jpeglib.lib NEON3RDLIB=ineon.lib BERKELEYLIB=libdb47.lib |