aboutsummaryrefslogtreecommitdiff
path: root/chaos/SConstruct
diff options
context:
space:
mode:
authorTim Blechmann <timblech@users.sourceforge.net>2006-01-14 22:06:38 +0000
committerIOhannes m zmölnig <zmoelnig@iem.at>2015-10-14 15:12:01 +0200
commite97a3414a2d0609a15d7323ce53faa4b1eaad18b (patch)
treed7c5d41ca1e8f27ee99a2a3a1a07789cca977455 /chaos/SConstruct
parentb5e8ffd7605b53f368c81ddae06dd997f57a4ca3 (diff)
removing autobuild system ... updating scons build system
svn path=/trunk/externals/tb/; revision=4403
Diffstat (limited to 'chaos/SConstruct')
-rw-r--r--chaos/SConstruct19
1 files changed, 12 insertions, 7 deletions
diff --git a/chaos/SConstruct b/chaos/SConstruct
index 2c682b8..e02934e 100644
--- a/chaos/SConstruct
+++ b/chaos/SConstruct
@@ -27,8 +27,9 @@ 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('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),
('pd_path', 'pd path', None),
@@ -39,8 +40,7 @@ opt.Update(env)
opt.Save('options.cache',env)
Help(opt.GenerateHelpText(env))
-
-if env.Dictionary().has_key('icc') and env['icc']:
+if env['icc']:
env.Replace(CC="icc",
SHCC="icc",
CXX="icc",
@@ -55,6 +55,10 @@ if env.Dictionary().has_key('icc') and env['icc']:
print "Using intel c compiler"
+if env['cmem']:
+ env.Append(CPPDEFINES=['FLEXT_USE_CMEM'])
+
+
if env.Dictionary().has_key('flext_path'):
env.Append(CPPPATH=[env['flext_path']])
else:
@@ -75,13 +79,14 @@ if env.Dictionary().has_key('optimize'):
if env.Dictionary().has_key('debug') and env['debug']:
env.Append(CCFLAGS=' -g ')
env.Append(CPPDEFINES=['_DEBUG'])
- env.Append(LIBS = 'flext-pd')
+ env.Append(LIBS = 'flext-pd_d')
env.Append(LINKFLAGS=' -g')
else:
- env.Append(CPPDEFINES=['FLEXT_SHARED'])
env.Append(LIBS = 'flext-pd')
env.Append(CPPDEFINES="NDEBUG")
+env.Append(CPPDEFINES=['FLEXT_SHARED'])
+
######################################################################
#
# read package.txt
@@ -149,5 +154,5 @@ except:
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')
+install = env.Install(prefix+'/lib/pd/extra',external)
+env.Alias('install', install)