From da1c28b43136787c332271a79a0772f17fd2bde0 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Wed, 5 Sep 2001 04:02:15 +0000 Subject: [PATCH] *** empty log message *** --- configure.in | 5 ++++- native_midi/Makefile.am | 9 +++++++++ native_midi/native_midi_mac.c | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 native_midi/Makefile.am diff --git a/configure.in b/configure.in index 24a4f888..0e2d8ecd 100644 --- a/configure.in +++ b/configure.in @@ -123,7 +123,7 @@ if test x$enable_music_midi = xyes; then [ --enable-music-timidity-midi enable timidity MIDI output [default=yes]], , enable_music_timidity_midi=yes) if test x$enable_music_timidity_midi = xyes; then - CFLAGS="$CFLAGS -I\$(top_srcdir)/timidity" + CFLAGS="$CFLAGS -DUSE_TIMIDITY_MIDI -I\$(top_srcdir)/timidity" MUSIC_SUBDIRS="$MUSIC_SUBDIRS timidity" fi AC_ARG_ENABLE(music-native-midi, @@ -136,6 +136,9 @@ if test x$enable_music_midi = xyes; then use_music_native_midi=yes LIBS="$LIBS -lwinmm" ;; + *-*-darwin*) + use_music_native_midi=yes + ;; esac if test x$use_music_native_midi = xyes; then CFLAGS="$CFLAGS -DUSE_NATIVE_MIDI -I\$(top_srcdir)/native_midi" diff --git a/native_midi/Makefile.am b/native_midi/Makefile.am new file mode 100644 index 00000000..7201b125 --- /dev/null +++ b/native_midi/Makefile.am @@ -0,0 +1,9 @@ + +noinst_LTLIBRARIES = libnativemidi.la + +libnativemidi_la_SOURCES = \ + native_midi.h \ + native_midi_common.c \ + native_midi_common.h \ + native_midi_mac.c \ + native_midi_win32.c diff --git a/native_midi/native_midi_mac.c b/native_midi/native_midi_mac.c index 8e117aad..fa6c2922 100644 --- a/native_midi/native_midi_mac.c +++ b/native_midi/native_midi_mac.c @@ -20,7 +20,7 @@ max@quendi.de */ -#if 1 || defined(MACOS) || defined(MACOSX) +#if defined(macintosh) || defined(__APPLE__) #include "native_midi.h" #include "native_midi_common.h"