equal
deleted
inserted
replaced
54 ifneq ($(LIBZIP_CAN_USE_MMAP),false) |
54 ifneq ($(LIBZIP_CAN_USE_MMAP),false) |
55 OTHER_CFLAGS += -DUSE_MMAP |
55 OTHER_CFLAGS += -DUSE_MMAP |
56 endif |
56 endif |
57 endif |
57 endif |
58 |
58 |
|
59 ifeq ($(SYSTEM_ZLIB),true) |
|
60 OTHER_CFLAGS += $(ZLIB_CFLAGS) |
|
61 endif |
|
62 |
59 # |
63 # |
60 # Library to compile. |
64 # Library to compile. |
61 # |
65 # |
62 ifeq ($(PLATFORM), solaris) |
66 ifeq ($(PLATFORM), solaris) |
63 ifneq ($(ARCH), amd64) |
67 ifneq ($(ARCH), amd64) |
88 |
92 |
89 # |
93 # |
90 # Link to JVM library for JVM_Zip* functions |
94 # Link to JVM library for JVM_Zip* functions |
91 # |
95 # |
92 ifeq ($(SYSTEM_ZLIB),true) |
96 ifeq ($(SYSTEM_ZLIB),true) |
93 OTHER_LDLIBS = -lz |
97 OTHER_LDLIBS = $(ZLIB_LIBS) |
94 else |
98 else |
95 OTHER_LDLIBS = $(JVMLIB) |
99 OTHER_LDLIBS = $(JVMLIB) |
96 endif |
100 endif |
97 |
101 |