jdk/make/lib/SoundLibraries.gmk
changeset 29931 64e274ed6567
parent 29374 f031a666744a
child 30433 959fd8f98b55
equal deleted inserted replaced
29930:d816cb0064ee 29931:64e274ed6567
    32     $(LIBJAVA_HEADER_FLAGS) \
    32     $(LIBJAVA_HEADER_FLAGS) \
    33     $(foreach dir, $(LIBJSOUND_SRC_DIRS), -I$(dir)) \
    33     $(foreach dir, $(LIBJSOUND_SRC_DIRS), -I$(dir)) \
    34     #
    34     #
    35 
    35 
    36 LIBJSOUND_SRC_FILES := Utilities.c Platform.c
    36 LIBJSOUND_SRC_FILES := Utilities.c Platform.c
    37 
       
    38 LIBJSOUND_LANG := C
       
    39 
    37 
    40 EXTRA_SOUND_JNI_LIBS :=
    38 EXTRA_SOUND_JNI_LIBS :=
    41 
    39 
    42 LIBJSOUND_MIDIFILES := \
    40 LIBJSOUND_MIDIFILES := \
    43     MidiInDevice.c \
    41     MidiInDevice.c \
    79 ifeq ($(OPENJDK_TARGET_OS), aix)
    77 ifeq ($(OPENJDK_TARGET_OS), aix)
    80   LIBJSOUND_CFLAGS += -DX_PLATFORM=X_AIX
    78   LIBJSOUND_CFLAGS += -DX_PLATFORM=X_AIX
    81 endif # OPENJDK_TARGET_OS aix
    79 endif # OPENJDK_TARGET_OS aix
    82 
    80 
    83 ifeq ($(OPENJDK_TARGET_OS), macosx)
    81 ifeq ($(OPENJDK_TARGET_OS), macosx)
    84   LIBJSOUND_LANG := C++
    82   LIBJSOUND_TOOLCHAIN := TOOLCHAIN_LINK_CXX
    85   LIBJSOUND_CFLAGS += -DX_PLATFORM=X_MACOSX \
    83   LIBJSOUND_CFLAGS += -DX_PLATFORM=X_MACOSX \
    86       -DUSE_PORTS=TRUE \
    84       -DUSE_PORTS=TRUE \
    87       -DUSE_DAUDIO=TRUE \
    85       -DUSE_DAUDIO=TRUE \
    88       -DUSE_PLATFORM_MIDI_OUT=TRUE \
    86       -DUSE_PLATFORM_MIDI_OUT=TRUE \
    89       -DUSE_PLATFORM_MIDI_IN=TRUE
    87       -DUSE_PLATFORM_MIDI_IN=TRUE
   122 $(eval $(call SetupNativeCompilation,BUILD_LIBJSOUND, \
   120 $(eval $(call SetupNativeCompilation,BUILD_LIBJSOUND, \
   123     LIBRARY := jsound, \
   121     LIBRARY := jsound, \
   124     OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
   122     OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
   125     SRC := $(LIBJSOUND_SRC_DIRS), \
   123     SRC := $(LIBJSOUND_SRC_DIRS), \
   126     INCLUDE_FILES := $(LIBJSOUND_SRC_FILES), \
   124     INCLUDE_FILES := $(LIBJSOUND_SRC_FILES), \
   127     LANG := $(LIBJSOUND_LANG), \
   125     TOOLCHAIN := $(LIBJSOUND_TOOLCHAIN), \
   128     OPTIMIZATION := LOW, \
   126     OPTIMIZATION := LOW, \
   129     CFLAGS := $(CFLAGS_JDKLIB) \
   127     CFLAGS := $(CFLAGS_JDKLIB) \
   130         $(LIBJSOUND_CFLAGS), \
   128         $(LIBJSOUND_CFLAGS), \
   131     CXXFLAGS := $(CXXFLAGS_JDKLIB) $(LIBJSOUND_CFLAGS), \
   129     CXXFLAGS := $(CXXFLAGS_JDKLIB) $(LIBJSOUND_CFLAGS), \
   132     DISABLED_WARNINGS_clang := implicit-function-declaration \
   130     DISABLED_WARNINGS_clang := implicit-function-declaration \
   167           PLATFORM_API_LinuxOS_ALSA_PCMUtils.c \
   165           PLATFORM_API_LinuxOS_ALSA_PCMUtils.c \
   168           PLATFORM_API_LinuxOS_ALSA_MidiIn.c \
   166           PLATFORM_API_LinuxOS_ALSA_MidiIn.c \
   169           PLATFORM_API_LinuxOS_ALSA_MidiOut.c \
   167           PLATFORM_API_LinuxOS_ALSA_MidiOut.c \
   170           PLATFORM_API_LinuxOS_ALSA_MidiUtils.c \
   168           PLATFORM_API_LinuxOS_ALSA_MidiUtils.c \
   171           PLATFORM_API_LinuxOS_ALSA_Ports.c, \
   169           PLATFORM_API_LinuxOS_ALSA_Ports.c, \
   172       LANG := C, \
       
   173       OPTIMIZATION := LOW, \
   170       OPTIMIZATION := LOW, \
   174       CFLAGS := $(CFLAGS_JDKLIB) $(ALSA_CFLAGS) \
   171       CFLAGS := $(CFLAGS_JDKLIB) $(ALSA_CFLAGS) \
   175           $(LIBJSOUND_CFLAGS) \
   172           $(LIBJSOUND_CFLAGS) \
   176           -DUSE_DAUDIO=TRUE \
   173           -DUSE_DAUDIO=TRUE \
   177           -DUSE_PORTS=TRUE \
   174           -DUSE_PORTS=TRUE \
   199       LIBRARY := jsoundds, \
   196       LIBRARY := jsoundds, \
   200       OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
   197       OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
   201       SRC := $(LIBJSOUND_SRC_DIRS), \
   198       SRC := $(LIBJSOUND_SRC_DIRS), \
   202       INCLUDE_FILES := Utilities.c $(LIBJSOUND_DAUDIOFILES) \
   199       INCLUDE_FILES := Utilities.c $(LIBJSOUND_DAUDIOFILES) \
   203           PLATFORM_API_WinOS_DirectSound.cpp, \
   200           PLATFORM_API_WinOS_DirectSound.cpp, \
   204       LANG := C++, \
       
   205       OPTIMIZATION := LOW, \
   201       OPTIMIZATION := LOW, \
   206       CFLAGS := $(CFLAGS_JDKLIB) \
   202       CFLAGS := $(CFLAGS_JDKLIB) \
   207           $(LIBJSOUND_CFLAGS) \
   203           $(LIBJSOUND_CFLAGS) \
   208           -DUSE_DAUDIO=TRUE, \
   204           -DUSE_DAUDIO=TRUE, \
   209       LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \
   205       LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \