equal
deleted
inserted
replaced
1249 endif |
1249 endif |
1250 |
1250 |
1251 LIBSPLASHSCREEN_LDFLAGS_SUFFIX := |
1251 LIBSPLASHSCREEN_LDFLAGS_SUFFIX := |
1252 |
1252 |
1253 ifneq ($(USE_EXTERNAL_LIBZ), true) |
1253 ifneq ($(USE_EXTERNAL_LIBZ), true) |
1254 LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/share/native/java/util/zip/zlib-1.2.5 |
1254 LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/share/native/java/util/zip/zlib-1.2.8 |
1255 LIBSPLASHSCREEN_CFLAGS += $(ZLIB_CPPFLAGS) |
1255 LIBSPLASHSCREEN_CFLAGS += $(ZLIB_CPPFLAGS) |
1256 endif |
1256 endif |
1257 |
1257 |
1258 ifeq ($(OPENJDK_TARGET_OS), macosx) |
1258 ifeq ($(OPENJDK_TARGET_OS), macosx) |
1259 LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(LIBM) -lpthread -liconv -losxapp \ |
1259 LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(LIBM) -lpthread -liconv -losxapp \ |