replace define '#if FFTW3==1' --> '#ifdef WITH_FFTW3'

diff --git a/intern/smoke/CMakeLists.txt b/intern/smoke/CMakeLists.txt
index 094d398a83ce1dfe288b0419b44206c577d5e858..228ff6ec389bb12d5ff3967832d4f98bdf90fddb 100644 (file)
--- a/intern/smoke/CMakeLists.txt
+++ b/intern/smoke/CMakeLists.txt
@@ -88,7 +88,7 @@ if(WITH_OPENMP)
 endif()
 
 if(WITH_FFTW3)
 endif()
 
 if(WITH_FFTW3)

-       add_definitions(-DFFTW3=1)
+       add_definitions(-DWITH_FFTW3)

        list(APPEND INC
                ${FFTW3_INCLUDE_DIRS}
        )
        list(APPEND INC
                ${FFTW3_INCLUDE_DIRS}
        )

diff --git a/intern/smoke/SConscript b/intern/smoke/SConscript
index fa32c5f36c3a04526a183960e1105fd7985d892b..0511257d31941da9181d5c12690330677fb49ceb 100644 (file)
--- 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']:
 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] )
     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 b0597d7b20cc2beab15ac3ab70ec2a07eaea1bcd..a087b4e139140a367ffb1e387cd0f838b68259f5 100644 (file)
--- 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_
 
 #ifndef FFT_NOISE_H_
 #define FFT_NOISE_H_
 

-#if FFTW3==1
+#ifdef WITH_FFTW3

 #include <iostream>
 #include <fftw3.h>
 #include <MERSENNETWISTER.h>
 #include <iostream>
 #include <fftw3.h>
 #include <MERSENNETWISTER.h>

diff --git a/intern/smoke/intern/WTURBULENCE.cpp b/intern/smoke/intern/WTURBULENCE.cpp
index 9934e3017cf6f4d1c24db6c1fc7b67dbc4e7aa3a..cd18cf7b34441f53d7f8378b940c82a65862ed0a 100644 (file)
--- 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(type == (1<<1)) // FFT
        {
                // needs fft

-               #if FFTW3==1
+               #ifdef WITH_FFTW3

                std::string noiseTileFilename = std::string("noise.fft");
                generatTile_FFT(_noiseTile, noiseTileFilename);
                #endif
                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 0307b5222d7be88bdc8d5561efd27a9aef1dcc68..c2b46a3b69af4df7eaffe52ed65c950f6554c0da 100644 (file)
--- 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)
 endif()
 
 if(WITH_FFTW3)

-       add_definitions(-DFFTW3=1)
+       add_definitions(-DWITH_FFTW3)

 endif()
 
 if(WITH_SDL)
 endif()
 
 if(WITH_SDL)

diff --git a/source/blender/makesrna/intern/SConscript b/source/blender/makesrna/intern/SConscript
index 24c892b96c444a5608135dfd5a3599a3f157ed34..5c2580e4b900568adb88bbfbeebf8a66da5544c4 100644 (file)
--- 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('WITH_GAMEENGINE')
     
 if env['WITH_BF_FFTW3']:

-    defs.append('FFTW3=1')
+    defs.append('WITH_FFTW3')

 
 if env['WITH_BF_SDL']:
     defs.append('WITH_SDL')
 
 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 d439c2551f14eafb177505d546bce02e8a02b90d..93ffa62a4c697b57728a5bb008a9d95940aaef68 100644 (file)
--- 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", ""},
 
        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", ""}, */
                                {MOD_SMOKE_NOISEFFT, "NOISEFFT", 0, "FFT", ""}, 
 #endif
                        /*      {MOD_SMOKE_NOISECURL, "NOISECURL", 0, "Curl", ""}, */