equal
deleted
inserted
replaced
124 CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/splashscreen |
124 CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/splashscreen |
125 CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/image/jpeg |
125 CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/image/jpeg |
126 ifneq ($(SYSTEM_ZLIB),true) |
126 ifneq ($(SYSTEM_ZLIB),true) |
127 CPPFLAGS += -I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION) |
127 CPPFLAGS += -I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION) |
128 else |
128 else |
129 OTHER_LDLIBS += -lz |
129 OTHER_CFLAGS += $(ZLIB_CFLAGS) |
|
130 OTHER_LDLIBS += $(ZLIB_LIBS) |
130 endif |
131 endif |
131 |
132 |
132 # Shun the less than portable MMX assembly code in pnggccrd.c, |
133 # Shun the less than portable MMX assembly code in pnggccrd.c, |
133 # and use alternative implementations in C. |
134 # and use alternative implementations in C. |
134 CPPFLAGS += -DPNG_NO_MMX_CODE |
135 CPPFLAGS += -DPNG_NO_MMX_CODE |