diff options
| author | Sampo Savolainen <v2@iki.fi> | 2008-10-13 19:46:36 +0000 |
|---|---|---|
| committer | Sampo Savolainen <v2@iki.fi> | 2008-10-13 19:46:36 +0000 |
| commit | 7492625fd1fa4ba4a708533760b114bbedfb9691 (patch) | |
| tree | b88ca89bed8dbc4a70aeaa402519db0ff2d501c9 /SConstruct | |
| parent | d9106e99a456a7aa45fc4a9a3e4d4282f63ed59d (diff) | |
One file missing from previous commit. It also included the removal of the FFT_ANALYSIS compile time option. Now enabled by default.
git-svn-id: svn://localhost/ardour2/branches/3.0@3959 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/SConstruct b/SConstruct index 5c6acea587..ff5df46321 100644 --- a/SConstruct +++ b/SConstruct @@ -43,7 +43,6 @@ opts.AddOptions( EnumOption('DIST_TARGET', 'Build target for cross compiling packagers', 'auto', allowed_values=('auto', 'i386', 'i686', 'x86_64', 'powerpc', 'tiger', 'panther', 'leopard', 'none' ), ignorecase=2), BoolOption('DMALLOC', 'Compile and link using the dmalloc library', 0), BoolOption('EXTRA_WARN', 'Compile with -Wextra, -ansi, and -pedantic. Might break compilation. For pedants', 0), - BoolOption('FFT_ANALYSIS', 'Include FFT analysis window', 1), BoolOption('FREESOUND', 'Include Freesound database lookup', 0), BoolOption('FPU_OPTIMIZATION', 'Build runtime checked assembler code', 1), BoolOption('LIBLO', 'Compile with support for liblo library', 1), @@ -560,17 +559,16 @@ else: env = conf.Finish () -if env['FFT_ANALYSIS']: - # - # Check for fftw3 header as well as the library - # +# +# Check for fftw3 header as well as the library +# - conf = Configure(libraries['fftw3']) +conf = Configure(libraries['fftw3']) - if conf.CheckHeader ('fftw3.h') == False: - print ('Ardour cannot be compiled without the FFTW3 headers, which do not seem to be installed') - sys.exit (1) - conf.Finish() +if conf.CheckHeader ('fftw3.h') == False: + print ('Ardour cannot be compiled without the FFTW3 headers, which do not seem to be installed') + sys.exit (1) +conf.Finish() if env['FREESOUND']: # |