replace define '#if FFTW3==1' --> '#ifdef WITH_FFTW3'
authorCampbell Barton <ideasman42@gmail.com>
Mon, 5 Sep 2011 23:46:08 +0000 (23:46 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 5 Sep 2011 23:46:08 +0000 (23:46 +0000)
intern/smoke/CMakeLists.txt
intern/smoke/SConscript
intern/smoke/intern/FFT_NOISE.h
intern/smoke/intern/WTURBULENCE.cpp
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/SConscript
source/blender/makesrna/intern/rna_smoke.c

index 094d398..228ff6e 100644 (file)
@@ -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}
        )
index fa32c5f..0511257 100644 (file)
@@ -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] )
index b0597d7..a087b4e 100644 (file)
@@ -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>
index 9934e30..cd18cf7 100644 (file)
@@ -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
index 0307b52..c2b46a3 100644 (file)
@@ -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)
index 24c892b..5c2580e 100644 (file)
@@ -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')
index d439c25..93ffa62 100644 (file)
@@ -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", ""}, */