jdk/makefiles/lib/Awt2dLibraries.gmk

*** 21,34 ****
  # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  # or visit www.oracle.com if you need additional information or have any
  # questions.
  #
  
! #
! # TODO replace with X_FLAGS / X_LIBS
! # and add them to configure
! #
  OPENWIN_LIB := $(OPENWIN_HOME)/lib
  
  WIN_AWT_LIB := $(JDK_OUTPUTDIR)/objs/libawt/awt.lib
  
  ##########################################################################################
--- 21,31 ----
  # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  # or visit www.oracle.com if you need additional information or have any
  # questions.
  #
  
! # Openwin is defined on Solaris.
  OPENWIN_LIB := $(OPENWIN_HOME)/lib
  
  WIN_AWT_LIB := $(JDK_OUTPUTDIR)/objs/libawt/awt.lib
  
  ##########################################################################################
*** 1252,1265 ****
      LIBSPLASHSCREEN_splashscreen_impl.c_CFLAGS := -x objective-c -O0
      LIBSPLASHSCREEN_splashscreen_jpeg.c_CFLAGS := -x objective-c -O0
      LIBSPLASHSCREEN_splashscreen_png.c_CFLAGS := -x objective-c -O0
      LIBSPLASHSCREEN_splashscreen_sys.m_CFLAGS := -O0
  
!   else ifneq ($(OPENJDK_TARGET_OS), windows)
      LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions
    else
!     LIBSPLASHSCREEN_CFLAGS += -DWITH_WIN32
    endif
  
    LIBSPLASHSCREEN_LDFLAGS_SUFFIX :=
  
    ifneq ($(USE_EXTERNAL_LIBZ), true)
--- 1249,1264 ----
      LIBSPLASHSCREEN_splashscreen_impl.c_CFLAGS := -x objective-c -O0
      LIBSPLASHSCREEN_splashscreen_jpeg.c_CFLAGS := -x objective-c -O0
      LIBSPLASHSCREEN_splashscreen_png.c_CFLAGS := -x objective-c -O0
      LIBSPLASHSCREEN_splashscreen_sys.m_CFLAGS := -O0
  
!   else ifeq ($(OPENJDK_TARGET_OS), windows)
!     LIBSPLASHSCREEN_CFLAGS += -DWITH_WIN32
!   else ifeq ($(OPENJDK_TARGET_OS), solaris)
      LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions
    else
!     LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 $(X_CFLAGS) -I$(OPENWIN_HOME)/include/X11/extensions
    endif
  
    LIBSPLASHSCREEN_LDFLAGS_SUFFIX :=
  
    ifneq ($(USE_EXTERNAL_LIBZ), true)
*** 1272,1286 ****
          -framework ApplicationServices \
          -framework Foundation \
          -framework Cocoa \
          -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
          -framework JavaNativeFoundation
!   else ifneq ($(OPENJDK_TARGET_OS), windows)
!     LIBSPLASHSCREEN_LDFLAGS_SUFFIX += -L$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR) -lX11 -lXext $(LIBM) -lpthread
!   else # OPENJDK_TARGET_OS
      LIBSPLASHSCREEN_LDFLAGS_SUFFIX += kernel32.lib user32.lib gdi32.lib delayimp.lib -DELAYLOAD:user32.dll
!   endif # OPENJDK_TARGET_OS
  
    $(eval $(call SetupNativeCompilation,LIBSPLASHSCREEN, \
        LIBRARY := splashscreen, \
        OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
        SRC := $(LIBSPLASHSCREEN_DIRS), \
--- 1271,1288 ----
          -framework ApplicationServices \
          -framework Foundation \
          -framework Cocoa \
          -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
          -framework JavaNativeFoundation
!   else ifeq ($(OPENJDK_TARGET_OS), windows)
      LIBSPLASHSCREEN_LDFLAGS_SUFFIX += kernel32.lib user32.lib gdi32.lib delayimp.lib -DELAYLOAD:user32.dll
!   else ifeq ($(OPENJDK_TARGET_OS), solaris)
!     # Solaris still uses OPENWIN_LIB ..
!     LIBSPLASHSCREEN_LDFLAGS_SUFFIX += -L$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR) -lX11 -lXext $(LIBM) -lpthread
!   else  # .. all other Unixes can use X_LIBS
!     LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM) -lpthread
!   endif
  
    $(eval $(call SetupNativeCompilation,LIBSPLASHSCREEN, \
        LIBRARY := splashscreen, \
        OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
        SRC := $(LIBSPLASHSCREEN_DIRS), \