changeset 36:74196ff1cb98

-Added debug symbols option for GCC -Fixed SSI bug - too early to try -1 for the other bits - oops again! -Added boost libraries to EC2 script
author tomwalters
date Fri, 26 Feb 2010 16:58:26 +0000
parents b893a04a845e
children 9e04648fef84
files SConstruct scripts/aws_prepare.sh src/Modules/SSI/ModuleSSI.cc
diffstat 3 files changed, 7 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/SConstruct	Fri Feb 26 07:16:34 2010 +0000
+++ b/SConstruct	Fri Feb 26 16:58:26 2010 +0000
@@ -62,6 +62,9 @@
 options.Add(BoolVariable('mingw', 
                          'Compile on Windows using mingw rather than msvc',
                          False))
+options.Add(BoolVariable('symbols', 
+                         'Add debuging symbols when compiling on gcc',
+                         False))
 
 # Environment variables
 env = Environment(options = options, ENV = os.environ)
@@ -112,6 +115,8 @@
   env['STRIP'] = 'strip'
   env.AppendUnique(CPPFLAGS = ['-Wall'])
   env.AppendUnique(CPPFLAGS = ['-O3', '-fomit-frame-pointer'])
+  if env['symbols']:
+    env.AppendUnique(CPPFLAGS = ['-g'])
   if env['mingw']:
     if not env['PLATFORM'] == 'win32':
       print('Cross-compilation for Windows is not supported')
--- a/scripts/aws_prepare.sh	Fri Feb 26 07:16:34 2010 +0000
+++ b/scripts/aws_prepare.sh	Fri Feb 26 16:58:26 2010 +0000
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Run ami-2fc2e95b (32 bit) or ami-05c2e971 (64 bit) in eu-west zone 
 sudo apt-get -y update
-sudo apt-get -y install subversion scons pkg-config libsndfile-dev build-essential
+sudo apt-get -y install subversion scons pkg-config libsndfile-dev build-essential libboost-dev
 sudo mkdir /media/sounds-database
 sudo mount /dev/sdf1 /media/sounds-database/
 cd /media/sounds-database/htk/htk/
--- a/src/Modules/SSI/ModuleSSI.cc	Fri Feb 26 07:16:34 2010 +0000
+++ b/src/Modules/SSI/ModuleSSI.cc	Fri Feb 26 16:58:26 2010 +0000
@@ -193,10 +193,7 @@
         val = weight * (curr_sample
                         + frac_part * (next_sample - curr_sample));
       } else {
-        // Set out-of-range values to a negative number to signify that 
-        // they really don't exist, and shouldn't be used in feature
-        // calculations.
-        val = -1.0f;
+        val = 0.0f;
       }
       output_.set_sample(ch, i, val);
     }