diff carfac/SConstruct @ 636:27f2d9b76075

Fifth revision of Alex Brandmeyer's C++ implementation of CARFAC. Moved output structure to deque<vector<FloatArray>, moved coefficient Design methods to CARFAC object, moved tests into carfac_test.cc. Verified binaural output against Matlab using two tests. Added CARFAC_Compare_CPP_Test_Data to plot NAP output of C++ version against Matlab version. Verified build and test success on OS X using SCons with g++ 4.7 (std=c++11).

--- a/carfac/SConstruct	Fri May 24 22:38:09 2013 +0000
+++ b/carfac/SConstruct	Mon May 27 16:36:54 2013 +0000
@@ -43,22 +43,24 @@
 import os
 
 carfac_sources = [
-    'agc_coeffs.cc',
+        'carfac_common.cc',
     'agc_params.cc',
-    'car_coeffs.cc',
-    'carfac.cc',
-    'carfac_common.cc',
+    'agc_coeffs.h',
+    'agc_state.h',		
     'carfac_output.cc',
     'car_params.cc',
+    'car_coeffs.h',
+    'ihc_params.cc',
+    'car_state.h',
+    'ihc_coeffs.h',
+    'ihc_state.h',
     'ear.cc',
-    'ear_output.cc',
-    'ihc_coeffs.cc',
-    'ihc_params.cc',
+    'carfac.cc'
     ]
 
 env = Environment(CPPPATH=[os.environ['EIGEN_PATH']])
 # Needed to support std::vector initialization lists.
-env.MergeFlags(['-std=c++0x'])
+env.MergeFlags(['-std=c++11'])
 env.Library(target = 'carfac', source = carfac_sources)
 
 env.Command('tmp/libgtest.a', [],