[PD-cvs] pd SConstruct,1.1.2.3,1.1.2.4

[Tim Blechmann]

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

Modified Files:
      Tag: devel_0_38
	SConstruct 
Log Message:
several fixes


Index: SConstruct
===================================================================
RCS file: /cvsroot/pure-data/pd/Attic/SConstruct,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** SConstruct	22 Jun 2005 18:50:40 -0000	1.1.2.3
--- SConstruct	24 Jun 2005 12:59:03 -0000	1.1.2.4
***************
*** 9,14 ****
  opt = Options(['options.cache', 'custom.py'])
  opt.AddOptions(
! 	('prefix', 'install prefix', '/usr/local')
! 	)
  
  opt.Update(env)
--- 9,14 ----
  opt = Options(['options.cache', 'custom.py'])
  opt.AddOptions(
! 	('prefix', 'install prefix', '/usr/local'),
! 	BoolOption('icc', 'use intel c compiler', False))
  
  opt.Update(env)
***************
*** 16,19 ****
--- 16,26 ----
  opt.Save('options.cache',env)
  
+ if env.Dictionary().has_key('icc') and env['icc']:
+  	env['CC'] = '/opt/intel/cc/9.0/bin/icc'
+  	env['CXX'] = '/opt/intel/cc/9.0/bin/icc'
+  	env.Append(CCFLAGS=' -ip -ipo -axB')
+  	env.Append(LINKFLAGS='-i-static -ip -ipo -axB')
+ 	print "Using intel c compiler"
+ 	
  Export("env")
  
***************
*** 38,42 ****
  	env.InstallAs(prefix + '/lib/pd/bin/pd.tk','src/u_main.tk')
  	
! 	env.Install(prefix+'/lib', pdlib)
! 
  	env.Alias('install', prefix)
--- 45,52 ----
  	env.InstallAs(prefix + '/lib/pd/bin/pd.tk','src/u_main.tk')
  	
! 	try:
! 		env.Install(prefix+'/lib', pdlib)
! 	except:
! 		pass
! 	
  	env.Alias('install', prefix)