pd/src SConscript,1.1.4.32,1.1.4.33 - Pd-cvs

13 Oct 2005


      Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8729/src
Modified Files:
      Tag: devel_0_39
    SConscript 
Log Message:
making PortAudio optional on Linux
Index: SConscript
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/SConscript,v
retrieving revision 1.1.4.32
retrieving revision 1.1.4.33
diff -C2 -d -r1.1.4.32 -r1.1.4.33
*** SConscript	8 Oct 2005 09:39:42 -0000	1.1.4.32
--- SConscript	13 Oct 2005 07:29:00 -0000	1.1.4.33
***************
*** 266,270 ****
  # cross-platform configuration
! pa_sources = Split("""s_audio_pa.c
    				  s_audio_pablio.c
    				  s_audio_paring.c""")
--- 266,270 ----
  # cross-platform configuration
! pa_sources = Split("""s_audio_pa.ca_
    				  s_audio_pablio.c
    				  s_audio_paring.c""")
***************
*** 370,374 ****
    alsa_sources = Split("s_audio_alsamm.c s_audio_alsa.c")
    oss_sources = Split("s_audio_oss.c")
! 
    pa_linux_sources = map(lambda x: papath+x,
    					Split("""
--- 370,374 ----
    alsa_sources = Split("s_audio_alsamm.c s_audio_alsa.c")
    oss_sources = Split("s_audio_oss.c")
! 	midi_sources = Split("s_midi_oss.c")
    pa_linux_sources = map(lambda x: papath+x,
    					Split("""
***************
*** 378,381 ****
--- 378,384 ----
    					""")
    					)
+ 	pa_linux_sources.append(papath+'/pa_linux_alsa/pa_linux_alsa.c')
+ 	linux_sources = oss_sources + midi_sources
+ 
    linux_defs = Split("UNISTD UNIX USEAPI_OSS PA_LITTLE_ENDIAN PA_USE_OSS")
    linux_defs.append('INSTALL_PREFIX=\"%s\"' % pdenv['prefix'])
***************
*** 383,390 ****
    linux_libs = []
! 	midi_sources = Split("s_midi_oss.c")
! 	
! 	linux_sources = pa_sources + pa_common_sources + pa_linux_sources + oss_sources + midi_sources
! 	
    if pdenv['simd']:
    	linux_sources.append(simd_sse_gcc_sources)
--- 386,393 ----
    linux_libs = []
! 	if pdenv['portaudio']:
! 		linux_sources += pa_sources + pa_common_sources + pa_linux_sources
! 		linux_defs.append("PA_USE_ALSA")
! 
    if pdenv['simd']:
    	linux_sources.append(simd_sse_gcc_sources)
***************
*** 392,398 ****
    if alsa:
    	linux_sources.append(alsa_sources)
- 		linux_sources.append(papath+'/pa_linux_alsa/pa_linux_alsa.c')
    	linux_defs.append("USEAPI_ALSA")
- 		linux_defs.append("PA_USE_ALSA")
    	linux_libs.append('asound')
    	linux_sources.append(['s_midi_alsa.c'])
--- 395,399 ----