Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3543/src
Modified Files: Tag: devel_0_39 SConscript Log Message: reverting some changes
Index: SConscript =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/SConscript,v retrieving revision 1.1.4.41 retrieving revision 1.1.4.42 diff -C2 -d -r1.1.4.41 -r1.1.4.42 *** SConscript 5 Dec 2005 13:12:11 -0000 1.1.4.41 --- SConscript 5 Dec 2005 15:46:26 -0000 1.1.4.42 *************** *** 62,70 **** d_mayer_fft.c d_misc.c d_osc.c d_resample.c d_soundfile.c d_ugen.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 --- 62,72 ---- d_mayer_fft.c d_misc.c d_osc.c d_resample.c d_soundfile.c d_ugen.c
+ g_rtext.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
x_acoustics.c x_arithmetic.c x_connective.c x_gui.c x_interface.c *************** *** 74,78 **** if pdenv['desire']: sources += Split(""" ! desire.c g_rtext.c """) else: --- 76,80 ---- if pdenv['desire']: sources += Split(""" ! desire.c """) else: *************** *** 80,86 **** g_bang.c g_hdial.c g_hslider.c g_mycanvas.c 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 g_graph.c g_guiconnect.c g_readwrite.c g_io.c g_scalar.c g_template.c g_traversal.c """)
--- 82,90 ---- g_bang.c g_hdial.c g_hslider.c g_mycanvas.c g_numbox.c g_vdial.c g_vslider.c g_vumeter.c ! g_text.c g_toggle.c g_all_guis.c g_array.c g_canvas.c g_editor.c g_graph.c g_guiconnect.c g_readwrite.c g_io.c g_scalar.c g_template.c g_traversal.c + + s_print.c """)
*************** *** 352,356 **** """) ) - pdenv.Append(LIBS="asiolib")
if 'msvc' in pdenv['TOOLS']: --- 356,359 ---- *************** *** 387,392 ****
if pdenv['portaudio']: ! linux_sources += pa_sources + pa_common_sources + pa_linux_sources linux_defs.append("PA_USE_ALSA")
if pdenv['simd']: --- 390,396 ----
if pdenv['portaudio']: ! linux_sources += pa_sources linux_defs.append("PA_USE_ALSA") + linux_libs.append('portaudio')
if pdenv['simd']: *************** *** 474,477 **** --- 478,482 ---- if pdenv['wall']: cflags += " -Wall" + #cflags += " -Wall -ansi -pedantic"
if pdenv['plusplus']: