[PD-cvs] externals/mjlib about.c,1.2,1.3 about.h,1.2,1.3 convolve~.c,1.1.1.1,1.2 makefile,1.1.1.1,1.2 metroplus.c,1.1.1.1,1.2 monorhythm.c,1.1,1.2 morse.c,1.2,1.3 n2m.c,1.2,1.3 pin~.c,1.1.1.1,1.2 prob.c,1.1.1.1,1.2 synapseA~.c,1.1.1.1,1.2 monorythm.c,1.1.1.1,NONE monorythm.h,1.1.1.1,NONE

Hans-Christoph Steiner eighthave at users.sourceforge.net
Thu Apr 8 05:09:15 CEST 2004


Update of /cvsroot/pure-data/externals/mjlib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2487

Modified Files:
	about.c about.h convolve~.c makefile metroplus.c monorhythm.c 
	morse.c n2m.c pin~.c prob.c synapseA~.c 
Removed Files:
	monorythm.c monorythm.h 
Log Message:
made mjLib conform to the CVS build system and 0.37 help patch naming scheme

Index: n2m.c
===================================================================
RCS file: /cvsroot/pure-data/externals/mjlib/n2m.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** n2m.c	8 Apr 2004 02:35:21 -0000	1.2
--- n2m.c	8 Apr 2004 03:09:13 -0000	1.3
***************
*** 66,70 ****
      	(t_method)n2m_free, sizeof(t_n2m), 0, 0);    
      class_addmethod(n2m_class, (t_method)n2m_notename, gensym("note" ), A_GIMME, 0);    	
! 	class_sethelpsymbol(n2m_class, gensym("mjLib/n2m"));
  }
  
--- 66,70 ----
      	(t_method)n2m_free, sizeof(t_n2m), 0, 0);    
      class_addmethod(n2m_class, (t_method)n2m_notename, gensym("note" ), A_GIMME, 0);    	
! 	
  }
  

Index: morse.c
===================================================================
RCS file: /cvsroot/pure-data/externals/mjlib/morse.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** morse.c	8 Apr 2004 02:35:21 -0000	1.2
--- morse.c	8 Apr 2004 03:09:13 -0000	1.3
***************
*** 309,313 ****
  	class_addmethod(morse_class, (t_method)morse_rewind,gensym("rewind"),0);
  	//class_addmethod(morse_class, (t_method)morse_set_nonexclusive,gensym("nonexclusive"),0); 
! 	class_sethelpsymbol(morse_class, gensym("mjLib/morse"));
  }
  
--- 309,313 ----
  	class_addmethod(morse_class, (t_method)morse_rewind,gensym("rewind"),0);
  	//class_addmethod(morse_class, (t_method)morse_set_nonexclusive,gensym("nonexclusive"),0); 
! 	
  }
  

Index: prob.c
===================================================================
RCS file: /cvsroot/pure-data/externals/mjlib/prob.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** prob.c	7 Apr 2004 14:32:26 -0000	1.1.1.1
--- prob.c	8 Apr 2004 03:09:13 -0000	1.2
***************
*** 139,143 ****
  	class_addmethod(prob_class, (t_method)prob_set_probability, gensym("probability" ), A_FLOAT, 0);    	
  	class_addmethod(prob_class, (t_method)prob_set_time, gensym("time" ), A_FLOAT, 0);    	
! 	class_sethelpsymbol(prob_class, gensym("mjLib/prob"));
  }
  
--- 139,143 ----
  	class_addmethod(prob_class, (t_method)prob_set_probability, gensym("probability" ), A_FLOAT, 0);    	
  	class_addmethod(prob_class, (t_method)prob_set_time, gensym("time" ), A_FLOAT, 0);    	
! 	
  }
  

Index: makefile
===================================================================
RCS file: /cvsroot/pure-data/externals/mjlib/makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** makefile	7 Apr 2004 14:31:14 -0000	1.1.1.1
--- makefile	8 Apr 2004 03:09:13 -0000	1.2
***************
*** 1,37 ****
! all: mjLib
! 
! VC = "C:\Program Files\Microsoft Visual Studio .NET\Vc7"
! INCLUDE = -I. -I..\src \
! -I..\Tcl\include -I$(VC)\include -I"C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\Include"
! 
! LDIR = $(VC)\lib
! LDIR2 = "C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\lib"
! 
! LIB = /NODEFAULTLIB:libc /NODEFAULTLIB:oldnames  /NODEFAULTLIB:kernel \
!     /NODEFAULTLIB:uuid \
!     $(LDIR)\libc.lib $(LDIR)\oldnames.lib $(LDIR)\kernel32.lib \
!     $(LDIR2)\wsock32.lib $(LDIR2)\winmm.lib \
!     ..\bin\pd.lib
! GLIB =  $(LIB) ..\lib\tcl83.lib ..\lib\tk83.lib
! CFLAGS = /nologo /W3 /WX /DNT /DPD  /Ox /Zi /DVERSION=\"1\" 
! LFLAGS = /nologo
! 
! SRC = pin~.c mjLib.c  metroplus.c monorythm.c prob.c about.c synapseA~.c convolve~.c n2m.c morse.c
! 
! OBJ = $(SRC:.c=.obj)
! 
! .c.obj:
! 	cl /c $(CFLAGS) $(INCLUDE) $*.c
! 	
! 
! mjLib: ..\mjLib\mjLib.dll
! 
! ..\mjLib\mjLib.dll ..\mjLib\mjLib.lib: $(OBJ)
! 	link $(LFLAGS) /debug /dll /export:mjLib_setup \
! 	/out:..\mjLib\mjLib.dll $(OBJ) $(LIB)
! 
! 
! # the following should also clean up "bin" but it doesn't because "bin" holds
! # precious stuff from elsewhere.
! clean:
! 	del *.obj
--- 1,59 ----
! 
! EXT = pd_linux
! DEFS =  -DHAVE_LIBC=1 -DHAVE_LIBM=1 -DHAVE_LIBPTHREAD=1 -DSTDC_HEADERS=1 -DHAVE_FCNTL_H=1 -DHAVE_SYS_TIME_H=1 -DHAVE_UNISTD_H=1 -DTIME_WITH_SYS_TIME=1 -DHAVE_UNISTD_H=1 -DHAVE_GETPAGESIZE=1 -DHAVE_MMAP=1 -DHAVE_SELECT=1 -DHAVE_SOCKET=1 -DHAVE_STRERROR=1  -DPD_VERSION_MINOR=32
! CC = gcc
! CXX = c++
! LD = ld
! AFLAGS = 
! LFLAGS = -export_dynamic  -shared
! WFLAGS =
! IFLAGS = -I./include -I../src
! INSTALL_PREFIX=/usr/local
! 
! VERSION = \"$(shell cat VERSION)\"
! 
! .SUFFIXES: .$(EXT)
! 
! PDCFLAGS = -g -O2 $(DEFS) $(IFLAGS) $(WFLAGS) $(LFLAGS) $(AFLAGS) -DVERSION=$(VERSION)
! CFLAGS = -g -O2 $(DEFS) $(IFLAGS) $(WFLAGS) -DVERSION=$(VERSION)
! CXXFLAGS = $(CFLAGS)
! 
! #LIBS = -lc -lm 
! LIBS = -lpthread -lm -lc 
! SOURCES =  pin~.c mjLib.c  metroplus.c monorythm.c prob.c about.c synapseA~.c convolve.c
! TARGETS = $(SOURCES:.c=.$(EXT)) 
! 
! all: $(TARGETS) 
! 
! mjLib: $(TARGETS)
! 	cc -c $(CFLAGS) -DPD mjLib.c
! 	$(LD) -export_dynamic  -shared -o mjLib.pd_linux *.o $(LIBS)
! 	strip --strip-unneeded mjLib.pd_linux
! 
! clean::
! 	-rm *.$(EXT) *.o 
! 
! distclean: clean
! 	-rm config.cache config.log config.status makefile
! 
! 
! 
! .c.o:
! 	$(CC) -c -o $@ $(CFLAGS) -DPD $*.c
! 
! # cp $@ $*_stat.o
! 
! .o.pd_linux:
! 	$(CC) -o $@ $(PDCFLAGS) -DPD $*.o
! 
! 
! 
! install::
! 	install -d $(INSTALL_PREFIX)/pd/externs
! 	install -m 644 *.$(EXT) $(INSTALL_PREFIX)/pd/externs
! 	-install -m 644 mjLib.pd_linux $(INSTALL_PREFIX)/pd/externs
! 	install -m 644 doc/*.pd $(INSTALL_PREFIX)/pd/doc/5.reference
! 
! 
! dist: distclean
! 	(cd ..;tar czvf mjLib.tar.gz mjLib)

Index: metroplus.c
===================================================================
RCS file: /cvsroot/pure-data/externals/mjlib/metroplus.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** metroplus.c	7 Apr 2004 14:31:14 -0000	1.1.1.1
--- metroplus.c	8 Apr 2004 03:09:13 -0000	1.2
***************
*** 173,177 ****
  	class_addmethod(metroplus_2_class, (t_method)metroplus_time_seq, gensym("list"),A_GIMME,0);
  	class_addmethod(metroplus_2_class, (t_method)metroplus_time_float ,gensym("float"),A_FLOAT,0);
! 	class_sethelpsymbol(metroplus_class, gensym("mjLib/metroplus"));
  }
  
--- 173,177 ----
  	class_addmethod(metroplus_2_class, (t_method)metroplus_time_seq, gensym("list"),A_GIMME,0);
  	class_addmethod(metroplus_2_class, (t_method)metroplus_time_float ,gensym("float"),A_FLOAT,0);
! 	
  }
  

Index: pin~.c
===================================================================
RCS file: /cvsroot/pure-data/externals/mjlib/pin~.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** pin~.c	7 Apr 2004 14:32:26 -0000	1.1.1.1
--- pin~.c	8 Apr 2004 03:09:13 -0000	1.2
***************
*** 201,205 ****
  	class_addmethod(pin_tilde_class, (t_method) pin_tilde_ticktime, gensym("tick") , A_DEFFLOAT , (t_atomtype)0 );
  	class_addmethod(pin_tilde_class, (t_method) pin_tilde_prob, gensym("prob") , A_DEFFLOAT , (t_atomtype)0 );
! 	class_sethelpsymbol(pin_tilde_class, gensym("mjLib/pin~"));
  }
  
--- 201,205 ----
  	class_addmethod(pin_tilde_class, (t_method) pin_tilde_ticktime, gensym("tick") , A_DEFFLOAT , (t_atomtype)0 );
  	class_addmethod(pin_tilde_class, (t_method) pin_tilde_prob, gensym("prob") , A_DEFFLOAT , (t_atomtype)0 );
! 	
  }
  

Index: about.h
===================================================================
RCS file: /cvsroot/pure-data/externals/mjlib/about.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** about.h	8 Apr 2004 02:35:21 -0000	1.2
--- about.h	8 Apr 2004 03:09:12 -0000	1.3
***************
*** 1,3 ****
- #include "m_pd.h"
  
  typedef struct _about
--- 1,2 ----

--- monorythm.h DELETED ---

Index: convolve~.c
===================================================================
RCS file: /cvsroot/pure-data/externals/mjlib/convolve~.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** convolve~.c	7 Apr 2004 14:31:12 -0000	1.1.1.1
--- convolve~.c	8 Apr 2004 03:09:13 -0000	1.2
***************
*** 176,180 ****
  	class_addmethod(convolve_tilde_class, (t_method) convolve_tilde_ticktime, gensym("tick") , A_DEFFLOAT , (t_atomtype)0 );
  	class_addmethod(convolve_tilde_class, (t_method) convolve_tilde_prob, gensym("prob") , A_DEFFLOAT , (t_atomtype)0 );
! 	class_sethelpsymbol(convolve_tilde_class, gensym("mjLib/convolve~"));
  }
  
--- 176,180 ----
  	class_addmethod(convolve_tilde_class, (t_method) convolve_tilde_ticktime, gensym("tick") , A_DEFFLOAT , (t_atomtype)0 );
  	class_addmethod(convolve_tilde_class, (t_method) convolve_tilde_prob, gensym("prob") , A_DEFFLOAT , (t_atomtype)0 );
! 	
  }
  

Index: monorhythm.c
===================================================================
RCS file: /cvsroot/pure-data/externals/mjlib/monorhythm.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** monorhythm.c	8 Apr 2004 02:35:21 -0000	1.1
--- monorhythm.c	8 Apr 2004 03:09:13 -0000	1.2
***************
*** 234,238 ****
  	class_addmethod(monorhythm_class, (t_method)monorhythm_set_exclusive,gensym("exclusive"),0);
  	class_addmethod(monorhythm_class, (t_method)monorhythm_set_nonexclusive,gensym("nonexclusive"),0); 
! 	class_sethelpsymbol(monorhythm_class, gensym("mjLib/monorhythm"));
  }
  
--- 234,238 ----
  	class_addmethod(monorhythm_class, (t_method)monorhythm_set_exclusive,gensym("exclusive"),0);
  	class_addmethod(monorhythm_class, (t_method)monorhythm_set_nonexclusive,gensym("nonexclusive"),0); 
! 	
  }
  

--- monorythm.c DELETED ---

Index: synapseA~.c
===================================================================
RCS file: /cvsroot/pure-data/externals/mjlib/synapseA~.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** synapseA~.c	7 Apr 2004 14:32:26 -0000	1.1.1.1
--- synapseA~.c	8 Apr 2004 03:09:13 -0000	1.2
***************
*** 114,118 ****
      class_addmethod(synapseA_tilde_class, (t_method) synapseA_tilde_dsp, gensym("dsp"), (t_atomtype)0);    	
  	class_addmethod(synapseA_tilde_class, (t_method) synapseA_tilde_threshold, gensym("threshold") , A_DEFFLOAT , (t_atomtype)0 );
! 	class_sethelpsymbol(synapseA_tilde_class, gensym("mjLib/synapseA~"));
  }
  
--- 114,118 ----
      class_addmethod(synapseA_tilde_class, (t_method) synapseA_tilde_dsp, gensym("dsp"), (t_atomtype)0);    	
  	class_addmethod(synapseA_tilde_class, (t_method) synapseA_tilde_threshold, gensym("threshold") , A_DEFFLOAT , (t_atomtype)0 );
! 	
  }
  

Index: about.c
===================================================================
RCS file: /cvsroot/pure-data/externals/mjlib/about.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** about.c	8 Apr 2004 02:35:21 -0000	1.2
--- about.c	8 Apr 2004 03:09:11 -0000	1.3
***************
*** 74,78 ****
      class_addfloat( about_class, about_float );
      class_addmethod(about_class, (t_method)about_set_err, gensym("error" ), A_FLOAT, 0);    	
! 	class_sethelpsymbol(about_class, gensym("mjLib/about"));
  }
  
--- 74,78 ----
      class_addfloat( about_class, about_float );
      class_addmethod(about_class, (t_method)about_set_err, gensym("error" ), A_FLOAT, 0);    	
! 	
  }
  





More information about the Pd-cvs mailing list