make/java/jli/Makefile

Print this page

        

*** 44,53 **** --- 44,55 ---- include $(BUILDDIR)/common/Defs.gmk ifneq ($(SYSTEM_ZLIB),true) ZIP_SRC = $(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION) + else # SYSTEM_ZLIB + OTHER_CFLAGS += $(ZLIB_CFLAGS) endif #SYSTEM_ZLIB LAUNCHER_SHARE_SRC = $(SHARE_SRC)/bin # set the platform specific directory for macosx, also this platform shares # substantial family ties with its siblings (solaris and linux), thus we add
*** 155,165 **** OTHER_INCLUDES += -I$(LAUNCHER_SHARE_SRC) OTHER_INCLUDES += -I$(LAUNCHER_PLATFORM_SRC) ifneq ($(SYSTEM_ZLIB),true) OTHER_INCLUDES += -I$(ZIP_SRC) else # !SYSTEM_ZLIB ! LDLIBS += -lz endif # SYSTEM_ZLIB # # Library to compile. # --- 157,167 ---- OTHER_INCLUDES += -I$(LAUNCHER_SHARE_SRC) OTHER_INCLUDES += -I$(LAUNCHER_PLATFORM_SRC) ifneq ($(SYSTEM_ZLIB),true) OTHER_INCLUDES += -I$(ZIP_SRC) else # !SYSTEM_ZLIB ! LDLIBS += $(ZLIB_LIBS) endif # SYSTEM_ZLIB # # Library to compile. #