Mercurial > hg > aimc
changeset 21:d386805133f1
-Added necessary header files for linux build
-Temporarily commented out the test target in order to prevent loads of warnings from SCons.
| author | tomwalters |
|---|---|
| date | Mon, 22 Feb 2010 18:10:55 +0000 |
| parents | fff25824d1d1 |
| children | 645cfd371cff |
| files | SConstruct src/Modules/Output/FileOutputHTK.cc src/Modules/Strobes/ModuleParabola.cc |
| diffstat | 3 files changed, 16 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/SConstruct Mon Feb 22 17:51:27 2010 +0000 +++ b/SConstruct Mon Feb 22 18:10:55 2010 +0000 @@ -125,7 +125,7 @@ env.VariantDir('#' + build_dir, '#', duplicate = 0) # Look for the sources in the correct place -env.Append(CPPPATH = '#src') +env.Append(CPPPATH = ['#src']) # Dependencies deplibs = ['sndfile'] @@ -135,13 +135,6 @@ env.AppendUnique(LIBS = deplibs) -test_env = env -test_libs = ['gtest', 'gtest_main'] -#for depname in test_libs: -# test_env.ParseConfig('pkg-config --cflags --libs ' + depname) -test_env.AppendUnique(LIBPATH = '/usr/local/lib', - CPPPATH = '/usr/local/lib', - LIBS = test_libs) # Builder for the main program program = env.Program(target = os.path.join(build_dir, target_executable), @@ -150,7 +143,15 @@ env.Alias(target_executable, os.path.join(build_dir, target_executable)) env.Default(program) -test = test_env.Program(target = os.path.join(build_dir, test_executable), - source = map(lambda x: '#' + build_dir + '/src/' + x, - test_sources)) -env.Alias('test', os.path.join(build_dir, test_executable)) +#test_env = env.Clone() +#test_libs = ['gtest', 'gtest_main'] +#for depname in test_libs: +# test_env.ParseConfig('pkg-config --cflags --libs ' + depname) +#test_env.AppendUnique(LIBPATH = ['/usr/local/lib'], +# CPPPATH = ['/usr/local/lib'], +# LIBS = test_libs) + +#test = test_env.Program(target = os.path.join(build_dir, test_executable), +# source = map(lambda x: '#' + build_dir + '/src/' + x, +# test_sources)) +#env.Alias('test', os.path.join(build_dir, test_executable))
--- a/src/Modules/Output/FileOutputHTK.cc Mon Feb 22 17:51:27 2010 +0000 +++ b/src/Modules/Output/FileOutputHTK.cc Mon Feb 22 18:10:55 2010 +0000 @@ -32,6 +32,8 @@ # include <sys/types.h> # include <dirent.h> // for opendir&friends #endif + +#include <stdint.h> #include <stdio.h> #include <string.h> #include <cmath>