pd/src SConscript, 1.1.4.24, 1.1.4.25 desire.c, 1.1.2.13, 1.1.2.14 - Pd-cvs

16 Sep 2005


      Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17340
Modified Files:
      Tag: devel_0_39
    SConscript desire.c 
Log Message:
importing canvas+editor+array code in desire.c
Index: SConscript
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/SConscript,v
retrieving revision 1.1.4.24
retrieving revision 1.1.4.25
diff -C2 -d -r1.1.4.24 -r1.1.4.25
*** SConscript	8 Sep 2005 18:06:48 -0000	1.1.4.24
--- SConscript	16 Sep 2005 18:40:10 -0000	1.1.4.25
***************
*** 21,25 ****
    ('optimize', 'Optimize for specific architecture', None),
    ('prefix', 'install prefix', '/usr/local'),
! 	BoolOption('desire', 'Build with desire', False))
opt.Update(pdenv)
--- 21,26 ----
    ('optimize', 'Optimize for specific architecture', None),
    ('prefix', 'install prefix', '/usr/local'),
! 	BoolOption('desire', 'Build with desire', False),
! 	BoolOption('wall', 'Build with a wall of warnings', False))
opt.Update(pdenv)
***************
*** 32,92 ****
  # general configuration
! sources = Split("""d_arithmetic.c
!                    d_array.c
! 				   d_ctl.c
! 				   d_dac.c
! 				   d_delay.c
! 				   d_fft.c
! 				   d_fftroutine.c
! 				   d_filter.c
! 				   d_global.c
! 				   d_math.c
! 				   d_mayer_fft.c
! 				   d_misc.c
! 				   d_osc.c
! 				   d_resample.c
! 				   d_soundfile.c
! 				   d_ugen.c
! 				   g_array.c
! 				   g_canvas.c
! 				   g_editor.c
! 				   g_graph.c
! 				   g_guiconnect.c
! 				   g_io.c
! 				   g_readwrite.c
! 				   g_scalar.c
! 				   g_template.c
! 				   g_traversal.c
! 				   m_atom.c
! 				   m_binbuf.c
! 				   m_class.c
! 				   m_conf.c
! 				   m_fifo.c
! 				   m_glob.c
! 				   m_memory.c
! 				   m_obj.c
! 				   m_pd.c
! 				   m_sched.c
! 				   m_simd.c
! 				   s_audio.c
! 				   s_file.c
! 				   s_inter.c
! 				   s_loader.c
! 				   s_main.c
! 				   s_midi.c
! 				   s_path.c
! 				   s_print.c
! 				   x_acoustics.c
! 				   x_arithmetic.c
! 				   x_connective.c
! 				   x_gui.c
! 				   x_interface.c
! 				   x_list.c
! 				   x_midi.c
! 				   x_misc.c
! 				   x_net.c
! 				   x_qlist.c
! 				   x_time.c
! 				   """)
if pdenv['desire']:
--- 33,53 ----
  # general configuration
! sources = Split("""
!   d_arithmetic.c d_array.c d_ctl.c d_dac.c d_delay.c
!   d_fft.c d_fftroutine.c d_filter.c d_global.c d_math.c
!   d_mayer_fft.c d_misc.c d_osc.c d_resample.c d_soundfile.c d_ugen.c
! 
!   g_graph.c g_guiconnect.c g_io.c g_readwrite.c g_scalar.c
!   g_template.c g_traversal.c
! 
!   m_atom.c m_binbuf.c m_class.c m_conf.c m_fifo.c
!   m_glob.c m_memory.c m_obj.c m_pd.c m_sched.c m_simd.c
! 
!   s_audio.c s_file.c s_inter.c s_loader.c
!   s_main.c s_midi.c s_path.c s_print.c
! 
!   x_acoustics.c x_arithmetic.c x_connective.c x_gui.c x_interface.c
!   x_list.c x_midi.c x_misc.c x_net.c x_qlist.c x_time.c
! """)
if pdenv['desire']:
***************
*** 99,102 ****
--- 60,64 ----
    	g_numbox.c g_vdial.c g_vslider.c g_vumeter.c
    	g_text.c g_toggle.c g_rtext.c g_all_guis.c
+ 		g_array.c g_canvas.c g_editor.c
    """)
***************
*** 393,396 ****
--- 355,361 ----
  flags = ''
+ if pdenv['wall']:
+ 	flags += " -Wall"
+ 
  if pdenv['debug']:
    pdenv.Append(CPPDEFINES=Split("DEBUG"))
Index: desire.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -C2 -d -r1.1.2.13 -r1.1.2.14
*** desire.c	16 Sep 2005 18:30:45 -0000	1.1.2.13
--- desire.c	16 Sep 2005 18:40:10 -0000	1.1.2.14
***************
*** 28,34 ****
--- 28,5660 ----
  // from g_canvas.c
+ /* Copyright (c) 1997-2001 Miller Puckette and others.
+ * For information on usage and redistribution, and for a DISCLAIMER OF ALL
+ * WARRANTIES, see the file, "LICENSE.txt," in this distribution.  */
+ 
+ /* this file defines the "glist" class, also known as "canvas" (the two used
+ to be different but are now unified except for some fossilized names.) */
+ 
[...5604 lines suppressed...]
+         gensym("normalize"), A_DEFFLOAT, 0);
+     class_addmethod(garray_class, (t_method)garray_arraydialog,
+         gensym("arraydialog"), A_SYMBOL, A_FLOAT, A_FLOAT, A_FLOAT, A_NULL);
+ /* jsarlo { */
+     class_addmethod(garray_class, (t_method)garray_arrayviewlist_new,
+         gensym("arrayviewlistnew"), A_NULL);
+     class_addmethod(garray_class, (t_method)garray_arrayviewlist_fillpage,
+         gensym("arrayviewlistfillpage"), A_FLOAT, A_NULL);
+     class_addmethod(garray_class, (t_method)garray_arrayviewlist_close,
+       gensym("arrayviewclose"), A_NULL);
+ /* } jsarlo */
+     class_setsavefn(garray_class, garray_save);
+ }
+ 
+ 
+ 
+ 
+ 
  //--------------------------------------------------------------------------
  // from g_text.c