diff options
| author | David Tardon <dtardon@redhat.com> | 2012-03-18 11:39:45 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-03-18 21:23:41 +0100 |
| commit | 1f09f96e95a74308fee7a1549234c2c364e55e4f (patch) | |
| tree | a1018d19254f1aa888a906357ba7850b734ce4f8 /solenv | |
| parent | 1118f57582aaa7275a8fe1d1460e1515c111ac2e (diff) | |
mingw: allow use of system zlib
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/inc/libs.mk | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk index 55bf2bfd5a6e..3adeb01d3a0e 100644 --- a/solenv/inc/libs.mk +++ b/solenv/inc/libs.mk @@ -198,6 +198,12 @@ ZLIB3RDLIB=-lz .ELSE ZLIB3RDLIB=-lzlib .ENDIF +.IF "$(SYSTEM_MINIZIP)"=="YES" +MINIZIP3RDLIB=$(MINIZIP_LIBS) +.ELSE +# internally, minizip is included in zlib +MINIZIP3RDLIB= +.ENDIF .IF "$(SYSTEM_JPEG)"=="YES" JPEG3RDLIB=-ljpeg .ELSE |