scott mc to me

Attached is a patch from GCI student Egor Suvorov (yeputons) to add native midi playback on Haiku.
libsdl-org · Jan 18, 2011 · e0fe14b · e0fe14b
1 parent cae7e4f
commit e0fe14b
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 0 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,4 +1,6 @@
 1.2.12:
+Scott MC - Tue Jan 18 11:06:47 PST 2011
+ * Added support for native MIDI on Haiku OS
 Jon Atkins - Sat Nov 14 13:00:18 PST 2009
  * Added support for libmodplug (disabled by default)
 

diff --git a/Makefile.in b/Makefile.in
@@ -20,6 +20,7 @@ distfile = $(distdir).tar.gz
 EXE	= @EXE@
 SHELL	= @SHELL@
 CC      = @CC@
+CXX     = g++
 CFLAGS  = @BUILD_CFLAGS@
 EXTRA_CFLAGS = @EXTRA_CFLAGS@
 LDFLAGS = @BUILD_LDFLAGS@

diff --git a/configure.in b/configure.in
@@ -358,10 +358,18 @@ AC_HELP_STRING([--enable-music-native-midi], [enable native MIDI music output [[
                 use_music_native_midi=yes
                 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,AudioToolbox -Wl,-framework,AudioUnit -Wl,-framework,CoreServices"
                 ;;
+            *-*-haiku*)
+                use_music_native_midi=yes_cpp
+                EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lmidi" 
+                ;;
         esac
         if test x$use_music_native_midi = xyes; then
             EXTRA_CFLAGS="$EXTRA_CFLAGS -DUSE_NATIVE_MIDI -I\$(srcdir)/native_midi"
             SOURCES="$SOURCES $srcdir/native_midi/*.c"
+        elif test x$use_music_native_midi = xyes_cpp; then
+            EXTRA_CFLAGS="$EXTRA_CFLAGS -DUSE_NATIVE_MIDI -I\$(srcdir)/native_midi"
+            SOURCES="$SOURCES $srcdir/native_midi/*.c"
+            SOURCES_CXX="$SOURCES_CXX $srcdir/native_midi/*.cpp"
         fi
     fi
     AC_ARG_ENABLE([music-native-midi-gpl],
@@ -596,6 +604,15 @@ DEPENDS=`echo "$DEPENDS" | sed 's,\([[^ ]]*\)/\([[^ ]]*\)\.c,\\
 $(objects)/\2.lo: \1/\2.c\\
 	\$(LIBTOOL) --mode=compile \$(CC) \$(CFLAGS) \$(EXTRA_CFLAGS) '"$DEPENDENCY_TRACKING_OPTIONS"' -c \$< -o \$@,g'`
 
+OBJECTS_CXX=`echo $SOURCES_CXX`
+DEPENDS_CXX=`echo $SOURCES_CXX`
+OBJECTS_CXX=`echo "$OBJECTS_CXX" | sed 's,[[^ ]]*/\([[^ ]]*\)\.cpp,$(objects)/\1.lo,g'`
+DEPENDS_CXX=`echo "$DEPENDS_CXX" | sed 's,\([[^ ]]*\)/\([[^ ]]*\)\.cpp,\\
+$(objects)/\2.lo: \1/\2.cpp\\
+	\$(LIBTOOL) --mode=compile \$(CXX) \$(CFLAGS) \$(EXTRA_CFLAGS) '"$DEPENDENCY_TRACKING_OPTIONS"' -c \$< -o \$@,g'`
+OBJECTS="$OBJECTS $OBJECTS_CXX"
+DEPENDS="$DEPENDS $DEPENDS_CXX"
+
 VERSION_OBJECTS=`echo $VERSION_SOURCES`
 VERSION_DEPENDS=`echo $VERSION_SOURCES`
 VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.rc,$(objects)/\1.o,g'`