pd/src SConscript,1.1.4.6,1.1.4.7 - Pd-cvs

12 Jul 2005


      Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19102
Modified Files:
      Tag: devel_0_39
    SConscript 
Log Message:
solved tcl path problem
Index: SConscript
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/SConscript,v
retrieving revision 1.1.4.6
retrieving revision 1.1.4.7
diff -C2 -d -r1.1.4.6 -r1.1.4.7
*** SConscript	12 Jul 2005 18:47:28 -0000	1.1.4.6
--- SConscript	12 Jul 2005 19:30:13 -0000	1.1.4.7
***************
*** 106,110 ****
conf = pdenv.Configure()
- 
  if not conf.CheckLib('m','sin'):
    print "can't find Math library"
--- 106,109 ----
***************
*** 127,131 ****
    	print "can't find tk"
! 
  if not ( conf.CheckHeader('tcl.h') or
    	 conf.CheckHeader('tcl/tcl.h')
--- 126,130 ----
    	print "can't find tk"
! add_cpppath = []
  if not ( conf.CheckHeader('tcl.h') or
    	 conf.CheckHeader('tcl/tcl.h')
***************
*** 133,136 ****
--- 132,136 ----
    for i in range (0,10):
    	if conf.CheckHeader('tcl8.%d/tcl.h' % i):
+ 			add_cpppath.append('/usr/include/tcl8.%d/' % i)
    		break
    else:
***************
*** 142,145 ****
--- 142,146 ----
    for i in range (0,10):
    	if conf.CheckHeader('tk8.%d/tk.h' % i):
+ 			add_cpppath.append('/usr/include/tk8.%d/' % i)
    		break
    else:
***************
*** 149,153 ****
    	else:
    		print "can't find tk header"
!
if not conf.CheckLib('pthread', 'pthread_create'):
--- 150,154 ----
    	else:
    		print "can't find tk header"
!
if not conf.CheckLib('pthread', 'pthread_create'):
***************
*** 173,183 ****
- 	portaudio = conf.CheckLib('portaudio','Pa_Initialize') ## on linux portaudio is a shared library
- 
- 	if not portaudio:
- 		print "libportaudio not found"
- 
- 
- 
  if pdenv['PLATFORM'] == 'win32':
    portaudio = True
--- 174,177 ----
***************
*** 196,200 ****
  # cleaning up
! env=conf.Finish()
if pdenv['atomic']:
--- 190,195 ----
  # cleaning up
! pdenv=conf.Finish()
! pdenv.Append(CPPPATH=add_cpppath)
if pdenv['atomic']: