make/lib/Awt2dLibraries.gmk

*** 202,211 ****
--- 202,212 ----
  endif
  
  ifeq ($(OPENJDK_TARGET_OS), windows)
    LIBAWT_DIRS += $(JDK_TOPDIR)/src/java.desktop/share/native/common/font \
        $(JDK_TOPDIR)/src/java.desktop/share/native/common/java2d/opengl \
+       $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt/systemscale \
    # Why does libawt need java.base headers?
    LIBAWT_CFLAGS += -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/font \
        -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/java2d/opengl \
        -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/java2d/opengl \
        -I$(JDK_TOPDIR)/src/java.desktop/windows/native/include \
*** 889,898 ****
--- 890,902 ----
  
    ifneq ($(filter $(OPENJDK_TARGET_OS),linux solaris), )
      LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/java.desktop/unix/native/common/awt/systemscale
    endif
  
+   ifeq ($(OPENJDK_TARGET_OS), windows)
+     LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/java.desktop/windows/native/common/awt/systemscale
+   endif 
    LIBSPLASHSCREEN_CFLAGS += -DSPLASHSCREEN -DPNG_NO_MMX_CODE -DPNG_ARM_NEON_OPT=0 \
        $(addprefix -I, $(LIBSPLASHSCREEN_DIRS)) \
        $(LIBJAVA_HEADER_FLAGS) \
        #
  
*** 929,939 ****
          -framework Foundation \
          -framework Cocoa \
          -framework JavaNativeFoundation
    else ifeq ($(OPENJDK_TARGET_OS), windows)
      LIBSPLASHSCREEN_LDFLAGS := -delayload:user32.dll
!     LIBSPLASHSCREEN_LIBS += kernel32.lib user32.lib gdi32.lib delayimp.lib
    else
      LIBSPLASHSCREEN_LIBS += $(X_LIBS) -lX11 -lXext $(LIBM) -lpthread
    endif
  
    $(eval $(call SetupNativeCompilation,BUILD_LIBSPLASHSCREEN, \
--- 933,943 ----
          -framework Foundation \
          -framework Cocoa \
          -framework JavaNativeFoundation
    else ifeq ($(OPENJDK_TARGET_OS), windows)
      LIBSPLASHSCREEN_LDFLAGS := -delayload:user32.dll
!     LIBSPLASHSCREEN_LIBS += kernel32.lib user32.lib gdi32.lib delayimp.lib $(WIN_JAVA_LIB) jvm.lib
    else
      LIBSPLASHSCREEN_LIBS += $(X_LIBS) -lX11 -lXext $(LIBM) -lpthread
    endif
  
    $(eval $(call SetupNativeCompilation,BUILD_LIBSPLASHSCREEN, \