Mercurial > hg > aimc
comparison SConstruct @ 3:decdac21cfc2
- Imported file input using libsndfile from old AIM-C and updated to the new API
- Modified the Module base class to propogate Reset() calls down the module chain.
- This required changing all Reset() functions in subclasses to ResetInternal()
- Removed some unneeded imports from the Gaussians test
author | tomwalters |
---|---|
date | Tue, 16 Feb 2010 18:00:16 +0000 |
parents | bc394a985042 |
children | 3c782dec2fc0 |
comparison
equal
deleted
inserted
replaced
2:e91769e84be1 | 3:decdac21cfc2 |
---|---|
93 | 93 |
94 # Sources common to every version | 94 # Sources common to every version |
95 common_sources = ['Support/Common.cc', | 95 common_sources = ['Support/Common.cc', |
96 'Support/SignalBank.cc', | 96 'Support/SignalBank.cc', |
97 'Support/Parameters.cc', | 97 'Support/Parameters.cc', |
98 'Support/Module.cc', | 98 'Support/Module.cc', |
99 'Modules/Input/ModuleFileInput.cc', | |
99 'Modules/BMM/ModulePZFC.cc', | 100 'Modules/BMM/ModulePZFC.cc', |
100 'Modules/NAP/ModuleHCL.cc', | 101 'Modules/NAP/ModuleHCL.cc', |
101 #'Modules/SAI/ModuleSAI.cc', | 102 #'Modules/SAI/ModuleSAI.cc', |
102 'Modules/Features/ModuleGaussians.cc'] | 103 'Modules/Features/ModuleGaussians.cc'] |
103 | 104 |
114 | 115 |
115 # Look for the sources in the correct place | 116 # Look for the sources in the correct place |
116 env.Append(CPPPATH = '#src') | 117 env.Append(CPPPATH = '#src') |
117 | 118 |
118 # Dependencies | 119 # Dependencies |
119 deplibs = '' | 120 deplibs = ['sndfile'] |
121 | |
122 for depname in deplibs: | |
123 env.ParseConfig('pkg-config --cflags --libs ' + depname) | |
124 | |
120 env.AppendUnique(LIBS = deplibs) | 125 env.AppendUnique(LIBS = deplibs) |
121 | 126 |
122 # Set up the builder to build the program | 127 # Set up the builder to build the program |
123 program = env.Program(target = os.path.join(build_dir, target_executable), | 128 program = env.Program(target = os.path.join(build_dir, target_executable), |
124 source = map(lambda x: '#' + build_dir + '/src/' + x, | 129 source = map(lambda x: '#' + build_dir + '/src/' + x, |