Revision: 39947
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39947
Author: campbellbarton
Date: 2011-09-05 23:46:08 +0000 (Mon, 05 Sep 2011)
Log Message:
-----------
replace define '#if FFTW3==1' --> '#ifdef WITH_FFTW3'
Modified Paths:
--------------
trunk/blender/intern/smoke/CMakeLists.txt
trunk/blender/intern/smoke/SConscript
trunk/blender/intern/smoke/intern/FFT_NOISE.h
trunk/blender/intern/smoke/intern/WTURBULENCE.cpp
trunk/blender/source/blender/makesrna/intern/CMakeLists.txt
trunk/blender/source/blender/makesrna/intern/SConscript
trunk/blender/source/blender/makesrna/intern/rna_smoke.c
Modified: trunk/blender/intern/smoke/CMakeLists.txt
===================================================================
--- trunk/blender/intern/smoke/CMakeLists.txt 2011-09-05 23:40:52 UTC (rev
39946)
+++ trunk/blender/intern/smoke/CMakeLists.txt 2011-09-05 23:46:08 UTC (rev
39947)
@@ -88,7 +88,7 @@
endif()
if(WITH_FFTW3)
- add_definitions(-DFFTW3=1)
+ add_definitions(-DWITH_FFTW3)
list(APPEND INC
${FFTW3_INCLUDE_DIRS}
)
Modified: trunk/blender/intern/smoke/SConscript
===================================================================
--- trunk/blender/intern/smoke/SConscript 2011-09-05 23:40:52 UTC (rev
39946)
+++ trunk/blender/intern/smoke/SConscript 2011-09-05 23:46:08 UTC (rev
39947)
@@ -16,7 +16,7 @@
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] )
Modified: trunk/blender/intern/smoke/intern/FFT_NOISE.h
===================================================================
--- trunk/blender/intern/smoke/intern/FFT_NOISE.h 2011-09-05 23:40:52 UTC
(rev 39946)
+++ trunk/blender/intern/smoke/intern/FFT_NOISE.h 2011-09-05 23:46:08 UTC
(rev 39947)
@@ -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>
Modified: trunk/blender/intern/smoke/intern/WTURBULENCE.cpp
===================================================================
--- trunk/blender/intern/smoke/intern/WTURBULENCE.cpp 2011-09-05 23:40:52 UTC
(rev 39946)
+++ trunk/blender/intern/smoke/intern/WTURBULENCE.cpp 2011-09-05 23:46:08 UTC
(rev 39947)
@@ -155,7 +155,7 @@
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
Modified: trunk/blender/source/blender/makesrna/intern/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/makesrna/intern/CMakeLists.txt 2011-09-05
23:40:52 UTC (rev 39946)
+++ trunk/blender/source/blender/makesrna/intern/CMakeLists.txt 2011-09-05
23:46:08 UTC (rev 39947)
@@ -200,7 +200,7 @@
endif()
if(WITH_FFTW3)
- add_definitions(-DFFTW3=1)
+ add_definitions(-DWITH_FFTW3)
endif()
if(WITH_SDL)
Modified: trunk/blender/source/blender/makesrna/intern/SConscript
===================================================================
--- trunk/blender/source/blender/makesrna/intern/SConscript 2011-09-05
23:40:52 UTC (rev 39946)
+++ trunk/blender/source/blender/makesrna/intern/SConscript 2011-09-05
23:46:08 UTC (rev 39947)
@@ -71,7 +71,7 @@
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')
Modified: trunk/blender/source/blender/makesrna/intern/rna_smoke.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_smoke.c 2011-09-05
23:40:52 UTC (rev 39946)
+++ trunk/blender/source/blender/makesrna/intern/rna_smoke.c 2011-09-05
23:46:08 UTC (rev 39947)
@@ -121,7 +121,7 @@
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",
""}, */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
