diff options
author | Daniel Genrich <daniel.genrich@gmx.net> | 2009-08-09 14:55:25 +0400 |
---|---|---|
committer | Daniel Genrich <daniel.genrich@gmx.net> | 2009-08-09 14:55:25 +0400 |
commit | 054ed5a50b6b7396f70d1b5353d7ada36e14e19f (patch) | |
tree | 3dcc4ed5a37254e304fc454e048dee257f963d54 /config | |
parent | a4755dcf2bb1c55bfee913509108a6e2e3f15541 (diff) |
Smoke:
* WITH_BF_FFTW3 flag --> fftw3 scons + cmake settings refined.
* Disabled by default since mac + win32 libs missing. Works already on win64 + linux (with installed fftw3 libs)
Diffstat (limited to 'config')
-rw-r--r-- | config/darwin-config.py | 6 | ||||
-rw-r--r-- | config/linux2-config.py | 6 | ||||
-rw-r--r-- | config/win32-vc-config.py | 6 | ||||
-rw-r--r-- | config/win64-vc-config.py | 6 |
4 files changed, 24 insertions, 0 deletions
diff --git a/config/darwin-config.py b/config/darwin-config.py index 171552d0822..0b1c2f75744 100644 --- a/config/darwin-config.py +++ b/config/darwin-config.py @@ -169,6 +169,12 @@ BF_BULLET = '#extern/bullet2/src' BF_BULLET_INC = '${BF_BULLET}' BF_BULLET_LIB = 'extern_bullet' +WITH_BF_FFTW3 = False +BF_FFTW3 = LIBDIR + '/fftw3' +BF_FFTW3_INC = '${BF_FFTW3}/include' +BF_FFTW3_LIB = 'libfftw' +BF_FFTW3_LIBPATH = '${BF_FFTW3}/lib' + #WITH_BF_NSPR = True #BF_NSPR = $(LIBDIR)/nspr #BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr diff --git a/config/linux2-config.py b/config/linux2-config.py index 6b6373bb001..62a7667d8e7 100644 --- a/config/linux2-config.py +++ b/config/linux2-config.py @@ -130,6 +130,12 @@ BF_OPENJPEG_LIB = '' BF_OPENJPEG_INC = '${BF_OPENJPEG}' BF_OPENJPEG_LIBPATH='${BF_OPENJPEG}/lib' +WITH_BF_FFTW3 = False +BF_FFTW3 = LIBDIR + '/usr' +BF_FFTW3_INC = '${BF_FFTW3}/include' +BF_FFTW3_LIB = 'fftw3' +BF_FFTW3_LIBPATH = '${BF_FFTW3}/lib' + WITH_BF_REDCODE = False BF_REDCODE = '#extern/libredcode' BF_REDCODE_LIB = '' diff --git a/config/win32-vc-config.py b/config/win32-vc-config.py index c226a2dca18..4e2a735243a 100644 --- a/config/win32-vc-config.py +++ b/config/win32-vc-config.py @@ -133,6 +133,12 @@ BF_OPENJPEG_LIB = '' BF_OPENJPEG_INC = '${BF_OPENJPEG}' BF_OPENJPEG_LIBPATH='${BF_OPENJPEG}/lib' +WITH_BF_FFTW3 = False +BF_FFTW3 = LIBDIR + '/fftw3' +BF_FFTW3_INC = '${BF_FFTW3}/include' +BF_FFTW3_LIB = 'libfftw' +BF_FFTW3_LIBPATH = '${BF_FFTW3}/lib' + WITH_BF_REDCODE = False BF_REDCODE_INC = '#extern' diff --git a/config/win64-vc-config.py b/config/win64-vc-config.py index 697b9141d14..56ea356715b 100644 --- a/config/win64-vc-config.py +++ b/config/win64-vc-config.py @@ -136,6 +136,12 @@ BF_OPENJPEG_LIB = '' BF_OPENJPEG_INC = '${BF_OPENJPEG}' BF_OPENJPEG_LIBPATH='${BF_OPENJPEG}/lib' +WITH_BF_FFTW3 = True +BF_FFTW3 = LIBDIR + '/fftw3' +BF_FFTW3_INC = '${BF_FFTW3}/include' +BF_FFTW3_LIB = 'libfftw' +BF_FFTW3_LIBPATH = '${BF_FFTW3}/lib' + WITH_BF_REDCODE = False BF_REDCODE_INC = '#extern' |