make/lib/Awt2dLibraries.gmk

*** 903,915 ****
      LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 $(X_CFLAGS)
    endif
  
    LIBSPLASHSCREEN_LIBS :=
  
!   ifneq ($(USE_EXTERNAL_LIBZ), true)
      LIBSPLASHSCREEN_DIRS += $(TOPDIR)/src/java.base/share/native/libzip/zlib
!     LIBSPLASHSCREEN_CFLAGS += $(ZLIB_CPPFLAGS)
    endif
  
    ifeq ($(OPENJDK_TARGET_OS), macosx)
      LIBSPLASHSCREEN_LDFLAGS := -L$(INSTALL_LIBRARIES_HERE)
      LIBSPLASHSCREEN_LIBS += \
--- 903,924 ----
      LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 $(X_CFLAGS)
    endif
  
    LIBSPLASHSCREEN_LIBS :=
  
!   ifeq ($(USE_EXTERNAL_LIBZ), false)
      LIBSPLASHSCREEN_DIRS += $(TOPDIR)/src/java.base/share/native/libzip/zlib
!   else
!     ifeq ($(OPENJDK_TARGET_OS), macosx)
!       ifeq ($(USE_EXTERNAL_LIBPNG), false)
!         # When building our own libpng and using an external libz, we need to
!         # inject our own libz.h to tweak the exported ZLIB_VERNUM macro. See
!         # $(TOPDIR)/src/java.desktop/macosx/native/libsplashscreen/libpng/zlib.h
!         # for details.
!         LIBSPLASHSCREEN_CFLAGS += -iquote $(TOPDIR)/src/java.desktop/macosx/native/libsplashscreen/libpng
!       endif
!     endif
    endif
  
    ifeq ($(OPENJDK_TARGET_OS), macosx)
      LIBSPLASHSCREEN_LDFLAGS := -L$(INSTALL_LIBRARIES_HERE)
      LIBSPLASHSCREEN_LIBS += \
*** 931,950 ****
        SRC := $(LIBSPLASHSCREEN_DIRS), \
        EXCLUDE_FILES := imageioJPEG.c jpegdecoder.c pngtest.c, \
        EXCLUDES := $(LIBSPLASHSCREEN_EXCLUDES), \
        OPTIMIZATION := LOW, \
        CFLAGS := $(LIBSPLASHSCREEN_CFLAGS) $(CFLAGS_JDKLIB) \
!                 $(GIFLIB_CFLAGS) $(LIBJPEG_CFLAGS) $(PNG_CFLAGS), \
        DISABLED_WARNINGS_gcc := sign-compare type-limits unused-result maybe-uninitialized shift-negative-value, \
        DISABLED_WARNINGS_clang := incompatible-pointer-types, \
        DISABLED_WARNINGS_solstudio := E_NEWLINE_NOT_LAST E_DECLARATION_IN_CODE \
            E_STATEMENT_NOT_REACHED, \
        DISABLED_WARNINGS_microsoft := 4018 4244 4267, \
        MAPFILE := $(TOPDIR)/make/mapfiles/libsplashscreen/mapfile-vers, \
        LDFLAGS := $(LIBSPLASHSCREEN_LDFLAGS) $(LDFLAGS_JDKLIB) \
            $(call SET_SHARED_LIBRARY_ORIGIN), \
!       LIBS := $(JDKLIB_LIBS) $(LIBSPLASHSCREEN_LIBS) $(LIBZ) \
                          $(GIFLIB_LIBS) $(LIBJPEG_LIBS) $(PNG_LIBS), \
        LIBS_aix := -liconv, \
        VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
        RC_FLAGS := $(RC_FLAGS) \
            -D "JDK_FNAME=splashscreen.dll" \
--- 940,959 ----
        SRC := $(LIBSPLASHSCREEN_DIRS), \
        EXCLUDE_FILES := imageioJPEG.c jpegdecoder.c pngtest.c, \
        EXCLUDES := $(LIBSPLASHSCREEN_EXCLUDES), \
        OPTIMIZATION := LOW, \
        CFLAGS := $(LIBSPLASHSCREEN_CFLAGS) $(CFLAGS_JDKLIB) \
!           $(GIFLIB_CFLAGS) $(LIBJPEG_CFLAGS) $(PNG_CFLAGS) $(LIBZ_CFLAGS), \
        DISABLED_WARNINGS_gcc := sign-compare type-limits unused-result maybe-uninitialized shift-negative-value, \
        DISABLED_WARNINGS_clang := incompatible-pointer-types, \
        DISABLED_WARNINGS_solstudio := E_NEWLINE_NOT_LAST E_DECLARATION_IN_CODE \
            E_STATEMENT_NOT_REACHED, \
        DISABLED_WARNINGS_microsoft := 4018 4244 4267, \
        MAPFILE := $(TOPDIR)/make/mapfiles/libsplashscreen/mapfile-vers, \
        LDFLAGS := $(LIBSPLASHSCREEN_LDFLAGS) $(LDFLAGS_JDKLIB) \
            $(call SET_SHARED_LIBRARY_ORIGIN), \
!       LIBS := $(JDKLIB_LIBS) $(LIBSPLASHSCREEN_LIBS) $(LIBZ_LIBS) \
            $(GIFLIB_LIBS) $(LIBJPEG_LIBS) $(PNG_LIBS), \
        LIBS_aix := -liconv, \
        VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
        RC_FLAGS := $(RC_FLAGS) \
            -D "JDK_FNAME=splashscreen.dll" \