diff options
| author | Daniel Genrich <daniel.genrich@gmx.net> | 2009-08-09 14:55:25 +0400 |
|---|---|---|
| committer | Daniel Genrich <daniel.genrich@gmx.net> | 2009-08-09 14:55:25 +0400 |
| commit | 054ed5a50b6b7396f70d1b5353d7ada36e14e19f (patch) | |
| tree | 3dcc4ed5a37254e304fc454e048dee257f963d54 /intern/smoke | |
| parent | a4755dcf2bb1c55bfee913509108a6e2e3f15541 (diff) | |
Smoke:
* WITH_BF_FFTW3 flag --> fftw3 scons + cmake settings refined.
* Disabled by default since mac + win32 libs missing. Works already on win64 + linux (with installed fftw3 libs)
Diffstat (limited to 'intern/smoke')
| -rw-r--r-- | intern/smoke/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | intern/smoke/SConscript | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/intern/smoke/CMakeLists.txt b/intern/smoke/CMakeLists.txt index 221bc911d20..0db6acb683f 100644 --- a/intern/smoke/CMakeLists.txt +++ b/intern/smoke/CMakeLists.txt @@ -24,7 +24,7 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC ${PNG_INC} ${ZLIB_INC} intern ../../extern/bullet2/src ../memutil ../guardealloc ${FFTW3_INC}) +SET(INC ${PNG_INC} ${ZLIB_INC} intern ../../extern/bullet2/src ../memutil ../guardealloc) FILE(GLOB SRC intern/*.cpp) @@ -34,6 +34,7 @@ ENDIF(WITH_OPENMP) IF(WITH_FFTW3) ADD_DEFINITIONS(-DFFTW3=1) + SET(INC ${INC} ${FFTW3_INC}) ENDIF(WITH_FFTW3) diff --git a/intern/smoke/SConscript b/intern/smoke/SConscript index c427764e19e..ba8a7932e03 100644 --- a/intern/smoke/SConscript +++ b/intern/smoke/SConscript @@ -10,6 +10,9 @@ if env['WITH_BF_OPENMP']: incs = env['BF_PNG_INC'] + ' ' + env['BF_ZLIB_INC'] incs += ' intern ../../extern/bullet2/src ../memutil ../guardealloc ' -# incs += env['BF_FFTW3_INC'] + +if env['WITH_BF_FFTW3']: + defs += ' FFTW3=1' + incs += env['BF_FFTW3_INC'] env.BlenderLib ('bf_smoke', sources, Split(incs), Split(defs), libtype=['intern'], priority=[40] ) |