make/lib/Lib-java.desktop.gmk

*** 37,63 ****
  include Awt2dLibraries.gmk
  
  ################################################################################
  # Create the libjsound library
  
! ifneq ($(OPENJDK_TARGET_OS), aix)
  
    LIBJSOUND_CFLAGS := \
        $(ALSA_CFLAGS) \
        -DX_PLATFORM=X_$(OPENJDK_TARGET_OS_UPPERCASE) \
        -DUSE_PORTS=TRUE \
        -DUSE_DAUDIO=TRUE \
        #
  
!   ifneq ($(OPENJDK_TARGET_OS), solaris)
      LIBJSOUND_CFLAGS += \
          -DUSE_PLATFORM_MIDI_OUT=TRUE \
          -DUSE_PLATFORM_MIDI_IN=TRUE \
          #
    endif
  
!   ifeq ($(OPENJDK_TARGET_OS), macosx)
      LIBJSOUND_TOOLCHAIN := TOOLCHAIN_LINK_CXX
    endif
  
    $(eval $(call SetupJdkLibrary, BUILD_LIBJSOUND, \
        NAME := jsound, \
--- 37,63 ----
  include Awt2dLibraries.gmk
  
  ################################################################################
  # Create the libjsound library
  
! ifneq ($(call isTargetOs, aix), true)
  
    LIBJSOUND_CFLAGS := \
        $(ALSA_CFLAGS) \
        -DX_PLATFORM=X_$(OPENJDK_TARGET_OS_UPPERCASE) \
        -DUSE_PORTS=TRUE \
        -DUSE_DAUDIO=TRUE \
        #
  
!   ifneq ($(call isTargetOs, solaris), true)
      LIBJSOUND_CFLAGS += \
          -DUSE_PLATFORM_MIDI_OUT=TRUE \
          -DUSE_PLATFORM_MIDI_IN=TRUE \
          #
    endif
  
!   ifeq ($(call isTargetOs, macosx), true)
      LIBJSOUND_TOOLCHAIN := TOOLCHAIN_LINK_CXX
    endif
  
    $(eval $(call SetupJdkLibrary, BUILD_LIBJSOUND, \
        NAME := jsound, \
*** 85,95 ****
  endif
  
  ################################################################################
  # Create the macosx specific osxapp and osx libraries
  
! ifeq ($(OPENJDK_TARGET_OS), macosx)
  
    $(eval $(call SetupJdkLibrary, BUILD_LIBOSXAPP, \
        NAME := osxapp, \
        OPTIMIZATION := LOW, \
        CFLAGS := $(CFLAGS_JDKLIB), \
--- 85,95 ----
  endif
  
  ################################################################################
  # Create the macosx specific osxapp and osx libraries
  
! ifeq ($(call isTargetOs, macosx), true)
  
    $(eval $(call SetupJdkLibrary, BUILD_LIBOSXAPP, \
        NAME := osxapp, \
        OPTIMIZATION := LOW, \
        CFLAGS := $(CFLAGS_JDKLIB), \
*** 140,145 ****
    $(BUILD_LIBOSX): $(call FindLib, java.desktop, osxapp)
  
    $(BUILD_LIBOSX): $(call FindLib, java.base, java)
  
  endif
- 
--- 140,144 ----