Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24952

Modified Files: Tag: devel_0_39 makefile.in m_conf.c desire.c Log Message: forked m_conf.c for DesireData

Index: makefile.in =================================================================== RCS file: /cvsroot/pure-data/pd/src/makefile.in,v retrieving revision 1.4.4.2.2.20 retrieving revision 1.4.4.2.2.21 diff -C2 -d -r1.4.4.2.2.20 -r1.4.4.2.2.21 *** makefile.in 27 Nov 2006 16:49:58 -0000 1.4.4.2.2.20 --- makefile.in 28 Nov 2006 14:23:49 -0000 1.4.4.2.2.21 *************** *** 20,24 ****

# from pd miller ! SRC += 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_loader.c s_path.c \ s_entry.c s_audio.c s_midi.c \ --- 20,24 ----

# from pd miller ! SRC += m_pd.c m_class.c m_obj.c m_atom.c m_memory.c m_binbuf.c \ m_glob.c m_sched.c s_main.c s_inter.c s_file.c s_loader.c s_path.c \ s_entry.c s_audio.c s_midi.c \

Index: m_conf.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_conf.c,v retrieving revision 1.1.1.3.12.6 retrieving revision 1.1.1.3.12.7 diff -C2 -d -r1.1.1.3.12.6 -r1.1.1.3.12.7 *** m_conf.c 2 Jul 2006 00:51:10 -0000 1.1.1.3.12.6 --- m_conf.c 28 Nov 2006 14:23:49 -0000 1.1.1.3.12.7 *************** *** 13,26 ****

#define S(name) void name##_setup(void); - #ifdef DESIRE - S(desire) - S(m_obj) - S(hash) - #else S(g_bang) S(g_hradio) S(g_hslider) S(g_mycanvas) S(g_numbox) S(g_toggle) S(g_vradio) S(g_vslider) S(g_vumeter) S(g_text) S(g_array) S(g_canvas) S(g_guiconnect) S(g_io) S(g_scalar) S(g_template) S(g_traversal) - #endif S(m_pd) S(x_acoustics) S(x_interface) S(x_connective) S(x_time) S(x_arithmetic) S(x_midi) S(x_misc) S(x_net) S(x_qlist) --- 13,20 ---- *************** *** 32,39 **** #define S(name) name##_setup(); void conf_init(void) { - #ifdef DESIRE - S(hash) - S(m_obj) - #endif S(m_pd) S(x_acoustics) S(x_interface) S(x_connective) S(x_time) S(x_arithmetic) S(x_midi) S(x_misc) S(x_net) S(x_qlist) --- 26,29 ---- *************** *** 41,48 **** S(d_delay) S(d_fft) S(d_filter) S(d_global) S(d_math) S(d_misc) S(d_osc) S(d_soundfile) S(d_ugen) - - #ifdef DESIRE - S(desire) - #else S(g_bang) S(g_hradio) S(g_hslider) S(g_mycanvas) S(g_numbox) S(g_toggle) S(g_vradio) S(g_vslider) S(g_vumeter) S(g_text) --- 31,34 ----

Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.211 retrieving revision 1.1.2.212 diff -C2 -d -r1.1.2.211 -r1.1.2.212 *** desire.c 28 Nov 2006 03:53:30 -0000 1.1.2.211 --- desire.c 28 Nov 2006 14:23:49 -0000 1.1.2.212 *************** *** 7919,7920 **** --- 7919,7935 ---- } } + + /* ---------------------------------------------------------------- */ + /* formerly m_conf.c */ + + #define S(name) void name##_setup(void); name##_setup(); + extern "C" { + void conf_init(void) { + S(hash) S(m_obj) S(m_pd) S(x_acoustics) S(x_interface) S(x_connective) + S(x_time) S(x_arithmetic) S(x_midi) S(x_misc) S(x_net) S(x_qlist) + S(x_gui) S(x_list) S(d_arithmetic) S(d_array) S(d_ctl) S(d_dac) + S(d_delay) S(d_fft) S(d_filter) S(d_global) + S(d_math) S(d_misc) S(d_osc) S(d_soundfile) S(d_ugen) + S(desire) + } + };