[PD-cvs] pd/src SConscript,1.1.2.6,1.1.2.7

[Tim Blechmann]

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

Modified Files:
      Tag: devel_0_38
	SConscript 
Log Message:
osx updates


Index: SConscript
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/SConscript,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -C2 -d -r1.1.2.6 -r1.1.2.7
*** SConscript	2 Jul 2005 15:12:11 -0000	1.1.2.6
--- SConscript	6 Jul 2005 19:16:46 -0000	1.1.2.7
***************
*** 128,132 ****
  
  
! if not conf.CheckHeader('tcl.h'):
  	for i in range (0,10):
  		if conf.CheckHeader('tcl8.%d/tcl.h' % i):
--- 128,132 ----
  
  
! if not conf.CheckHeader('tcl.h') and not conf.CheckHeader('tcl/tcl.h'): 
  	for i in range (0,10):
  		if conf.CheckHeader('tcl8.%d/tcl.h' % i):
***************
*** 136,141 ****
  		Exit(1)
  
! if not conf.CheckHeader('tk.h'):
! 	for i in range (8,10):
  		if conf.CheckHeader('tk8.%d/tk.h' % i):
  			break
--- 136,141 ----
  		Exit(1)
  
! if not conf.CheckHeader('tk.h') and not conf.CheckHeader('tk/tk.h'):
! 	for i in range (0,10):
  		if conf.CheckHeader('tk8.%d/tk.h' % i):
  			break
***************
*** 222,226 ****
  pm_sources = Split("s_midi_pm.c")
  
- 
  simd_sse_vc_sources = Split("m_simd_sse_vc.c")
  simd_sse_gcc_sources = Split("m_simd_sse_gcc.c")
--- 222,225 ----
***************
*** 288,291 ****
--- 287,292 ----
  	pdenv.Append(LIBS=linux_libs)
  
+ 	pdenv.Append(LINKFLAGS= ' -Wl,-export-dynamic')
+ 
  ######################################################################
  #
***************
*** 299,318 ****
  							  ../portmidi_osx/ptdarwin.c""")
  
! 	pa_osx_sources = (Split("""../portaudio/pa_common/pa_lib.c
! 							   ../portaudio/pa_common/pa_trace.c
! 							   ../portaudio/pa_common/pa_convert.c
! 							   ../portaudio/pa_mac_core/pa_mac_core.c"""))
  
  
! 	osx_sources = pa_osx_sources + pm_sources + pm_osx_sources + simd_ve_gcc_sources
  
! 	osx_defs = Split("MACOSX UNISTD PA_BIG_ENDIAN")
  
  	sources.append(osx_sources)
  	pdenv.Append(CPPDEFINES=osx_defs)
  
  	pdenv.Append(LINKFLAGS=" -framework CoreAudio -framework AudioUnit "
  				 +" -framework AudioToolbox -framework Carbon -framework CoreMIDI")
! 
  
  ######################################################################
--- 300,318 ----
  							  ../portmidi_osx/ptdarwin.c""")
  
! 	pa_osx_sources = (Split("""../portaudio/pa_mac_core/pa_mac_core.c
! 	                           ../portaudio/pa_mac/pa_mac_sm.c"""))
  
  
! 	osx_sources = pm_sources + pm_osx_sources + simd_ve_gcc_sources
  
! 	osx_defs = Split("UNISTD PA_BIG_ENDIAN")
  
  	sources.append(osx_sources)
+ 	pdenv.Append(CPPPATH='../portmidi_osx/')
  	pdenv.Append(CPPDEFINES=osx_defs)
  
  	pdenv.Append(LINKFLAGS=" -framework CoreAudio -framework AudioUnit "
  				 +" -framework AudioToolbox -framework Carbon -framework CoreMIDI")
! 	ldflags = ''
  
  ######################################################################
***************
*** 330,337 ****
  # portaudio stuff
  
! if portaudio:
! 	sources.append(pa_sources)
! 	pdenv.Append(CPPDEFINES=Split("USEAPI_PORTAUDIO PA19"))
! 	pdenv.Append(CPPPATH=Split("../portaudio ../portaudio/pa_common ../portaudio/pablio"))
  
  
--- 330,336 ----
  # portaudio stuff
  
! sources.append(pa_sources)
! pdenv.Append(CPPDEFINES=Split("USEAPI_PORTAUDIO PA19"))
! pdenv.Append(CPPPATH=Split("../portaudio/pa_common ../portaudio/pablio"))
  
  
***************
*** 404,409 ****
  	Default(pdwatchdog, pdsend, pdreceive, pdgui, pd, pdlib)
  else:
!  	pd = pdenv.Program('pd', ['s_entry.c'] + sources,
! 					   LINKFLAGS=pdenv['LINKFLAGS'] + " -Wl,-export-dynamic")
  	pdlib = None
  	Default(pdwatchdog, pdsend, pdreceive, pdgui, pd)
--- 403,407 ----
  	Default(pdwatchdog, pdsend, pdreceive, pdgui, pd, pdlib)
  else:
!  	pd = pdenv.Program('pd', ['s_entry.c'] + sources)
  	pdlib = None
  	Default(pdwatchdog, pdsend, pdreceive, pdgui, pd)