[PD-cvs] pd/src makefile,1.1.1.1.14.3,1.1.1.1.14.4 s_print.c,1.1.1.1.16.1,1.1.1.1.16.2
xovo at users.sourceforge.net
xovo at users.sourceforge.net
Wed Oct 15 09:55:12 CEST 2003
Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1:/tmp/cvs-serv3593
Modified Files:
Tag: devel_0_37
makefile s_print.c
Log Message:
corrections for gcc ansi C
Index: makefile
===================================================================
RCS file: /cvsroot/pure-data/pd/src/makefile,v
retrieving revision 1.1.1.1.14.3
retrieving revision 1.1.1.1.14.4
diff -C2 -d -r1.1.1.1.14.3 -r1.1.1.1.14.4
*** makefile 6 Oct 2003 16:40:58 -0000 1.1.1.1.14.3
--- makefile 15 Oct 2003 07:55:10 -0000 1.1.1.1.14.4
***************
*** 1,3 ****
! all:
! ./configure
! make
--- 1,232 ----
! VPATH = ../obj:./
! OBJ_DIR = ../obj
! BIN_DIR = ../bin
! PDEXEC = $(BIN_DIR)/pd
! EXT= pd_linux
! GUINAME= pd-gui
!
! prefix = /usr/local
! GFLAGS = -DINSTALL_PREFIX=\"$(prefix)\"
!
! MANDIR = ${prefix}/man
!
! MORECFLAGS = -DDL_OPEN -DPA_USE_OSS -DPA_LITTLE_ENDIAN -DUSEAPI_OSS -I../portaudio/pa_common -I../portaudio/pablio -I../portaudio/portmidi-macosx -DPA_USE_ALSA -DUSEAPI_ALSA -DUSEAPI_JACK
!
! INCLUDE = -I.
! GINCLUDE = $(INCLUDE) -I/usr/include/tcl8.3
! GLIB = -ltk8.3 -ltcl8.3 -lX11 -L/usr/X11R6/lib -lrt -ljack -ljack
!
! LDFLAGS = -Wl,-export-dynamic -lasound -lrt -ljack
! LIB = -ldl -lm -lpthread -lasound
!
! OPT_CFLAGS = -O6 -funroll-loops -fomit-frame-pointer
! WARN_CFLAGS = -Wall -W -Wstrict-prototypes \
! -Wno-unused -Wno-parentheses -Wno-switch
! ARCH_CFLAGS = -DPD -DUNIX
!
! CFLAGS = $(ARCH_CFLAGS) $(WARN_CFLAGS) $(OPT_CFLAGS) $(MORECFLAGS)
!
! # the sources
!
! SYSSRC += s_midi_oss.c s_audio_oss.c s_audio_alsa.c s_audio_jack.c
!
! SRC = g_canvas.c g_graph.c g_text.c g_rtext.c g_array.c g_template.c g_io.c \
! g_scalar.c g_traversal.c g_guiconnect.c g_readwrite.c g_editor.c \
! g_all_guis.c g_bang.c g_hdial.c g_hslider.c g_mycanvas.c g_numbox.c \
! g_toggle.c g_vdial.c g_vslider.c g_vumeter.c \
! m_pd.c m_class.c m_obj.c m_atom.c m_memory.c m_binbuf.c \
! m_conf.c m_glob.c m_sched.c \
! s_main.c s_inter.c s_file.c s_print.c \
! s_loader.c s_path.c s_entry.c s_audio.c s_midi.c \
! d_ugen.c d_ctl.c d_arithmetic.c d_osc.c d_filter.c d_dac.c d_misc.c \
! d_math.c d_fft.c d_mayer_fft.c d_fftroutine.c d_array.c d_global.c \
! 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 d_soundfile.c \
! $(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)/$(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 *~
! -(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 -rf config.cache config.log config.status makefile tags \
! autom4te-*.cache
! 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)/man1/pd.1.gz
! -rm $(MANINSTDIR)/man1/pdsend.1.gz
! -rm $(MANINSTDIR)/man1/pdreceive.1.gz
!
! include makefile.dependencies
!
!
! #
! # added by Hans-Christoph Steiner <hans at eds.org>
! # to generate MacOS X packages
! #
!
! PD_MAJOR_VERSION = $(shell grep PD_MAJOR_VERSION m_pd.h | cut -d ' ' -f 3)
! PD_MINOR_VERSION = $(shell grep PD_MINOR_VERSION m_pd.h | cut -d ' ' -f 3)
! PD_VERSION = $(PD_MAJOR_VERSION).$(PD_MINOR_VERSION)
!
! PACKAGE_NAME = pd-$(PD_VERSION)-test10
!
! DMG_NAME = $(PACKAGE_NAME)
!
! darwin_pkg_clean:
! -sudo rm -Rf ../installroot ../$(PACKAGE_NAME)*
! -rm -f ../$(PACKAGE_NAME)*.info *~ ../1 License.html
!
!
! darwin_pkg_license:
! # generate HTML version of License
! echo "<HTML><BODY><FONT SIZE="-1">" > License.html
! cat ../LICENSE.txt | sed -e 's/^$$/\<P\>/g' >> License.html
! echo "</FONT></BODY></HTML>" >> License.html
!
!
! darwin_pkg: DESTDIR = ../installroot
! darwin_pkg: INSTALL_PREFIX = /usr/local
! darwin_pkg: MANDIR = /usr/local
! darwin_pkg: GFLAGS = -DINSTALL_PREFIX=\"$(INSTALL_PREFIX)\"
! darwin_pkg: install darwin_pkg_license
! test -d ../installroot/Applications || mkdir -p ../installroot/Applications
! cd .. && install -m555 Pd.command installroot/Applications
! cd .. && cp -f pd.info $(PACKAGE_NAME).info
! # delete cruft
! -find ../installroot -name .DS_Store -delete
! -rm -f 1
! # set proper permissions
! sudo chmod 4555 ../installroot/$(INSTALL_PREFIX)/bin/pd
! sudo chown -R root:staff ../installroot/$(INSTALL_PREFIX)
! cd .. && sudo package installroot $(PACKAGE_NAME).info -d . -ignoreDSStore
! # install pkg docs
! sudo install -m 644 License.html ../$(PACKAGE_NAME).pkg/Contents/Resources
! sudo chown -R root:staff ../$(PACKAGE_NAME).pkg/Contents/Resources
!
!
! dmg: darwin_pkg
! cd .. && mkdir "$(DMG_NAME)"
! cd .. && mv $(PACKAGE_NAME).pkg "$(DMG_NAME)"
! cd .. && cp README.txt LICENSE.txt "$(DMG_NAME)"
! cd .. && /bin/sh mkdmg "$(DMG_NAME)"
Index: s_print.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_print.c,v
retrieving revision 1.1.1.1.16.1
retrieving revision 1.1.1.1.16.2
diff -C2 -d -r1.1.1.1.16.1 -r1.1.1.1.16.2
*** s_print.c 14 Oct 2003 12:32:16 -0000 1.1.1.1.16.1
--- s_print.c 15 Oct 2003 07:55:10 -0000 1.1.1.1.16.2
***************
*** 11,20 ****
/* T.Grill - linked list structure */
! typedef struct t_printhook {
t_printhookfn hook;
! struct t_printhook *nxt;
};
! static struct t_printhook *printlist = NULL;
/* T.Grill - this is the central printing function
--- 11,22 ----
/* T.Grill - linked list structure */
! typedef struct s_printhook t_printhook;
!
! struct s_printhook {
t_printhookfn hook;
! t_printhook *nxt;
};
! static t_printhook *printlist = NULL;
/* T.Grill - this is the central printing function
***************
*** 26,34 ****
/* call print hook functions */
! struct t_printhook *hk = printlist;
! while(hk) {
! hk->hook(fmt,ap);
! hk = hk->nxt;
! }
/* print to console */
--- 28,33 ----
/* call print hook functions */
! t_printhook *hk = printlist;
! for(; hk; hk = hk->nxt) hk->hook(fmt,ap);
/* print to console */
***************
*** 47,51 ****
int sys_addprinthook(t_printhookfn fn)
{
! struct t_printhook *hkel = getbytes(sizeof(struct t_printhook));
hkel->hook = fn;
/* insert as first element */
--- 46,50 ----
int sys_addprinthook(t_printhookfn fn)
{
! t_printhook *hkel = getbytes(sizeof(t_printhook));
hkel->hook = fn;
/* insert as first element */
***************
*** 59,63 ****
int sys_rmprinthook(t_printhookfn fn)
{
! struct t_printhook *hk = printlist,*hkprv = NULL;
/* iterate through list */
--- 58,62 ----
int sys_rmprinthook(t_printhookfn fn)
{
! t_printhook *hk = printlist,*hkprv = NULL;
/* iterate through list */
***************
*** 71,75 ****
printlist = hk->nxt;
! freebytes(hk,sizeof(struct t_printhook));
return 0;
}
--- 70,74 ----
printlist = hk->nxt;
! freebytes(hk,sizeof(t_printhook));
return 0;
}
More information about the Pd-cvs
mailing list