Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26543
Modified Files: Tag: devel_0_39 SConscript Log Message: removing DesireData from SConscript
Index: SConscript =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/SConscript,v retrieving revision 1.1.4.59 retrieving revision 1.1.4.60 diff -C2 -d -r1.1.4.59 -r1.1.4.60 *** SConscript 19 Nov 2006 21:40:43 -0000 1.1.4.59 --- SConscript 20 Nov 2006 06:42:53 -0000 1.1.4.60 *************** *** 31,36 **** ('optimize', 'Optimize for specific architecture (give cpu model)', None), ('prefix', 'install prefix', '/usr/local'), ! BoolOption('desire', 'Build with desire', False), ! BoolOption('wall', 'Build with a wall of warnings', False), BoolOption('pablio','Build portaudio with pablio', True), ) --- 31,35 ---- ('optimize', 'Optimize for specific architecture (give cpu model)', None), ('prefix', 'install prefix', '/usr/local'), ! BoolOption('desire', 'Build with desire (obsolete: use ./configure && make)', False), BoolOption('pablio','Build portaudio with pablio', True), ) *************** *** 80,91 **** 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']: - sources += Split(""" - desire.o m_hash.c - """) - else: - sources += Split(""" g_bang.c g_hdial.c g_hslider.c g_mycanvas.c g_numbox.c g_vdial.c g_vslider.c g_vumeter.c --- 79,83 ---- *************** *** 97,104 **** """)
- defs = ['PD']
- ###################################################################### # --- 89,94 ---- *************** *** 274,280 **** defs.append('LOCKFREE')
- if pdenv['desire']: - defs.append('DESIRE') - pdenv.Append(CPPDEFINES=defs)
--- 264,267 ---- *************** *** 542,550 **** lflags = ''
- - if pdenv['wall']: - cflags += " -Wall" - #cflags += " -Wall -ansi -pedantic" - if pdenv['debug']: pdenv.Append(CPPDEFINES=Split("DEBUG")) --- 529,532 ---- *************** *** 683,691 **** envint.Append(CPPDEFINES='PD_INTERNAL')
- if pdenv['desire']: - envdesire = pdenv.Copy() - #envdesire.Append(CCFLAGS=" -xc++") - desire_o=envdesire.StaticObject(target="desire.c") - if pdenv['pdlib']: if pdenv['PLATFORM'] == 'win32': --- 665,668 ----