[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22315] branches/blender2.5/blender: Smoke :
Daniel Genrich
daniel.genrich at gmx.net
Sun Aug 9 12:55:30 CEST 2009
Revision: 22315
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22315
Author: genscher
Date: 2009-08-09 12:55:25 +0200 (Sun, 09 Aug 2009)
Log Message:
-----------
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)
Modified Paths:
--------------
branches/blender2.5/blender/CMake/macros.cmake
branches/blender2.5/blender/config/darwin-config.py
branches/blender2.5/blender/config/linux2-config.py
branches/blender2.5/blender/config/win32-vc-config.py
branches/blender2.5/blender/config/win64-vc-config.py
branches/blender2.5/blender/intern/smoke/CMakeLists.txt
branches/blender2.5/blender/intern/smoke/SConscript
branches/blender2.5/blender/source/blender/makesrna/SConscript
branches/blender2.5/blender/tools/Blender.py
branches/blender2.5/blender/tools/btools.py
Modified: branches/blender2.5/blender/CMake/macros.cmake
===================================================================
--- branches/blender2.5/blender/CMake/macros.cmake 2009-08-09 10:05:33 UTC (rev 22314)
+++ branches/blender2.5/blender/CMake/macros.cmake 2009-08-09 10:55:25 UTC (rev 22315)
@@ -50,6 +50,9 @@
IF(WITH_OPENAL)
LINK_DIRECTORIES(${OPENAL_LIBPATH})
ENDIF(WITH_OPENAL)
+ IF(WITH_FFTW3)
+ LINK_DIRECTORIES(${FFTW3_LIBPATH})
+ ENDIF(WITH_FFTW3)
IF(WIN32)
LINK_DIRECTORIES(${PTHREADS_LIBPATH})
@@ -61,7 +64,7 @@
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${PLATFORM_LINKFLAGS} ")
#TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${PYTHON_LIB} ${PYTHON_LINKFLAGS} ${JPEG_LIB} ${PNG_LIB} ${ZLIB_LIB} ${SDL_LIB} ${LLIBS})
- TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${PYTHON_LINKFLAGS} ${JPEG_LIBRARY} ${PNG_LIBRARIES} ${ZLIB_LIBRARIES} ${SDL_LIB} ${LLIBS})
+ TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${PYTHON_LINKFLAGS} ${FFTW3_LIB} ${JPEG_LIBRARY} ${PNG_LIBRARIES} ${ZLIB_LIBRARIES} ${SDL_LIB} ${LLIBS})
# since we are using the local libs for python when compiling msvc projects, we need to add _d when compiling debug versions
Modified: branches/blender2.5/blender/config/darwin-config.py
===================================================================
--- branches/blender2.5/blender/config/darwin-config.py 2009-08-09 10:05:33 UTC (rev 22314)
+++ branches/blender2.5/blender/config/darwin-config.py 2009-08-09 10:55:25 UTC (rev 22315)
@@ -169,6 +169,12 @@
BF_BULLET_INC = '${BF_BULLET}'
BF_BULLET_LIB = 'extern_bullet'
+WITH_BF_FFTW3 = False
+BF_FFTW3 = LIBDIR + '/fftw3'
+BF_FFTW3_INC = '${BF_FFTW3}/include'
+BF_FFTW3_LIB = 'libfftw'
+BF_FFTW3_LIBPATH = '${BF_FFTW3}/lib'
+
#WITH_BF_NSPR = True
#BF_NSPR = $(LIBDIR)/nspr
#BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr
Modified: branches/blender2.5/blender/config/linux2-config.py
===================================================================
--- branches/blender2.5/blender/config/linux2-config.py 2009-08-09 10:05:33 UTC (rev 22314)
+++ branches/blender2.5/blender/config/linux2-config.py 2009-08-09 10:55:25 UTC (rev 22315)
@@ -130,6 +130,12 @@
BF_OPENJPEG_INC = '${BF_OPENJPEG}'
BF_OPENJPEG_LIBPATH='${BF_OPENJPEG}/lib'
+WITH_BF_FFTW3 = False
+BF_FFTW3 = LIBDIR + '/usr'
+BF_FFTW3_INC = '${BF_FFTW3}/include'
+BF_FFTW3_LIB = 'fftw3'
+BF_FFTW3_LIBPATH = '${BF_FFTW3}/lib'
+
WITH_BF_REDCODE = False
BF_REDCODE = '#extern/libredcode'
BF_REDCODE_LIB = ''
Modified: branches/blender2.5/blender/config/win32-vc-config.py
===================================================================
--- branches/blender2.5/blender/config/win32-vc-config.py 2009-08-09 10:05:33 UTC (rev 22314)
+++ branches/blender2.5/blender/config/win32-vc-config.py 2009-08-09 10:55:25 UTC (rev 22315)
@@ -133,6 +133,12 @@
BF_OPENJPEG_INC = '${BF_OPENJPEG}'
BF_OPENJPEG_LIBPATH='${BF_OPENJPEG}/lib'
+WITH_BF_FFTW3 = False
+BF_FFTW3 = LIBDIR + '/fftw3'
+BF_FFTW3_INC = '${BF_FFTW3}/include'
+BF_FFTW3_LIB = 'libfftw'
+BF_FFTW3_LIBPATH = '${BF_FFTW3}/lib'
+
WITH_BF_REDCODE = False
BF_REDCODE_INC = '#extern'
Modified: branches/blender2.5/blender/config/win64-vc-config.py
===================================================================
--- branches/blender2.5/blender/config/win64-vc-config.py 2009-08-09 10:05:33 UTC (rev 22314)
+++ branches/blender2.5/blender/config/win64-vc-config.py 2009-08-09 10:55:25 UTC (rev 22315)
@@ -136,6 +136,12 @@
BF_OPENJPEG_INC = '${BF_OPENJPEG}'
BF_OPENJPEG_LIBPATH='${BF_OPENJPEG}/lib'
+WITH_BF_FFTW3 = True
+BF_FFTW3 = LIBDIR + '/fftw3'
+BF_FFTW3_INC = '${BF_FFTW3}/include'
+BF_FFTW3_LIB = 'libfftw'
+BF_FFTW3_LIBPATH = '${BF_FFTW3}/lib'
+
WITH_BF_REDCODE = False
BF_REDCODE_INC = '#extern'
Modified: branches/blender2.5/blender/intern/smoke/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/intern/smoke/CMakeLists.txt 2009-08-09 10:05:33 UTC (rev 22314)
+++ branches/blender2.5/blender/intern/smoke/CMakeLists.txt 2009-08-09 10:55:25 UTC (rev 22315)
@@ -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 @@
IF(WITH_FFTW3)
ADD_DEFINITIONS(-DFFTW3=1)
+ SET(INC ${INC} ${FFTW3_INC})
ENDIF(WITH_FFTW3)
Modified: branches/blender2.5/blender/intern/smoke/SConscript
===================================================================
--- branches/blender2.5/blender/intern/smoke/SConscript 2009-08-09 10:05:33 UTC (rev 22314)
+++ branches/blender2.5/blender/intern/smoke/SConscript 2009-08-09 10:55:25 UTC (rev 22315)
@@ -10,6 +10,9 @@
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] )
Modified: branches/blender2.5/blender/source/blender/makesrna/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/SConscript 2009-08-09 10:05:33 UTC (rev 22314)
+++ branches/blender2.5/blender/source/blender/makesrna/SConscript 2009-08-09 10:55:25 UTC (rev 22315)
@@ -36,5 +36,8 @@
if env['WITH_BF_GAMEENGINE']:
defs.append('GAMEBLENDER=1')
+
+if env['WITH_BF_FFTW3']:
+ defs.append('FFTW3=1')
env.BlenderLib ( 'bf_rna', objs, Split(incs), defines=defs, libtype=['core'], priority = [195] )
Modified: branches/blender2.5/blender/tools/Blender.py
===================================================================
--- branches/blender2.5/blender/tools/Blender.py 2009-08-09 10:05:33 UTC (rev 22314)
+++ branches/blender2.5/blender/tools/Blender.py 2009-08-09 10:55:25 UTC (rev 22315)
@@ -131,6 +131,8 @@
libincs += Split(lenv['BF_OPENEXR_LIBPATH'])
if lenv['WITH_BF_STATICOPENEXR']:
statlibs += Split(lenv['BF_OPENEXR_LIB_STATIC'])
+ if lenv['WITH_BF_FFTW3']:
+ libincs += Split(lenv['BF_FFTW3_LIBPATH'])
if lenv['WITH_BF_INTERNATIONAL']:
libincs += Split(lenv['BF_GETTEXT_LIBPATH'])
if lenv['WITH_BF_OPENAL']:
@@ -183,6 +185,8 @@
syslibs += Split(lenv['BF_FFMPEG_LIB'])
if lenv['WITH_BF_OGG']:
syslibs += Split(lenv['BF_OGG_LIB'])
+ if lenv['WITH_BF_FFTW3']:
+ syslibs += Split(lenv['BF_FFTW3_LIB'])
if lenv['WITH_BF_SDL']:
syslibs += Split(lenv['BF_SDL_LIB'])
if not lenv['WITH_BF_STATICOPENGL']:
Modified: branches/blender2.5/blender/tools/btools.py
===================================================================
--- branches/blender2.5/blender/tools/btools.py 2009-08-09 10:05:33 UTC (rev 22314)
+++ branches/blender2.5/blender/tools/btools.py 2009-08-09 10:55:25 UTC (rev 22315)
@@ -48,6 +48,7 @@
'BF_WINTAB', 'BF_WINTAB_INC',
'WITH_BF_FREETYPE', 'BF_FREETYPE', 'BF_FREETYPE_INC', 'BF_FREETYPE_LIB', 'BF_FREETYPE_LIBPATH',
'WITH_BF_QUICKTIME', 'BF_QUICKTIME', 'BF_QUICKTIME_INC', 'BF_QUICKTIME_LIB', 'BF_QUICKTIME_LIBPATH',
+ 'WITH_BF_FFTW3', 'BF_FFTW3', 'BF_FFTW3_INC', 'BF_FFTW3_LIB', 'BF_FFTW3_LIBPATH',
'WITH_BF_STATICOPENGL', 'BF_OPENGL', 'BF_OPENGL_INC', 'BF_OPENGL_LIB', 'BF_OPENGL_LIBPATH', 'BF_OPENGL_LIB_STATIC',
'WITH_BF_PLAYER',
'WITH_BF_NOBLENDER',
@@ -291,6 +292,12 @@
('BF_QUICKTIME_INC', 'QuickTime include path', ''),
('BF_QUICKTIME_LIB', 'QuickTime library', ''),
('BF_QUICKTIME_LIBPATH', 'QuickTime library path', ''),
+
+ (BoolVariable('WITH_BF_FFTW3', 'Use FFTW3 if true', False)),
+ ('BF_FFTW3', 'FFTW3 base path', ''),
+ ('BF_FFTW3_INC', 'FFTW3 include path', ''),
+ ('BF_FFTW3_LIB', 'FFTW3 library', ''),
+ ('BF_FFTW3_LIBPATH', 'FFTW3 library path', ''),
(BoolVariable('WITH_BF_STATICOPENGL', 'Use MESA if true', True)),
('BF_OPENGL', 'OpenGL base path', ''),
More information about the Bf-blender-cvs
mailing list