[PD-cvs] externals/tb/chaos package.txt,1.2,1.3 SConstruct,1.1,1.2

[Tim Blechmann]

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

Modified Files:
	package.txt SConstruct 
Log Message:
updated build system

Index: SConstruct
===================================================================
RCS file: /cvsroot/pure-data/externals/tb/chaos/SConstruct,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SConstruct	16 Jun 2005 13:04:10 -0000	1.1
--- SConstruct	1 Nov 2005 21:24:31 -0000	1.2
***************
*** 1,43 ****
! systems = Split("""bernoulli
!                    bungalow_tent
! 				   circle_map
! 				   coupled_logistic
!                    chua
! 				   delayed_logistic
! 				   driven_anharmonic
! 				   driven_van_der_pol
! 				   duffing_map
! 				   gauss_map
! 				   gaussian_map
! 				   henon_map
! 				   hydrogen
! 				   ikeda_laser_map
! 				   latoocarfian
! 				   latoomutalpha
! 				   latoomutbeta
! 				   latoomutgamma
! 				   logistic
! 				   lorenz
! 				   lozi_map
! 				   roessler
! 				   sine_map
! 				   standard_map
! 				   tent_map""")
  
! sources = []
  
! env = Environment(CCFLAGS = '-O3 -g -mtune=pentium-m -march=pentium-m -mmmx -msse -msse2 -mfpmath=sse -I~/pd/devel/pd/src/ -I/usr/local/include/flext -DFLEXT_SYS_PD -DFLEXT_THREADS -DFLEXT_SHARED')
  
! for system in systems:
! 	sources.append(system+"_dsp.cpp")
! 	sources.append(system+"_msg.cpp")
! 	sources.append(system+"_search.cpp")
! sources += Split("main.cpp ode_base.cpp")
  
! sources = map(lambda x: "./src/"+x, sources)
  
! chaos = env.SharedLibrary('chaos', sources, LIBS = 'flext-pd_d',
! 						  SHLIBPREFIX='', SHLIBSUFFIX='.pd_linux')
  
! env.Install('/usr/local/lib/pd/extra',chaos)
! env.Alias('install', '/usr/local/lib/pd/extra')
--- 1,153 ----
! # scons script for flext build system
! # Copyright (C) 2005  Tim Blechmann
! # 
! # This program is free software; you can redistribute it and/or modify
! # it under the terms of the GNU General Public License as published by
! # the Free Software Foundation; either version 2 of the License, or
! # (at your option) any later version.
! # 
! # This program is distributed in the hope that it will be useful,
! # but WITHOUT ANY WARRANTY; without even the implied warranty of
! # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
! # GNU General Public License for more details.
! # 
! # You should have received a copy of the GNU General Public License
! # along with this program; see the file COPYING.  If not, write to
! # the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
! # Boston, MA 02111-1307, USA.
  
! import sys
  
! env = Environment(CCFLAGS = '-DFLEXT_SYS_PD -DFLEXT_THREADS')
  
! env.SConsignFile()
! env.CacheDir('./obj')
  
! opt = Options(['options.cache'])
! opt.AddOptions(
! 	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),
! 	('pd_path', 'pd path', None),
! 	)
  
! opt.Update(env)
  
! opt.Save('options.cache',env)
! Help(opt.GenerateHelpText(env))
! 
! 
! if env.Dictionary().has_key('icc') and 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"
! 
! 
! if env.Dictionary().has_key('flext_path'):
! 	env.Append(CPPPATH=[env['flext_path']])
! else:
! 	env.Append(CPPPATH=['../../grill/flext/source'])
! 
! 
! if env.Dictionary().has_key('pd_path'):
! 	env.Append(CPPPATH=[env['pd_path']])
! 
! if env.Dictionary().has_key('optimize'):
! 	if env['optimize']:
! 		env.Append(CCFLAGS=' -O3 '+env['optimize'])
! 		env.Append(LINKFLAGS=' -O3 '+env['optimize'])
! 
! if env.Dictionary().has_key('simd') and env['simd']:
! 	env.Append(CCFLAGS=' -mfpmath=sse -msse -mmmx -msse2')
! 			   
! if env.Dictionary().has_key('debug') and env['debug']:
! 	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")
! 
! ######################################################################
! #
! # read package.txt
! #
! 
! packagefile = open('./package.txt', 'r')
! 
! desc = {}
! line = packagefile.readline()
! while line != "":
! 	line = line.strip()
! 	if len(line) > 0 and line[0] != '#' :
! 		var, data = line.split('=')
! 
! 		if len(data) == 0:
! 			line = packagefile.readline()
! 			continue
! 		
! 		while data [-1] == '\\':
! 			nextline = packagefile.readline()
! 			nextline = nextline.strip()
! 			data = data + " " + nextline
! 
! 		data = data.replace("\\", "")
! 		desc[var] = data
! 
! 	
! 	line = packagefile.readline()
! packagefile.close()
! 
! 
! name = desc["NAME"]
! if not desc.has_key("SRCDIR"):
! 	desc["SRCDIR"] = "."
! 
! sources = map (lambda x: desc["SRCDIR"] + '/' + x,
! 			   desc["SRCS"].split())
! 
! if desc.has_key("INCPATH"):
! 	env.Append(CPPPATH=desc["INCPATH"].strip().replace("-I", "").split())
! 
! 
! 
! ######################################################################
! #
! # run custom.py
! #
! try:
! 	sys.path.append("./build/")
! 	import custom
! 	try:
! 		env, sources, headers = custom.custom(env,desc,sources)
! 	except:
! 		env, sources = custom.custom(env,desc,sources)
! except:
! 	pass
! 
! 
! 
! ######################################################################
! #
! # build
! #
! 
! external = env.SharedLibrary(name, sources, SHLIBPREFIX='', SHLIBSUFFIX='.pd_linux')
! 
! prefix = env['prefix']
! env.Install(prefix+'/lib/pd/extra',external)
! env.Alias('install', prefix+'/lib/pd/extra')

Index: package.txt
===================================================================
RCS file: /cvsroot/pure-data/externals/tb/chaos/package.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** package.txt	7 Oct 2005 10:36:22 -0000	1.2
--- package.txt	1 Nov 2005 21:24:31 -0000	1.3
***************
*** 33,36 ****
--- 33,39 ----
  driven_van_der_pol_msg.cpp \
  driven_van_der_pol_search.cpp \
+ duffing_dsp.cpp \
+ duffing_msg.cpp \
+ duffing_search.cpp \
  duffing_map_dsp.cpp \
  duffing_map_msg.cpp \
***************
*** 63,66 ****
--- 66,72 ----
  latoomutgamma_msg.cpp \
  latoomutgamma_search.cpp \
+ linear_congruental_dsp.cpp \
+ linear_congruental_msg.cpp \
+ linear_congruental_search.cpp \
  logistic_dsp.cpp \
  logistic_msg.cpp \