Changeset 255 for trunk/openjdk/jdk/make

Timestamp:

Feb 9, 2011, 9:08:56 PM (15 years ago)

Author:

dmik

Message:

jdk/jsound: Adapted MIDI and DirectAudio code to OS/2 to make sound actually work (#67).

Location:

trunk/openjdk/jdk/make/javax/sound

Files:

• FILES_c.gmk (modified) (1 diff)
• Makefile (modified) (1 diff)
• jsoundds/Makefile (modified) (2 diffs)

trunk/openjdk/jdk/make/javax/sound/FILES_c.gmk

@@ -41 +41 @@
         PLATFORM_API_WinOS_Ports.c
 
+FILES_os2 = \
+        PLATFORM_API_WinOS_MidiIn.c \
+        PLATFORM_API_WinOS_MidiOut.c \
+        PLATFORM_API_WinOS_Util.c \
+        PLATFORM_API_WinOS_Ports.c
+        
 FILES_export = \
         com/sun/media/sound/Platform.java

trunk/openjdk/jdk/make/javax/sound/Makefile

@@ -100 +100 @@
   #MXSPP_ADD = $(PLATFORM)-$(ARCH)/
 endif # PLATFORM win32
+
+ifeq ($(PLATFORM), os2)
+  CPPFLAGS +=   -DUSE_PLATFORM_MIDI_OUT=TRUE \
+                -DUSE_PLATFORM_MIDI_IN=TRUE \
+                -DUSE_PORTS=TRUE
+  LDLIBS += -lwinmm.lib
+
+  # Odin32 always provides MIDI and ports
+  INCLUDE_MIDI  = TRUE
+  INCLUDE_PORTS = TRUE
+
+  # DirectSound handles directaudio (both i586 and amd64)
+  SUBDIRS += jsoundds
+  EXTRA_SOUND_JNI_LIBS += jsoundds
+  #MXSPP_ADD = $(PLATFORM)-$(ARCH)/
+endif # PLATFORM os2
 
 ifeq ($(PLATFORM), linux)

trunk/openjdk/jdk/make/javax/sound/jsoundds/Makefile

@@ -53 +53 @@
 # Extra cc/linker flags.
 #
+ifeq ($(PLATFORM), os2)
+LDLIBS += -ldsound.lib -lwinmm.lib -luser32.lib
+CPPFLAGS += \
+        -DUSE_DAUDIO=TRUE \
+        -I$(SHARE_SRC)/native/com/sun/media/sound
+else
 LDLIBS += dsound.lib winmm.lib user32.lib
 CPPFLAGS += \
@@ -58 +64 @@
         -I$(SHARE_SRC)/native/com/sun/media/sound \
         -I$(DXSDK_INCLUDE_PATH)
+endif
 
 #