diff options
| author | Miller Puckette <millerpuckette@users.sourceforge.net> | 2005-05-30 03:04:19 +0000 |
|---|---|---|
| committer | Miller Puckette <millerpuckette@users.sourceforge.net> | 2005-05-30 03:04:19 +0000 |
| commit | 05607e31243e5e85a3801d4513192bb1f2150b14 (patch) | |
| tree | 0f810a621cb9967e1e53b349410b0d07be0cea13 /pd/src/configure.in | |
| parent | 47729b52cb85e8a52bf2e6bbf8ee9a810ed331e1 (diff) | |
Remembered to update all the edited files. Should now be in sync... will
have to test it though.
svn path=/trunk/; revision=3092
Diffstat (limited to 'pd/src/configure.in')
| -rw-r--r-- | pd/src/configure.in | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/pd/src/configure.in b/pd/src/configure.in index 5428eafb..7e3c1ae2 100644 --- a/pd/src/configure.in +++ b/pd/src/configure.in @@ -4,6 +4,7 @@ AC_INIT(d_arithmetic.c) AC_SUBST(alsa, yes) AC_SUBST(jack, no) AC_SUBST(portaudio, no) +AC_SUBST(portmidi, no) AC_SUBST(binarymode, -m755) AC_SUBST(PDLIB) AC_SUBST(MORECFLAGS) @@ -27,6 +28,8 @@ AC_ARG_ENABLE(jack, [ --enable-jack jack audio server], jack=$enableval) AC_ARG_ENABLE(portaudio,[ --enable-portaudio portaudio], portaudio=$enableval) +AC_ARG_ENABLE(portmidi, [ --enable-portmidi portmidi], + portmidi=$enableval) AC_ARG_ENABLE(debug, [ --enable-debug debugging support], USE_DEBUG_CFLAGS="no") AC_ARG_ENABLE(static, [ --enable-static link statically], @@ -166,7 +169,8 @@ dnl This should be fixed so Pd can use ALSA shared libraries where appropriate. MORECFLAGS="-DDL_OPEN -DPA_USE_OSS -DPA_LITTLE_ENDIAN -DUNIX -DUNISTD\ -DUSEAPI_OSS \ -I../portaudio/pa_common -I../portaudio/pablio \ - -I../portaudio/portmidi-macosx \ + -I../portmidi/pm_common \ + -I../portmidi/pm_linux \ -fno-strict-aliasing" SYSSRC="s_midi_oss.c s_audio_oss.c" if test x$alsa == "xyes"; @@ -222,22 +226,23 @@ then -framework Carbon -framework CoreMIDI" EXT=pd_darwin MORECFLAGS="-DMACOSX -DUNISTD -I/usr/X11R6/include \ - -I../portaudio_v18/pa_common -I../portaudio_v18/pablio \ - -I../portmidi_osx \ + -I../portaudio/pa_common -I../portaudio/pablio \ + -I../portmidi/pm_common -I../portmidi/pm_mac \ + -I../portmidi/porttime \ -Wno-error \ -DUSEAPI_PORTAUDIO -DPA_BIG_ENDIAN" SYSSRC="s_midi_pm.c s_audio_pa.c \ s_audio_pablio.c \ s_audio_paring.c \ - ../portaudio_v18/pa_common/pa_lib.c \ - ../portaudio_v18/pa_common/pa_trace.c \ - ../portaudio_v18/pa_common/pa_convert.c \ - ../portaudio_v18/pa_mac_core/pa_mac_core.c \ - ../portmidi_osx/pmdarwin.c \ - ../portmidi_osx/pmmacosx.c \ - ../portmidi_osx/pmutil.c \ - ../portmidi_osx/portmidi.c \ - ../portmidi_osx/ptdarwin.c " + ../portaudio/pa_common/pa_lib.c \ + ../portaudio/pa_common/pa_trace.c \ + ../portaudio/pa_common/pa_convert.c \ + ../portaudio/pa_mac_core/pa_mac_core.c \ + ../portmidi/pm_mac/pmmac.c \ + ../portmidi/pm_mac/pmmacosxcm.c \ + ../portmidi/pm_common/pmutil.c \ + ../portmidi/pm_common/portmidi.c \ + ../portmidi/porttime/ptmacosx_cf.c " STRIPFLAG="" GUINAME="pdtcl" GUIFLAGS="-F../../Frameworks -framework Tcl -framework Tk \ |