diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-09-06 03:46:08 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-09-06 03:46:08 +0400 |
| commit | bf5a6531a61638b74b9e80e055e00c2b97483fdf (patch) | |
| tree | 157b7c11f74e52d6a3fea841d1e6cde82703b48d | |
| parent | 0991bed4139e4a77ba81514ad1dfb6a852a41fa5 (diff) | |
replace define '#if FFTW3==1' --> '#ifdef WITH_FFTW3'
| -rw-r--r-- | intern/smoke/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | intern/smoke/SConscript | 2 | ||||
| -rw-r--r-- | intern/smoke/intern/FFT_NOISE.h | 2 | ||||
| -rw-r--r-- | intern/smoke/intern/WTURBULENCE.cpp | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/SConscript | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_smoke.c | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/intern/smoke/CMakeLists.txt b/intern/smoke/CMakeLists.txt index 094d398a83c..228ff6ec389 100644 --- a/intern/smoke/CMakeLists.txt +++ b/intern/smoke/CMakeLists.txt @@ -88,7 +88,7 @@ if(WITH_OPENMP) endif() if(WITH_FFTW3) - add_definitions(-DFFTW3=1) + add_definitions(-DWITH_FFTW3) list(APPEND INC ${FFTW3_INCLUDE_DIRS} ) diff --git a/intern/smoke/SConscript b/intern/smoke/SConscript index fa32c5f36c3..0511257d319 100644 --- a/intern/smoke/SConscript +++ b/intern/smoke/SConscript @@ -16,7 +16,7 @@ incs += ' ' + env['BF_PNG_INC'] + ' ' + env['BF_ZLIB_INC'] incs += ' intern ../../extern/bullet2/src ../memutil ../guardealloc ' if env['WITH_BF_FFTW3']: - defs += ' FFTW3=1' + defs += ' WITH_FFTW3' incs += env['BF_FFTW3_INC'] env.BlenderLib ('bf_intern_smoke', sources, Split(incs), Split(defs), libtype=['intern'], priority=[40] ) diff --git a/intern/smoke/intern/FFT_NOISE.h b/intern/smoke/intern/FFT_NOISE.h index b0597d7b20c..a087b4e1391 100644 --- a/intern/smoke/intern/FFT_NOISE.h +++ b/intern/smoke/intern/FFT_NOISE.h @@ -25,7 +25,7 @@ #ifndef FFT_NOISE_H_ #define FFT_NOISE_H_ -#if FFTW3==1 +#ifdef WITH_FFTW3 #include <iostream> #include <fftw3.h> #include <MERSENNETWISTER.h> diff --git a/intern/smoke/intern/WTURBULENCE.cpp b/intern/smoke/intern/WTURBULENCE.cpp index 9934e3017cf..cd18cf7b344 100644 --- a/intern/smoke/intern/WTURBULENCE.cpp +++ b/intern/smoke/intern/WTURBULENCE.cpp @@ -155,7 +155,7 @@ void WTURBULENCE::setNoise(int type) if(type == (1<<1)) // FFT { // needs fft - #if FFTW3==1 + #ifdef WITH_FFTW3 std::string noiseTileFilename = std::string("noise.fft"); generatTile_FFT(_noiseTile, noiseTileFilename); #endif diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt index 0307b5222d7..c2b46a3b69a 100644 --- a/source/blender/makesrna/intern/CMakeLists.txt +++ b/source/blender/makesrna/intern/CMakeLists.txt @@ -200,7 +200,7 @@ if(NOT WITH_MOD_FLUID) endif() if(WITH_FFTW3) - add_definitions(-DFFTW3=1) + add_definitions(-DWITH_FFTW3) endif() if(WITH_SDL) diff --git a/source/blender/makesrna/intern/SConscript b/source/blender/makesrna/intern/SConscript index 24c892b96c4..5c2580e4b90 100644 --- a/source/blender/makesrna/intern/SConscript +++ b/source/blender/makesrna/intern/SConscript @@ -71,7 +71,7 @@ if env['WITH_BF_GAMEENGINE']: defs.append('WITH_GAMEENGINE') if env['WITH_BF_FFTW3']: - defs.append('FFTW3=1') + defs.append('WITH_FFTW3') if env['WITH_BF_SDL']: defs.append('WITH_SDL') diff --git a/source/blender/makesrna/intern/rna_smoke.c b/source/blender/makesrna/intern/rna_smoke.c index d439c2551f1..93ffa62a4c6 100644 --- a/source/blender/makesrna/intern/rna_smoke.c +++ b/source/blender/makesrna/intern/rna_smoke.c @@ -121,7 +121,7 @@ static void rna_def_smoke_domain_settings(BlenderRNA *brna) static EnumPropertyItem prop_noise_type_items[] = { {MOD_SMOKE_NOISEWAVE, "NOISEWAVE", 0, "Wavelet", ""}, -#if FFTW3 == 1 +#ifdef WITH_FFTW3 {MOD_SMOKE_NOISEFFT, "NOISEFFT", 0, "FFT", ""}, #endif /* {MOD_SMOKE_NOISECURL, "NOISECURL", 0, "Curl", ""}, */ |