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

This commit is contained in:
Campbell Barton
2011-09-05 23:46:08 +00:00
parent 0991bed413
commit bf5a6531a6
7 changed files with 7 additions and 7 deletions

View 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}
)

View 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] )

View 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>

View 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