[PD-cvs] pd/src SConscript,1.1.4.38,1.1.4.39

[Tim Blechmann]

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

Modified Files:
      Tag: devel_0_39
	SConscript 
Log Message:
fixing bugs introduced by carmen


Index: SConscript
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/SConscript,v
retrieving revision 1.1.4.38
retrieving revision 1.1.4.39
diff -C2 -d -r1.1.4.38 -r1.1.4.39
*** SConscript	3 Dec 2005 06:40:36 -0000	1.1.4.38
--- SConscript	4 Dec 2005 21:54:08 -0000	1.1.4.39
***************
*** 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
--- 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
***************
*** 76,80 ****
  if pdenv['desire']:
  	sources += Split("""
! 		desire.c
  	""")
  else:
--- 74,78 ----
  if pdenv['desire']:
  	sources += Split("""
! 		desire.c g_rtext.c
  	""")
  else:
***************
*** 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
  	""")
  
--- 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
  	""")
  
***************
*** 139,144 ****
  		Exit(1)
  	
! 	pdenv.Append(CPPPATH=[path_pthread+'/include',path_tcl+'/include'])
! 	pdenv.Append(LIBPATH=[path_pthread+'/lib',path_tcl+'/lib'])
  	
  	pdenv.Append(CPPPATH=[path_asio+'/common',path_asio+'/host',path_asio+'/host/pc'])
--- 135,140 ----
  		Exit(1)
  	
! 	pdenv.Append(CPPPATH=[path_pthread,path_tcl+'/include'])
! 	pdenv.Append(LIBPATH=[path_pthread,path_tcl+'/lib'])
  	
  	pdenv.Append(CPPPATH=[path_asio+'/common',path_asio+'/host',path_asio+'/host/pc'])
***************
*** 147,151 ****
  	sep = ""
  	if 'msvc' in pdenv['TOOLS']:
! 		pthreadLib = "pthreadVC2"
  	else:
  		pthreadLib = "pthreadGC2"
--- 143,147 ----
  	sep = ""
  	if 'msvc' in pdenv['TOOLS']:
! 		pthreadLib = "pthreadVC"
  	else:
  		pthreadLib = "pthreadGC2"
***************
*** 178,182 ****
  #
  
! add_cpppath = [pdenv['prefix']+'/include']
  
  if pdenv['PLATFORM'] != 'win32':
--- 174,178 ----
  #
  
! add_cpppath = []
  
  if pdenv['PLATFORM'] != 'win32':
***************
*** 356,359 ****
--- 352,356 ----
  						""")
  						)
+ 		pdenv.Append(LIBS="asiolib")
  
  	if 'msvc' in pdenv['TOOLS']:
***************
*** 390,396 ****
  
  	if pdenv['portaudio']:
! 		linux_sources += pa_sources
  		linux_defs.append("PA_USE_ALSA")
- 		linux_libs.append('portaudio')
  
  	if pdenv['simd']:
--- 387,392 ----
  
  	if pdenv['portaudio']:
! 		linux_sources += pa_sources + pa_common_sources + pa_linux_sources
  		linux_defs.append("PA_USE_ALSA")
  
  	if pdenv['simd']:
***************
*** 479,483 ****
  if pdenv['wall']:
  	cflags += " -Wall"
- 	#cflags += " -Wall -ansi -pedantic"
  
  if pdenv['plusplus']:
--- 475,478 ----
***************
*** 575,580 ****
  
  pdenv.Append(CCFLAGS=Split(flags)+Split(cflags))
! pdenv.Append(CXXFLAGS=Split(flags)+Split(cflags))
! pdenv.Append(LINKFLAGS=Split(flags)+Split(lflags))
  
  
--- 570,574 ----
  
  pdenv.Append(CCFLAGS=Split(flags)+Split(cflags))
! pdenv.Append(LINKFLAGS=Split(flags)+Split(lflags)+Split(cflags))