Mercurial > hg > aimc

diff carfac/SConstruct @ 630:6a13139d4b71

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix scons build of library and test. Deleted main.cc since libgtest comes with a corresponding main library. Everything compiles and the tests run on Ubuntu, but the tests all fail.
author ronw@google.com
date Thu, 23 May 2013 18:12:22 +0000
parents f72ad5807857
children af58e5d108fe
line wrap: on
line diff
--- a/carfac/SConstruct	Thu May 23 17:25:15 2013 +0000
+++ b/carfac/SConstruct	Thu May 23 18:12:22 2013 +0000
@@ -35,13 +35,16 @@
 import os
 
 carfac_sources = [
+    'agc_coeffs.cc',
     'agc_params.cc',
+    'car_coeffs.cc',
     'carfac.cc',
     'carfac_common.cc',
     'carfac_output.cc',
     'car_params.cc',
     'ear.cc',
     'ear_output.cc',
+    'ihc_coeffs.cc',
     'ihc_params.cc',
     ]
 
@@ -57,7 +60,7 @@
                 'cd tmp && cmake . && make',
             ])
 
-env.Program(target = 'main',
-            source = ['main.cc'],
-            LIBS = ['carfac', 'sndfile', 'gtest', 'pthread'],
+env.Program(target = 'carfac_test',
+            source = ['carfac_test.cc'],
+            LIBS = ['carfac', 'gtest', 'gtest_main', 'pthread'],
             LIBPATH = ['.', 'tmp'])