Update of /cvsroot/pure-data/pd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15887
Modified Files: Tag: devel_0_39 SConstruct Log Message: improved install
Index: SConstruct =================================================================== RCS file: /cvsroot/pure-data/pd/Attic/SConstruct,v retrieving revision 1.1.4.7 retrieving revision 1.1.4.8 diff -C2 -d -r1.1.4.7 -r1.1.4.8 *** SConstruct 4 Aug 2005 11:00:01 -0000 1.1.4.7 --- SConstruct 20 Nov 2005 00:30:37 -0000 1.1.4.8 *************** *** 17,25 **** 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" --- 17,32 ---- opt.Save('options.cache',env)
! if env['icc']: ! env.Replace(CC="icc", ! SHCC="icc", ! CXX="icc", ! LINK="icc", ! SHCXX="icc", ! SHLINK="icc", ! ) ! env.Append(LINKFLAGS="-static-libcxa") ! ! env.Append(CCFLAGS=' -ip') ! env.Append(LINKFLAGS='-ip') print "Using intel c compiler" *************** *** 38,58 **** prefix = env['prefix']
! env.Install(prefix+'/bin', pdsend) ! env.Install(prefix+'/bin', pdreceive) ! env.Install(prefix+'/bin', pd) ! env.Install(prefix+'/lib/pd/bin', pdgui) if env['PLATFORM']=='posix': ! env.Install(prefix+'/lib/pd/bin', pdwatchdog) ! env.InstallAs(prefix + '/lib/pd/bin/pd.tk','src/u_main.tk')
for extra in extras: ! env.Install(prefix+'/lib/extra/', extra) try: ! env.Install(prefix+'/lib', pdlib) except: pass
for header in Split("m_pd.h m_imp.h g_canvas.h"): ! env.Install(prefix+'/include', 'src/'+header)
! env.Alias('install', prefix) --- 45,68 ---- prefix = env['prefix']
! installs = [] ! ! installs.append(env.Install(prefix+'/bin', pdsend)) ! installs.append(env.Install(prefix+'/bin', pdreceive)) ! installs.append(env.Install(prefix+'/bin', pd)) ! installs.append(env.Install(prefix+'/lib/pd/bin', pdgui)) if env['PLATFORM']=='posix': ! installs.append(env.Install(prefix+'/lib/pd/bin', pdwatchdog)) ! ! installs.append(env.InstallAs(prefix + '/lib/pd/bin/pd.tk','src/u_main.tk'))
for extra in extras: ! installs.append(env.Install(prefix+'/lib/extra/', extra)) try: ! installs.append(env.Install(prefix+'/lib', pdlib)) except: pass
for header in Split("m_pd.h m_imp.h g_canvas.h"): ! installs.append(env.Install(prefix+'/include', 'src/'+header))
! env.Alias('install', installs)