[PD-cvs] externals/tb/chaos SConstruct, 1.3, 1.4 AUTHORS, 1.1.1.1, NONE ChangeLog, 1.1.1.1, NONE Makefile.am, 1.1.1.1, NONE NEWS, 1.1.1.1, NONE README, 1.1.1.1, NONE bootstrap.sh, 1.1.1.1, NONE configure.ac, 1.2, NONE

Tim Blechmann timblech at users.sourceforge.net
Sat Jan 14 23:06:40 CET 2006


Update of /cvsroot/pure-data/externals/tb/chaos
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13535

Modified Files:
	SConstruct 
Removed Files:
	AUTHORS ChangeLog Makefile.am NEWS README bootstrap.sh 
	configure.ac 
Log Message:
removing autobuild system ... updating scons build system

--- bootstrap.sh DELETED ---

--- ChangeLog DELETED ---

--- README DELETED ---

--- configure.ac DELETED ---

--- Makefile.am DELETED ---

--- AUTHORS DELETED ---

Index: SConstruct
===================================================================
RCS file: /cvsroot/pure-data/externals/tb/chaos/SConstruct,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SConstruct	1 Nov 2005 21:56:23 -0000	1.3
--- SConstruct	14 Jan 2006 22:06:38 -0000	1.4
***************
*** 28,33 ****
  	BoolOption('debug', 'Build with debugging symbols', False),
  	('optimize', 'Optimize for specific architecture', None),
! 	('icc', 'Build with intel c compiler', False),
  	BoolOption('simd', 'build with simd instructions', False),
  	('prefix', 'install prefix', '/usr/local'),
  	('flext_path', 'flext path', None),
--- 28,34 ----
  	BoolOption('debug', 'Build with debugging symbols', False),
  	('optimize', 'Optimize for specific architecture', None),
! 	BoolOption('icc', 'Build with intel c compiler', False),
  	BoolOption('simd', 'build with simd instructions', False),
+ 	BoolOption('cmem', 'build with normal memory allocation', True),
  	('prefix', 'install prefix', '/usr/local'),
  	('flext_path', 'flext path', None),
***************
*** 40,45 ****
  Help(opt.GenerateHelpText(env))
  
! 
! if env.Dictionary().has_key('icc') and env['icc']:
  	env.Replace(CC="icc",
  				SHCC="icc",
--- 41,45 ----
  Help(opt.GenerateHelpText(env))
  
! if env['icc']:
  	env.Replace(CC="icc",
  				SHCC="icc",
***************
*** 56,59 ****
--- 56,63 ----
  
  
+ if env['cmem']:
+  	env.Append(CPPDEFINES=['FLEXT_USE_CMEM'])
+ 
+ 
  if env.Dictionary().has_key('flext_path'):
  	env.Append(CPPPATH=[env['flext_path']])
***************
*** 76,86 ****
  	env.Append(CCFLAGS=' -g ')
  	env.Append(CPPDEFINES=['_DEBUG'])
! 	env.Append(LIBS = 'flext-pd')
  	env.Append(LINKFLAGS=' -g')
  else:
- 	env.Append(CPPDEFINES=['FLEXT_SHARED'])
  	env.Append(LIBS = 'flext-pd')
  	env.Append(CPPDEFINES="NDEBUG")
  
  ######################################################################
  #
--- 80,91 ----
  	env.Append(CCFLAGS=' -g ')
  	env.Append(CPPDEFINES=['_DEBUG'])
! 	env.Append(LIBS = 'flext-pd_d')
  	env.Append(LINKFLAGS=' -g')
  else:
  	env.Append(LIBS = 'flext-pd')
  	env.Append(CPPDEFINES="NDEBUG")
  
+ env.Append(CPPDEFINES=['FLEXT_SHARED'])
+ 
  ######################################################################
  #
***************
*** 150,153 ****
  
  prefix = env['prefix']
! env.Install(prefix+'/lib/pd/extra',external)
! env.Alias('install', prefix+'/lib/pd/extra')
--- 155,158 ----
  
  prefix = env['prefix']
! install = env.Install(prefix+'/lib/pd/extra',external)
! env.Alias('install', install)

--- NEWS DELETED ---





More information about the Pd-cvs mailing list