Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1:/tmp/cvs-serv14590/pd/src
Modified Files: configure configure.in makefile s_audio_oss.c s_loader.c s_stuff.h Log Message: Patches to integrate FreeBSD
Index: configure =================================================================== RCS file: /cvsroot/pure-data/pd/src/configure,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -C2 -d -r1.1.1.4 -r1.2 *** configure 9 May 2003 16:03:40 -0000 1.1.1.4 --- configure 10 Nov 2003 16:13:10 -0000 1.2 *************** *** 4076,4080 ****
! if test "${ac_cv_header_tcl_h+set}" = set; then echo "$as_me:$LINENO: checking for tcl.h" >&5 echo $ECHO_N "checking for tcl.h... $ECHO_C" >&6 --- 4076,4086 ----
! #AC_CHECK_HEADER(tcl.h,, echo "no tcl/tk header found" || exit 1) ! [...1352 lines suppressed...] + LDFLAGS="-Wl,-export-dynamic -L/usr/local/lib -L/usr/local/lib/pth -lpthread" + LIBS="$LIBS -L/usr/local/lib" + EXT=pd_linux + MORECFLAGS="-DDL_OPEN -DUSEAPI_OSS" + CFLAGS="$CFLAGS -I/usr/local/include" + SYSSRC="s_midi_oss.c s_audio_oss.c " + STRIPFLAG=-s + GUINAME="pd-gui" + GUIFLAGS="$GUIFLAGS -I/usr/X11R6/include -I/usr/local/include" + if test $USE_OPT_CFLAGS == "YES"; + then + OPT_CFLAGS="-O6 -funroll-loops -fomit-frame-pointer" + else + OPT_CFLAGS="-g" + fi + OSNUMBER=0 + fi +
Index: configure.in =================================================================== RCS file: /cvsroot/pure-data/pd/src/configure.in,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -C2 -d -r1.1.1.4 -r1.2 *** configure.in 9 May 2003 16:03:40 -0000 1.1.1.4 --- configure.in 10 Nov 2003 16:13:11 -0000 1.2 *************** *** 81,85 **** dnl look for tcl 8.x... do I really have to go through all this!?
! AC_CHECK_HEADER(tcl.h,, echo "no tcl/tk header found" || exit 1)
AC_CHECK_LIB(tcl8.7, main,, --- 81,165 ---- dnl look for tcl 8.x... do I really have to go through all this!?
! #AC_CHECK_HEADER(tcl.h,, echo "no tcl/tk header found" || exit 1) ! ! ! foundit=no ! if test $foundit == "no"; ! then ! AC_CHECK_HEADER(tcl.h,foundit=yes,) ! fi ! ! if test $foundit == "no"; ! then ! AC_CHECK_HEADER(tcl8.7/tcl.h, ! GUIFLAGS="$GUIFLAGS -I/usr/include/tcl8.7";foundit=yes,) ! fi ! if test $foundit == "no"; ! then ! AC_CHECK_HEADER(/usr/local/include/tcl8.7/tcl.h, ! GUIFLAGS="$GUIFLAGS -I/usr/local/include/tcl8.7 -I/usr/local/include/tk8.7";LIBS="$LIBS -ltcl87 -ltk87";foundit=yes,) ! fi ! if test $foundit == "no"; ! then ! AC_CHECK_HEADER(tcl8.6/tcl.h, ! GUIFLAGS="$GUIFLAGS -I/usr/include/tcl8.6";foundit=yes,) ! fi ! if test $foundit == "no"; ! then ! AC_CHECK_HEADER(/usr/local/include/tcl8.6/tcl.h, ! GUIFLAGS="$GUIFLAGS -I/usr/local/include/tcl8.6 -I/usr/local/include/tk8.6";LIBS="$LIBS -ltcl86 -ltk86";foundit=yes,) ! fi ! ! if test $foundit == "no"; ! then ! AC_CHECK_HEADER(tcl8.5/tcl.h, ! GUIFLAGS="$GUIFLAGS -I/usr/include/tcl8.5";foundit=yes,) ! fi ! if test $foundit == "no"; ! then ! AC_CHECK_HEADER(/usr/local/include/tcl8.5/tcl.h, ! GUIFLAGS="$GUIFLAGS -I/usr/local/include/tcl8.5 -I/usr/local/include/tk8.5";LIBS="$LIBS -ltcl85 -ltk85";foundit=yes,) ! fi ! ! if test $foundit == "no"; ! then ! AC_CHECK_HEADER(tcl8.4/tcl.h, ! GUIFLAGS="$GUIFLAGS -I/usr/include/tcl8.4";foundit=yes,) ! fi ! if test $foundit == "no"; ! then ! AC_CHECK_HEADER(/usr/local/include/tcl8.4/tcl.h, ! GUIFLAGS="$GUIFLAGS -I/usr/local/include/tcl8.4 -I/usr/local/include/tk8.4";LIBS="$LIBS -ltcl84 -ltk84";foundit=yes,) ! fi ! ! if test $foundit == "no"; ! then ! AC_CHECK_HEADER(tcl8.3/tcl.h, ! GUIFLAGS="$GUIFLAGS -I/usr/include/tcl8.3";foundit=yes,) ! fi ! if test $foundit == "no"; ! then ! AC_CHECK_HEADER(/usr/local/include/tcl8.3/tcl.h, ! GUIFLAGS="$GUIFLAGS -I/usr/local/include/tcl8.3 -I/usr/local/include/tk8.3";LIBS="$LIBS -ltcl83 -ltk83";foundit=yes,) ! fi ! ! if test $foundit == "no"; ! then ! AC_CHECK_HEADER(tcl8.2/tcl.h, ! GUIFLAGS="$GUIFLAGS -I/usr/include/tcl8.2";foundit=yes,) ! fi ! if test $foundit == "no"; ! then ! AC_CHECK_HEADER(/usr/local/include/tcl8.2/tcl.h, ! GUIFLAGS="$GUIFLAGS -I/usr/local/include/tcl8.2 -I/usr/local/include/tk8.2";LIBS="$LIBS -ltcl82 -ltk82";foundit=yes,) ! fi ! ! if test $foundit == "no"; ! then ! echo no tcl header found ! exit -1 ! fi ! !
AC_CHECK_LIB(tcl8.7, main,, *************** *** 136,139 **** --- 216,241 ---- OSNUMBER=0 fi + + dnl FreeBSD hack + if test `uname -s` = FreeBSD; + then + LDFLAGS="-Wl,-export-dynamic -L/usr/local/lib -L/usr/local/lib/pth -lpthread" + LIBS="$LIBS -L/usr/local/lib" + EXT=pd_linux + MORECFLAGS="-DDL_OPEN -DUSEAPI_OSS" + CFLAGS="$CFLAGS -I/usr/local/include" + SYSSRC="s_midi_oss.c s_audio_oss.c " + STRIPFLAG=-s + GUINAME="pd-gui" + GUIFLAGS="$GUIFLAGS -I/usr/X11R6/include -I/usr/local/include" + if test $USE_OPT_CFLAGS == "YES"; + then + OPT_CFLAGS="-O6 -funroll-loops -fomit-frame-pointer" + else + OPT_CFLAGS="-g" + fi + OSNUMBER=0 + fi +
dnl **** note -- SGI/IRIX code is broken here!!! ***
Index: makefile =================================================================== RCS file: /cvsroot/pure-data/pd/src/makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** makefile 23 Sep 2003 00:18:14 -0000 1.2 --- makefile 10 Nov 2003 16:13:11 -0000 1.3 *************** *** 1,23 **** ! # Makefile for PD on MSW
! all: pd gui ..\bin\pd.tk ..\bin\pdsend.exe ..\bin\pdreceive.exe
! VC = "C:\Program Files\Microsoft Visual Studio\VC98" ! #VC="\Program Files\DevStudio\Vc" ! INCLUDE = -I.\ -I..\Tcl\include -I$(VC)\include
! LDIR = $(VC)\lib
! LIB = /NODEFAULTLIB:libc /NODEFAULTLIB:oldnames /NODEFAULTLIB:kernel \ ! /NODEFAULTLIB:uuid \ ! $(LDIR)\libc.lib $(LDIR)\oldnames.lib $(LDIR)\kernel32.lib \ ! $(LDIR)\wsock32.lib $(LDIR)\winmm.lib ..\bin\pthreadVC.lib
! GLIB = $(LIB) ..\bin\tcl83.lib ..\bin\tk83.lib ! CFLAGS = /nologo /W3 /DMSW /DNT /DPD /DPD_INTERNAL /DWIN32 /DWINDOWS /Ox \ ! -DPA_LITTLE_ENDIAN -DUSEAPI_MMIO -DUSEAPI_PORTAUDIO ! LFLAGS = /nologo
! SYSSRC = s_audio_pa.c s_audio_mmio.c s_midi_pm.c
SRC = g_canvas.c g_graph.c g_text.c g_rtext.c g_array.c g_template.c g_io.c \ --- 1,68 ---- ! VPATH = ../obj:./ ! OBJ_DIR = ../obj ! BIN_DIR = ../bin ! PDEXEC = $(BIN_DIR)/pd ! EXT= pd_linux ! GUINAME= pd-gui
! INSTALL_PREFIX = /usr/local ! GFLAGS = -DINSTALL_PREFIX="$(INSTALL_PREFIX)"
! # there should be a better way to do this... ! prefix = /usr/local ! MANDIR = ${prefix}/man
! # ALSA compilation
! SOUND_ALSA =
! DEFINES = ! MORECFLAGS = -DDL_OPEN -DUSEAPI_OSS
! INCLUDE = -I. ! GINCLUDE = $(INCLUDE) -I/usr/local/include/tcl8.4 -I/usr/local/include/tk8.4 -I/usr/X11R6/include -I/usr/local/include ! GLIB = -lX11 -L/usr/X11R6/lib -ltcl84 -ltk84 -L/usr/local/lib ! ! LDFLAGS = -Wl,-export-dynamic -L/usr/local/lib -L/usr/local/lib/pth -lpthread ! LIB = -lm ! ! #select either the DBG and OPT compiler flags below: ! OPT_CFLAGS = -O6 -funroll-loops -fomit-frame-pointer ! WARN_CFLAGS = -Wall -W -Wstrict-prototypes -Werror \ ! -Wno-unused -Wno-parentheses -Wno-switch ! ARCH_CFLAGS = -DPD -DUNIX ! ! CFLAGS = $(ARCH_CFLAGS) $(WARN_CFLAGS) $(OPT_CFLAGS) $(DEFINES) $(MORECFLAGS) ! ! # you might want ALSA linked in non-shared because ! # many Linux machines don't have the ALSA shared library. To link ! # ALSA non-shared, move the # sign below. ! ! ifeq (${SOUND_ALSA},yes) ! CFLAGS += -DPA_USE_ALSA -DUSEAPI_ALSA ! SYSSRC += s_audio_alsa.c \ ! ../portaudio/pa_linux_alsa/callback_thread.c \ ! ../portaudio/pa_linux_alsa/pa_linux_alsa.c \ ! ../portaudio/pa_linux_alsa/blocking_calls.c ! endif ! ! # Which system ! ! SYSTEM = $(shell uname -m) ! ! ifeq (${SYSTEM},alpha) ! #LIB += -lffm -lm ! CFLAGS += -mieee -mcpu=ev56 ! endif ! ! # Which compiler ! ! ifeq (${CC},ccc) ! CFLAGS += -g3 -D__COMPAQC__ -arch host ! endif ! ! # the sources ! ! SYSSRC += s_midi_oss.c s_audio_oss.c
SRC = g_canvas.c g_graph.c g_text.c g_rtext.c g_array.c g_template.c g_io.c \ *************** *** 36,131 **** $(SYSSRC)
- PADIR = ..\portaudio - INCPA = -I$(PADIR) -I$(PADIR)\pa_common -I$(PADIR)\pablio -I..\lib\asio - SRCPA = $(PADIR)/pa_common/pa_lib.c $(PADIR)/pa_common/pa_trace.c \ - $(PADIR)/pablio/pablio_pd.c $(PADIR)/pablio/ringbuffer_pd.c - SRCASIO = $(PADIR)/pa_asio/pa_asio.cpp
! ASIOLIB = $(LDIR)\user32.lib $(LDIR)\gdi32.lib $(LDIR)\winspool.lib $(LDIR)\comdlg32.lib \ ! $(LDIR)\advapi32.lib $(LDIR)\shell32.lib $(LDIR)\ole32.lib $(LDIR)\oleaut32.lib $(LDIR)\uuid.lib \ ! $(LDIR)\odbc32.lib $(LDIR)\odbccp32.lib ..\lib\asio\asiolib.lib
! PAOBJ = pa_lib.obj pa_trace.obj pablio_pd.obj ringbuffer_pd.obj pa_asio.obj
! PMDIR = ..\portmidi ! INCPM = -I$(PMDIR)\pm_common -I$(PMDIR)\pm_win -I$(PMDIR)\porttime ! SRCPM = \ ! $(PMDIR)/pm_common/portmidi.c \ ! $(PMDIR)/pm_common/pmutil.c \ ! $(PMDIR)/pm_win/pmwin.c \ ! $(PMDIR)/pm_win/pmwinmm.c \ ! $(PMDIR)/porttime/porttime.c \ ! $(PMDIR)/porttime/ptwinmm.c \
! PMOBJ = portmidi.obj pmutil.obj pmwin.obj pmwinmm.obj porttime.obj ptwinmm.obj
! OBJC = $(SRC:.c=.obj) $(PAOBJ) $(PMOBJ)
! GSRC = t_main.c t_tkcmd.c
! GOBJ = $(GSRC:.c=.obj) ! .PHONY: pd gui
! ALLCF = $(CFLAGS) $(INCLUDE) $(INCASIO) $(INCPA) $(INCPM) /D_WINDOWS /DPA_NO_DS
! .c.obj: ! cl /c $(ALLCF) /Tc$*.c
! pd: ..\bin\pd.exe
! gui: ..\bin\pdtcl.dll
! ..\bin\pd.exe: s_entry.obj ..\bin\pd.lib ! link $(LFLAGS) /out:..\bin\pd.exe /INCREMENTAL:NO s_entry.obj \ ! ..\bin\pd.lib $(LIB) $(ASIOLIB)
! ..\bin\pd.dll ..\bin\pd.lib: $(OBJC) $(OBJASIO) ! link $(LFLAGS) /dll /export:sys_main /out:..\bin\pd.dll $(OBJC) \ ! $(OBJASIO) $(LIB) $(ASIOLIB)
! ..\bin\pdtcl.dll: t_tkcmd.obj ! link $(LFLAGS) /dll /export:Pdtcl_Init /out:..\bin\pdtcl.dll \ ! t_tkcmd.obj $(GLIB)
! ..\bin\pd.tk: u_main.tk; copy u_main.tk ..\bin\pd.tk
- ..\bin\pdsend.exe: u_pdsend.obj - link $(LFLAGS) /out:..\bin\pdsend.exe /INCREMENTAL:NO u_pdsend.obj \ - $(LIB)
- ..\bin\pdreceive.exe: u_pdreceive.obj - link $(LFLAGS) /out:..\bin\pdreceive.exe /INCREMENTAL:NO u_pdreceive.obj \ - $(LIB)
- # explicit rules to compile portaudio and portmidi sources: - pa_lib.obj: $(PADIR)\pa_common\pa_lib.c - cl /c $(ALLCF) $(PADIR)\pa_common\pa_lib.c - pa_trace.obj: $(PADIR)\pa_common\pa_trace.c - cl /c $(ALLCF) $(PADIR)\pa_common\pa_trace.c - pablio_pd.obj: $(PADIR)\pablio\pablio_pd.c - cl /c $(ALLCF) $(PADIR)\pablio\pablio_pd.c - ringbuffer_pd.obj: $(PADIR)\pablio\ringbuffer_pd.c - cl /c $(ALLCF) $(PADIR)\pablio\ringbuffer_pd.c
- pa_asio.obj: $(PADIR)\pa_asio\pa_asio.cpp - cl /c $(ALLCF) $(PADIR)\pa_asio\pa_asio.cpp
- portmidi.obj: $(PMDIR)\pm_common\portmidi.c - cl /c $(ALLCF) $(PMDIR)\pm_common\portmidi.c - pmutil.obj: $(PMDIR)\pm_common\pmutil.c - cl /c $(ALLCF) $(PMDIR)\pm_common\pmutil.c - pmwin.obj: $(PMDIR)\pm_win\pmwin.c - cl /c $(ALLCF) $(PMDIR)\pm_win\pmwin.c - pmwinmm.obj: $(PMDIR)\pm_win\pmwinmm.c - cl /c $(ALLCF) $(PMDIR)\pm_win\pmwinmm.c - porttime.obj: $(PMDIR)\porttime\porttime.c - cl /c $(ALLCF) $(PMDIR)\porttime\porttime.c - ptwinmm.obj: $(PMDIR)\porttime\ptwinmm.c - cl /c $(ALLCF) $(PMDIR)\porttime\ptwinmm.c
- # the following should also clean up "bin" but it doesn't because "bin" holds - # precious stuff from elsewhere. - clean: - del *.obj
--- 81,222 ---- $(SYSSRC)
! OBJ = $(SRC:.c=.o) ! EXTERNS = ../extra/*/*.$(EXT)
+ GSRC = t_main.c t_tkcmd.c
! GOBJ = $(GSRC:.c=.o)
! # ! # ------------------ targets ------------------------------------ ! #
! .PHONY: pd gui externs all
! all: $(PDEXEC) $(BIN_DIR)/pd-watchdog $(BIN_DIR)/$(GUINAME) $(BIN_DIR)/pdsend \ ! $(BIN_DIR)/pdreceive $(BIN_DIR)/pd.tk externs
! bin: $(PDEXEC) $(BIN_DIR)/pd-watchdog $(BIN_DIR)/$(GUINAME) $(BIN_DIR)/pdsend \ ! $(BIN_DIR)/pdreceive $(BIN_DIR)/pd.tk
! $(OBJ) : %.o : %.c ! $(CC) $(CFLAGS) $(GFLAGS) $(INCLUDE) -c -o $(OBJ_DIR)/$*.o $*.c
! $(GOBJ) : %.o : %.c ! $(CC) $(CFLAGS) $(GFLAGS) $(GINCLUDE) -c -o $(OBJ_DIR)/$*.o $*.c
! pd: $(PDEXEC)
! gui: $(BIN_DIR)/$(GUINAME)
! pd-watchdog: $(BIN_DIR)/pd-watchdog
! $(BIN_DIR)/pd-watchdog: s_watchdog.c ! cc -O2 $(STRIPFLAG) -o $(BIN_DIR)/pd-watchdog s_watchdog.c
! $(BIN_DIR)/pdsend: u_pdsend.c ! cc $(CFLAGS) $(STRIPFLAG) -o $(BIN_DIR)/pdsend u_pdsend.c
! $(BIN_DIR)/pdreceive: u_pdreceive.c ! cc $(CFLAGS) $(STRIPFLAG) -o $(BIN_DIR)/pdreceive u_pdreceive.c
! $(PDEXEC): $(OBJ) ! cd ../obj; $(CC) $(LDFLAGS) $(DBG_CFLAGS) -o $(PDEXEC) $(OBJ) \ ! $(LIB) ! ! $(BIN_DIR)/pd-gui: $(GOBJ) $(GSRC) ! cd ../obj; $(CC) $(INCLUDE) -o $(BIN_DIR)/$(GUINAME) $(GOBJ) \ ! $(GLIB) ! ! $(BIN_DIR)/pd.tk: u_main.tk ! echo set pd_nt 0 > $(BIN_DIR)/pd.tk ! grep -v "set pd_nt" < u_main.tk >> $(BIN_DIR)/pd.tk ! ! #this is for Max OSX only... ! $(BIN_DIR)/pdtcl: $(GOBJ) $(GSRC) ! cd ../obj; libtool -dynamic -o $(BIN_DIR)/pdtcl $(GOBJ) \ ! /Library/Frameworks/Tk.framework/Versions/Current/Tk \ ! /Library/Frameworks/Tcl.framework/Versions/Current/Tcl \ ! /usr/lib/libSystem.B.dylib ! ! externs: ! cd ../extra/bonk~;make ! cd ../extra/choice;make ! cd ../extra/expr~;make ! cd ../extra/fiddle~;make ! cd ../extra/loop~;make ! cd ../extra/lrshift~;make ! cd ../extra/pique;make ! ! INSTDIR = $(DESTDIR)/$(INSTALL_PREFIX) ! MANINSTDIR = $(DESTDIR)/$(MANDIR) ! ! install: all ! install -d $(INSTDIR)/lib/pd/bin ! install $(BIN_DIR)/$(GUINAME) $(INSTDIR)/lib/pd/bin/$(GUINAME) ! install $(BIN_DIR)/pd-watchdog $(INSTDIR)/lib/pd/bin/pd-watchdog ! install -m644 $(BIN_DIR)/pd.tk $(INSTDIR)/lib/pd/bin/pd.tk ! install -d $(INSTDIR)/bin ! install -m755 $(PDEXEC) $(INSTDIR)/bin/pd ! install -m 755 $(BIN_DIR)/pdsend $(INSTDIR)/bin/pdsend ! install -m 755 $(BIN_DIR)/pdreceive $(INSTDIR)/bin/pdreceive ! install -d $(INSTDIR)/lib/pd/extra ! install -d $(INSTDIR)/lib/pd/externs ! install -m 644 $(EXTERNS) $(INSTDIR)/lib/pd/extra ! cp -r ../doc $(INSTDIR)/lib/pd/ ! install -d $(INSTDIR)/include ! install -m644 m_pd.h $(INSTDIR)/include/m_pd.h ! install -d $(MANINSTDIR)/man1 ! gzip < ../man/pd.1 > $(MANINSTDIR)/man1/pd.1.gz ! chmod 644 $(MANINSTDIR)/man1/pd.1.gz ! gzip < ../man/pdsend.1 > $(MANINSTDIR)/man1/pdsend.1.gz ! chmod 644 $(MANINSTDIR)/man1/pdsend.1.gz ! gzip < ../man/pdreceive.1 > $(MANINSTDIR)/man1/pdreceive.1.gz ! chmod 644 $(MANINSTDIR)/man1/pdreceive.1.gz ! ! local-clean: ! -rm -f ../obj/* $(BIN_DIR)/pd $(BIN_DIR)/$(GUINAME) $(BIN_DIR)/pdsend \ ! $(BIN_DIR)/pdreceive $(BIN_DIR)/pd-watchdog m_stamp.c ! -rm -f *~ ! -rm -f $(BIN_DIR)/pdsend $(BIN_DIR)/pdreceive ! -(cd ../doc/6.externs; rm -f *.pd_linux) ! -rm -f makefile.dependencies ! touch makefile.dependencies ! chmod 666 makefile.dependencies ! ! extra-clean: ! -rm -f `find ../extra/ -name "*.pd_*"` ! -rm -f tags ! ! clean: extra-clean local-clean ! ! distclean: clean ! -rm config.cache config.log config.status makefile tags ! echo all: > makefile ! echo -e "\t./configure" >> makefile ! echo -e "\tmake" >> makefile ! ! tags: $(SRC) $(GSRC); ctags *.[ch] ! ! depend: ! $(CC) $(INCLUDE) $(CFLAGS) -M $(SRC) > makefile.dependencies ! ! uninstall: ! -rm -r $(INSTDIR)/lib/pd ! -rm $(INSTDIR)/bin/pd ! -rm $(INSTDIR)/bin/pdsend ! -rm $(INSTDIR)/bin/pdreceive ! -rm $(INSTDIR)/include/m_pd.h ! -rm $(MANINSTDIR)/man/man1/pd.1.gz ! -rm $(MANINSTDIR)/man/man1/pdsend.1.gz ! -rm $(MANINSTDIR)/man/man1/pdreceive.1.gz ! ! include makefile.dependencies
Index: s_audio_oss.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_audio_oss.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** s_audio_oss.c 23 Sep 2003 00:18:14 -0000 1.2 --- s_audio_oss.c 10 Nov 2003 16:13:11 -0000 1.3 *************** *** 6,10 **** --- 6,21 ---- /* this file inputs and outputs audio using the OSS API available on linux. */
+ #ifdef __linux__ #include <linux/soundcard.h> + #endif + + #ifdef __FreeBSD__ + #include <sys/soundcard.h> + #include <sys/mman.h> + #endif + + + +
#include "m_pd.h"
Index: s_loader.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_loader.c,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -C2 -d -r1.1.1.2 -r1.2 *** s_loader.c 9 May 2003 16:03:44 -0000 1.1.1.2 --- s_loader.c 10 Nov 2003 16:13:11 -0000 1.2 *************** *** 26,30 **** static char sys_dllextent[] = #ifdef __FreeBSD__ ! ".pd_freebsd"; #endif #ifdef IRIX --- 26,30 ---- static char sys_dllextent[] = #ifdef __FreeBSD__ ! ".pd_linux"; #endif #ifdef IRIX
Index: s_stuff.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_stuff.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** s_stuff.h 23 Sep 2003 00:18:14 -0000 1.2 --- s_stuff.h 10 Nov 2003 16:13:11 -0000 1.3 *************** *** 136,139 **** --- 136,143 ---- #define API_DEFSTRING "OSS" #endif + #ifdef __FreeBSD__ + #define API_DEFAULT API_OSS + #define API_DEFSTRING "OSS" + #endif #ifdef MSW #define API_DEFAULT API_MMIO