Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3437
Modified Files:
Tag: devel_0_39
configure.in makefile.in configure
Log Message:
fixed midi support
Index: makefile.in
===================================================================
RCS file: /cvsroot/pure-data/pd/src/makefile.in,v
retrieving revision 1.4.4.2.2.13
retrieving revision 1.4.4.2.2.14
diff -C2 -d -r1.4.4.2.2.13 -r1.4.4.2.2.14
*** makefile.in 23 Nov 2006 05:09:17 -0000 1.4.4.2.2.13
--- makefile.in 23 Nov 2006 17:50:53 -0000 1.4.4.2.2.14
***************
*** 31,39 ****
d_delay.c d_resample.c \
x_arithmetic.c x_connective.c x_interface.c x_midi.c x_misc.c \
! x_time.c x_acoustics.c x_net.c x_qlist.c x_gui.c x_list.c d_soundfile.c \
! $(SYSSRC)
# audio drivers and midi drivers
! SRC += @SYSSRC@
OBJ = $(SRCXX:.c=.o) $(SRC:.c=.o)
--- 31,38 ----
d_delay.c d_resample.c \
x_arithmetic.c x_connective.c x_interface.c x_midi.c x_misc.c \
! x_time.c x_acoustics.c x_net.c x_qlist.c x_gui.c x_list.c d_soundfile.c
# audio drivers and midi drivers
! SRC += @AUDIOSRC@ @MIDISRC@
OBJ = $(SRCXX:.c=.o) $(SRC:.c=.o)
Index: configure
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/configure,v
retrieving revision 1.6.2.12
retrieving revision 1.6.2.13
diff -C2 -d -r1.6.2.12 -r1.6.2.13
*** configure 23 Nov 2006 06:47:37 -0000 1.6.2.12
--- configure 23 Nov 2006 17:50:53 -0000 1.6.2.13
***************
*** 310,314 ****
#endif"
! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS oss alsa jack portaudio portmidi PDLIB MORECFLAGS EXT OPT_CFLAGS USE_DEBUG_CFLAGS SYSSRC STRIPFLAG EXTERNTARGET CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE CPP EGREP ALLOCA LIBOBJS LTLIBOBJS'
ac_subst_files=''
--- 310,314 ----
#endif"
! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS oss alsa jack portaudio portmidi PDLIB MORECFLAGS EXT OPT_CFLAGS USE_DEBUG_CFLAGS AUDIOSRC MIDISRC STRIPFLAG EXTERNTARGET CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE CPP EGREP ALLOCA LIBOBJS LTLIBOBJS'
ac_subst_files=''
***************
*** 1316,1319 ****
--- 1316,1320 ----
+
# Check whether --enable-alsa or --disable-alsa was given.
if test "${enable_alsa+set}" = set; then
***************
*** 5072,5078 ****
if test x$portmidi == xyes; then
! echo "$as_me:$LINENO: checking for Pa_Initialize in -lportmidi" >&5
! echo $ECHO_N "checking for Pa_Initialize in -lportmidi... $ECHO_C" >&6
! if test "${ac_cv_lib_portmidi_Pa_Initialize+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
--- 5073,5146 ----
if test x$portmidi == xyes; then
! echo "$as_me:$LINENO: checking for Pt_Started in -lporttime" >&5
! echo $ECHO_N "checking for Pt_Started in -lporttime... $ECHO_C" >&6
! if test "${ac_cv_lib_porttime_Pt_Started___+set}" = set; then
! echo $ECHO_N "(cached) $ECHO_C" >&6
! else
! ac_check_lib_save_LIBS=$LIBS
! LIBS="-lporttime $LIBS"
! cat >conftest.$ac_ext <<_ACEOF
! /* confdefs.h. */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h. */
!
! /* Override any gcc2 internal prototype to avoid an error. */
! #ifdef __cplusplus
! extern "C"
! #endif
! /* We use char because int might match the return type of a gcc2
! builtin and then its argument prototype would still apply. */
! char Pt_Started ();
! int
! main ()
! {
! Pt_Started ();
! ;
! return 0;
! }
! _ACEOF
! rm -f conftest.$ac_objext conftest$ac_exeext
! if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
! (eval $ac_link) 2>conftest.er1
! ac_status=$?
! grep -v '^ *+' conftest.er1 >conftest.err
! rm -f conftest.er1
! cat conftest.err >&5
! echo "$as_me:$LINENO: \$? = $ac_status" >&5
! (exit $ac_status); } &&
! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
! (eval $ac_try) 2>&5
! ac_status=$?
! echo "$as_me:$LINENO: \$? = $ac_status" >&5
! (exit $ac_status); }; } &&
! { ac_try='test -s conftest$ac_exeext'
! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
! (eval $ac_try) 2>&5
! ac_status=$?
! echo "$as_me:$LINENO: \$? = $ac_status" >&5
! (exit $ac_status); }; }; then
! ac_cv_lib_porttime_Pt_Started___=yes
! else
! echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
!
! ac_cv_lib_porttime_Pt_Started___=no
! fi
! rm -f conftest.err conftest.$ac_objext \
! conftest$ac_exeext conftest.$ac_ext
! LIBS=$ac_check_lib_save_LIBS
! fi
! echo "$as_me:$LINENO: result: $ac_cv_lib_porttime_Pt_Started___" >&5
! echo "${ECHO_T}$ac_cv_lib_porttime_Pt_Started___" >&6
! if test $ac_cv_lib_porttime_Pt_Started___ = yes; then
! PDLIB=$PDLIB" -lporttime"
! fi
!
! echo "$as_me:$LINENO: checking for Pm_Initialize in -lportmidi" >&5
! echo $ECHO_N "checking for Pm_Initialize in -lportmidi... $ECHO_C" >&6
! if test "${ac_cv_lib_portmidi_Pm_Initialize+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
***************
*** 5092,5100 ****
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
! char Pa_Initialize ();
int
main ()
{
! Pa_Initialize ();
;
return 0;
--- 5160,5168 ----
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
! char Pm_Initialize ();
int
main ()
{
! Pm_Initialize ();
;
return 0;
***************
*** 5122,5131 ****
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
! ac_cv_lib_portmidi_Pa_Initialize=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
! ac_cv_lib_portmidi_Pa_Initialize=no
fi
rm -f conftest.err conftest.$ac_objext \
--- 5190,5199 ----
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
! ac_cv_lib_portmidi_Pm_Initialize=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
! ac_cv_lib_portmidi_Pm_Initialize=no
fi
rm -f conftest.err conftest.$ac_objext \
***************
*** 5133,5139 ****
LIBS=$ac_check_lib_save_LIBS
fi
! echo "$as_me:$LINENO: result: $ac_cv_lib_portmidi_Pa_Initialize" >&5
! echo "${ECHO_T}$ac_cv_lib_portmidi_Pa_Initialize" >&6
! if test $ac_cv_lib_portmidi_Pa_Initialize = yes; then
PDLIB=$PDLIB" -lportmidi" ; portmidi=yes
else
--- 5201,5207 ----
LIBS=$ac_check_lib_save_LIBS
fi
! echo "$as_me:$LINENO: result: $ac_cv_lib_portmidi_Pm_Initialize" >&5
! echo "${ECHO_T}$ac_cv_lib_portmidi_Pm_Initialize" >&6
! if test $ac_cv_lib_portmidi_Pm_Initialize = yes; then
PDLIB=$PDLIB" -lportmidi" ; portmidi=yes
else
***************
*** 5145,5150 ****
#----------------------------------------------------------------------------------
# section 2: generate Makefile
! SYSSRC=""
if test x$USE_DEBUG_CFLAGS == xyes; then
--- 5213,5220 ----
#----------------------------------------------------------------------------------
# section 2: generate Makefile
+ # audio APIs may accumulate, but there must be only one MIDI API.
! AUDIOSRC=""
! MIDISRC="s_midi_none.c"
if test x$USE_DEBUG_CFLAGS == xyes; then
***************
*** 5173,5182 ****
if test x$oss == xyes; then
! SYSSRC=$SYSSRC" s_audio_oss.c s_midi_oss.c"
MORECFLAGS=$MORECFLAGS" -DUSEAPI_OSS"
fi
if test x$alsa == xyes; then
! SYSSRC=$SYSSRC" s_audio_alsa.c s_audio_alsamm.c s_midi_alsa.c"
MORECFLAGS=$MORECFLAGS" -DPA_USE_ALSA -DUSEAPI_ALSA"
LDFLAGS=$LDFLAGS" -lasound"
--- 5243,5254 ----
if test x$oss == xyes; then
! AUDIOSRC=$AUDIOSRC" s_audio_oss.c"
! MIDISRC="s_midi_oss.c"
MORECFLAGS=$MORECFLAGS" -DUSEAPI_OSS"
fi
if test x$alsa == xyes; then
! # the alsa midi is weird, it needs to have another MIDI module at once, so i put it in "audio" instead.
! AUDIOSRC=$AUDIOSRC" s_audio_alsa.c s_audio_alsamm.c s_midi_alsa.c"
MORECFLAGS=$MORECFLAGS" -DPA_USE_ALSA -DUSEAPI_ALSA"
LDFLAGS=$LDFLAGS" -lasound"
***************
*** 5184,5188 ****
if test x$jack == xyes; then
! SYSSRC=$SYSSRC" s_audio_jack.c"
if test x$jack != xno; then
if test `uname -s` = Darwin; then
--- 5256,5260 ----
if test x$jack == xyes; then
! AUDIOSRC=$AUDIOSRC" s_audio_jack.c"
if test x$jack != xno; then
if test `uname -s` = Darwin; then
***************
*** 5198,5202 ****
if test x$portaudio == xyes; then
MORECFLAGS=$MORECFLAGS" -DUSEAPI_PORTAUDIO -DPA19"
! SYSSRC=$SYSSRC" s_audio_portaudio.c"
if test `uname -s` = Darwin; then
LDFLAGS=$LDFLAGS" -framework CoreAudio -framework AudioUnit -framework AudioToolbox -framework Carbon"
--- 5270,5274 ----
if test x$portaudio == xyes; then
MORECFLAGS=$MORECFLAGS" -DUSEAPI_PORTAUDIO -DPA19"
! AUDIOSRC=$AUDIOSRC" s_audio_portaudio.c"
if test `uname -s` = Darwin; then
LDFLAGS=$LDFLAGS" -framework CoreAudio -framework AudioUnit -framework AudioToolbox -framework Carbon"
***************
*** 5205,5209 ****
if test x$portmidi == xyes; then
! SYSSRC=$SYSSRC" s_midi_pm.c"
if test `uname -s` = Darwin; then
LDFLAGS=$LDFLAGS" -framework CoreMIDI"
--- 5277,5281 ----
if test x$portmidi == xyes; then
! MIDISRC="s_midi_pm.c"
if test `uname -s` = Darwin; then
LDFLAGS=$LDFLAGS" -framework CoreMIDI"
***************
*** 5857,5861 ****
s,@OPT_CFLAGS@,$OPT_CFLAGS,;t t
s,@USE_DEBUG_CFLAGS@,$USE_DEBUG_CFLAGS,;t t
! s,@SYSSRC@,$SYSSRC,;t t
s,@STRIPFLAG@,$STRIPFLAG,;t t
s,@EXTERNTARGET@,$EXTERNTARGET,;t t
--- 5929,5934 ----
s,@OPT_CFLAGS@,$OPT_CFLAGS,;t t
s,@USE_DEBUG_CFLAGS@,$USE_DEBUG_CFLAGS,;t t
! s,@AUDIOSRC@,$AUDIOSRC,;t t
! s,@MIDISRC@,$MIDISRC,;t t
s,@STRIPFLAG@,$STRIPFLAG,;t t
s,@EXTERNTARGET@,$EXTERNTARGET,;t t
Index: configure.in
===================================================================
RCS file: /cvsroot/pure-data/pd/src/configure.in,v
retrieving revision 1.5.4.5.2.14
retrieving revision 1.5.4.5.2.15
diff -C2 -d -r1.5.4.5.2.14 -r1.5.4.5.2.15
*** configure.in 23 Nov 2006 06:47:37 -0000 1.5.4.5.2.14
--- configure.in 23 Nov 2006 17:50:53 -0000 1.5.4.5.2.15
***************
*** 19,23 ****
AC_SUBST(OPT_CFLAGS)
AC_SUBST(USE_DEBUG_CFLAGS, no)
! AC_SUBST(SYSSRC)
AC_SUBST(STRIPFLAG)
AC_SUBST(EXTERNTARGET)
--- 19,24 ----
AC_SUBST(OPT_CFLAGS)
AC_SUBST(USE_DEBUG_CFLAGS, no)
! AC_SUBST(AUDIOSRC)
! AC_SUBST(MIDISRC)
AC_SUBST(STRIPFLAG)
AC_SUBST(EXTERNTARGET)
***************
*** 87,97 ****
if test x$portmidi == xyes; then
! AC_CHECK_LIB(portmidi,Pa_Initialize,PDLIB=$PDLIB" -lportmidi" ; portmidi=yes,portmidi=no)
fi
#----------------------------------------------------------------------------------
# section 2: generate Makefile
! SYSSRC=""
if test x$USE_DEBUG_CFLAGS == xyes; then
--- 88,101 ----
if test x$portmidi == xyes; then
! AC_CHECK_LIB(porttime,Pt_Started ,PDLIB=$PDLIB" -lporttime")
! AC_CHECK_LIB(portmidi,Pm_Initialize,PDLIB=$PDLIB" -lportmidi" ; portmidi=yes,portmidi=no)
fi
#----------------------------------------------------------------------------------
# section 2: generate Makefile
+ # audio APIs may accumulate, but there must be only one MIDI API.
! AUDIOSRC=""
! MIDISRC="s_midi_none.c"
if test x$USE_DEBUG_CFLAGS == xyes; then
***************
*** 120,129 ****
if test x$oss == xyes; then
! SYSSRC=$SYSSRC" s_audio_oss.c s_midi_oss.c"
MORECFLAGS=$MORECFLAGS" -DUSEAPI_OSS"
fi
if test x$alsa == xyes; then
! SYSSRC=$SYSSRC" s_audio_alsa.c s_audio_alsamm.c s_midi_alsa.c"
MORECFLAGS=$MORECFLAGS" -DPA_USE_ALSA -DUSEAPI_ALSA"
LDFLAGS=$LDFLAGS" -lasound"
--- 124,135 ----
if test x$oss == xyes; then
! AUDIOSRC=$AUDIOSRC" s_audio_oss.c"
! MIDISRC="s_midi_oss.c"
MORECFLAGS=$MORECFLAGS" -DUSEAPI_OSS"
fi
if test x$alsa == xyes; then
! # the alsa midi is weird, it needs to have another MIDI module at once, so i put it in "audio" instead.
! AUDIOSRC=$AUDIOSRC" s_audio_alsa.c s_audio_alsamm.c s_midi_alsa.c"
MORECFLAGS=$MORECFLAGS" -DPA_USE_ALSA -DUSEAPI_ALSA"
LDFLAGS=$LDFLAGS" -lasound"
***************
*** 131,135 ****
if test x$jack == xyes; then
! SYSSRC=$SYSSRC" s_audio_jack.c"
if test x$jack != xno; then
if test `uname -s` = Darwin; then
--- 137,141 ----
if test x$jack == xyes; then
! AUDIOSRC=$AUDIOSRC" s_audio_jack.c"
if test x$jack != xno; then
if test `uname -s` = Darwin; then
***************
*** 145,149 ****
if test x$portaudio == xyes; then
MORECFLAGS=$MORECFLAGS" -DUSEAPI_PORTAUDIO -DPA19"
! SYSSRC=$SYSSRC" s_audio_portaudio.c"
if test `uname -s` = Darwin; then
LDFLAGS=$LDFLAGS" -framework CoreAudio -framework AudioUnit -framework AudioToolbox -framework Carbon"
--- 151,155 ----
if test x$portaudio == xyes; then
MORECFLAGS=$MORECFLAGS" -DUSEAPI_PORTAUDIO -DPA19"
! AUDIOSRC=$AUDIOSRC" s_audio_portaudio.c"
if test `uname -s` = Darwin; then
LDFLAGS=$LDFLAGS" -framework CoreAudio -framework AudioUnit -framework AudioToolbox -framework Carbon"
***************
*** 152,156 ****
if test x$portmidi == xyes; then
! SYSSRC=$SYSSRC" s_midi_pm.c"
if test `uname -s` = Darwin; then
LDFLAGS=$LDFLAGS" -framework CoreMIDI"
--- 158,162 ----
if test x$portmidi == xyes; then
! MIDISRC="s_midi_pm.c"
if test `uname -s` = Darwin; then
LDFLAGS=$LDFLAGS" -framework CoreMIDI"
