[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41369] trunk/blender: Modifier compilation tweaks (Blender conference commit)
Thomas Dinges
blender at dingto.org
Sun Oct 30 01:56:08 CEST 2011
Revision: 41369
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41369
Author: dingto
Date: 2011-10-29 23:56:07 +0000 (Sat, 29 Oct 2011)
Log Message:
-----------
Modifier compilation tweaks (Blender conference commit)
* Fluid compilation: Inverse the compile flag from DISABLE_ELBEEM to WITH_MOD_FLUID for consistency. (scons/cmake)
* Use WITH_BF_FLUID in your user config (scons)
* Add support for scons to disable build with Decimate and Boolean modifier.
(WITH_BF_DECIMATE and WITH_BF_BOOLEAN)
Modified Paths:
--------------
trunk/blender/SConstruct
trunk/blender/build_files/scons/tools/btools.py
trunk/blender/intern/SConscript
trunk/blender/source/blender/blenkernel/CMakeLists.txt
trunk/blender/source/blender/blenkernel/SConscript
trunk/blender/source/blender/blenkernel/intern/effect.c
trunk/blender/source/blender/blenkernel/intern/particle_system.c
trunk/blender/source/blender/editors/physics/CMakeLists.txt
trunk/blender/source/blender/editors/physics/physics_fluid.c
trunk/blender/source/blender/makesrna/intern/CMakeLists.txt
trunk/blender/source/blender/makesrna/intern/rna_fluidsim.c
trunk/blender/source/blender/modifiers/CMakeLists.txt
trunk/blender/source/blender/modifiers/SConscript
trunk/blender/source/blender/modifiers/intern/MOD_fluidsim_util.c
Modified: trunk/blender/SConstruct
===================================================================
--- trunk/blender/SConstruct 2011-10-29 16:14:38 UTC (rev 41368)
+++ trunk/blender/SConstruct 2011-10-29 23:56:07 UTC (rev 41369)
@@ -253,7 +253,9 @@
target_env_defs['WITH_BF_BULLET'] = False
target_env_defs['WITH_BF_BINRELOC'] = False
target_env_defs['BF_BUILDINFO'] = False
- target_env_defs['BF_NO_ELBEEM'] = True
+ target_env_defs['WITH_BF_FLUID'] = False
+ target_env_defs['WITH_BF_DECIMATE'] = False
+ target_env_defs['WITH_BF_BOOLEAN'] = False
target_env_defs['WITH_BF_PYTHON'] = False
target_env_defs['WITH_BF_3DMOUSE'] = False
@@ -323,9 +325,9 @@
if 'blendernogame' in B.targets:
env['WITH_BF_GAMEENGINE'] = False
-# disable elbeem (fluidsim) compilation?
-if env['BF_NO_ELBEEM'] == 1:
- env['CPPFLAGS'].append('-DDISABLE_ELBEEM')
+# build without elbeem (fluidsim)?
+if env['WITH_BF_FLUID'] == 1:
+ env['CPPFLAGS'].append('-DWITH_MOD_FLUID')
if btools.ENDIAN == "big":
Modified: trunk/blender/build_files/scons/tools/btools.py
===================================================================
--- trunk/blender/build_files/scons/tools/btools.py 2011-10-29 16:14:38 UTC (rev 41368)
+++ trunk/blender/build_files/scons/tools/btools.py 2011-10-29 23:56:07 UTC (rev 41369)
@@ -150,7 +150,9 @@
'BF_GHOST_DEBUG',
'WITH_BF_RAYOPTIMIZATION',
'BF_RAYOPTIMIZATION_SSE_FLAGS',
- 'BF_NO_ELBEEM',
+ 'WITH_BF_FLUID',
+ 'WITH_BF_DECIMATE',
+ 'WITH_BF_BOOLEAN',
'WITH_BF_CXX_GUARDEDALLOC',
'WITH_BF_JEMALLOC', 'WITH_BF_STATICJEMALLOC', 'BF_JEMALLOC', 'BF_JEMALLOC_INC', 'BF_JEMALLOC_LIBPATH', 'BF_JEMALLOC_LIB', 'BF_JEMALLOC_LIB_STATIC',
'BUILDBOT_BRANCH', 'WITH_BF_3DMOUSE', 'WITH_BF_STATIC3DMOUSE', 'BF_3DMOUSE', 'BF_3DMOUSE_INC', 'BF_3DMOUSE_LIB', 'BF_3DMOUSE_LIBPATH', 'BF_3DMOUSE_LIB_STATIC'
@@ -250,7 +252,9 @@
(BoolVariable('WITH_OSX_STATICPYTHON', 'Staticly link to python', True)),
('BF_PYTHON_ABI_FLAGS', 'Python ABI flags (suffix in library version: m, mu, etc)', ''),
- (BoolVariable('BF_NO_ELBEEM', 'Disable Fluid Sim', False)),
+ (BoolVariable('WITH_BF_FLUID', 'Build with Fluid simulation (Elbeem)', True)),
+ (BoolVariable('WITH_BF_DECIMATE', 'Build with decimate modifier', True)),
+ (BoolVariable('WITH_BF_BOOLEAN', 'Build with boolean modifier', True)),
('BF_PROFILE_FLAGS', 'Profiling compiler flags', ''),
(BoolVariable('WITH_BF_OPENAL', 'Use OpenAL if true', False)),
('BF_OPENAL', 'base path for OpenAL', ''),
Modified: trunk/blender/intern/SConscript
===================================================================
--- trunk/blender/intern/SConscript 2011-10-29 16:14:38 UTC (rev 41368)
+++ trunk/blender/intern/SConscript 2011-10-29 23:56:07 UTC (rev 41369)
@@ -22,7 +22,7 @@
# perhaps get rid of intern/csg?
NEW_CSG='false'
-if not env['BF_NO_ELBEEM']:
+if env['WITH_BF_FLUID']:
SConscript(['elbeem/SConscript'])
if NEW_CSG=='false':
Modified: trunk/blender/source/blender/blenkernel/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/blenkernel/CMakeLists.txt 2011-10-29 16:14:38 UTC (rev 41368)
+++ trunk/blender/source/blender/blenkernel/CMakeLists.txt 2011-10-29 23:56:07 UTC (rev 41369)
@@ -323,8 +323,8 @@
add_definitions(-DPARALLEL=1)
endif()
-if(NOT WITH_MOD_FLUID)
- add_definitions(-DDISABLE_ELBEEM)
+if(WITH_MOD_FLUID)
+ add_definitions(-DWITH_MOD_FLUID)
endif()
if(WITH_MOD_SMOKE)
Modified: trunk/blender/source/blender/blenkernel/SConscript
===================================================================
--- trunk/blender/source/blender/blenkernel/SConscript 2011-10-29 16:14:38 UTC (rev 41368)
+++ trunk/blender/source/blender/blenkernel/SConscript 2011-10-29 23:56:07 UTC (rev 41369)
@@ -79,8 +79,8 @@
if env['WITH_BF_OPENMP']:
defs.append('PARALLEL=1')
-if env['BF_NO_ELBEEM']:
- defs.append('DISABLE_ELBEEM')
+if env['WITH_BF_FLUID']:
+ defs.append('WITH_MOD_FLUID')
if env['WITH_BF_LZO']:
incs += ' #/extern/lzo/minilzo'
Modified: trunk/blender/source/blender/blenkernel/intern/effect.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/effect.c 2011-10-29 16:14:38 UTC (rev 41368)
+++ trunk/blender/source/blender/blenkernel/intern/effect.c 2011-10-29 23:56:07 UTC (rev 41369)
@@ -91,12 +91,12 @@
#include "RE_shader_ext.h"
/* fluid sim particle import */
-#ifndef DISABLE_ELBEEM
+#ifdef WITH_MOD_FLUID
#include "DNA_object_fluidsim.h"
#include "LBM_fluidsim.h"
#include <zlib.h>
#include <string.h>
-#endif // DISABLE_ELBEEM
+#endif // WITH_MOD_FLUID
//XXX #include "BIF_screen.h"
Modified: trunk/blender/source/blender/blenkernel/intern/particle_system.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle_system.c 2011-10-29 16:14:38 UTC (rev 41368)
+++ trunk/blender/source/blender/blenkernel/intern/particle_system.c 2011-10-29 23:56:07 UTC (rev 41369)
@@ -95,13 +95,13 @@
#include "RE_shader_ext.h"
/* fluid sim particle import */
-#ifndef DISABLE_ELBEEM
+#ifdef WITH_MOD_FLUID
#include "DNA_object_fluidsim.h"
#include "LBM_fluidsim.h"
#include <zlib.h>
#include <string.h>
-#endif // DISABLE_ELBEEM
+#endif // WITH_MOD_FLUID
/************************************************/
/* Reacting to system events */
@@ -3916,7 +3916,7 @@
}
/* fluid sim particle import handling, actual loading of particles from file */
- #ifndef DISABLE_ELBEEM
+ #ifdef WITH_MOD_FLUID
{
FluidsimModifierData *fluidmd = (FluidsimModifierData *)modifiers_findByType(sim->ob, eModifierType_Fluidsim);
@@ -4009,7 +4009,7 @@
} // fluid sim particles done
}
- #endif // DISABLE_ELBEEM
+ #endif // WITH_MOD_FLUID
}
static int emit_particles(ParticleSimulationData *sim, PTCacheID *pid, float UNUSED(cfra))
Modified: trunk/blender/source/blender/editors/physics/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/physics/CMakeLists.txt 2011-10-29 16:14:38 UTC (rev 41368)
+++ trunk/blender/source/blender/editors/physics/CMakeLists.txt 2011-10-29 23:56:07 UTC (rev 41369)
@@ -45,8 +45,8 @@
physics_intern.h
)
-if(NOT WITH_MOD_FLUID)
- add_definitions(-DDISABLE_ELBEEM)
+if(WITH_MOD_FLUID)
+ add_definitions(-DWITH_BF_FLUID)
endif()
if(WITH_OPENMP)
Modified: trunk/blender/source/blender/editors/physics/physics_fluid.c
===================================================================
--- trunk/blender/source/blender/editors/physics/physics_fluid.c 2011-10-29 16:14:38 UTC (rev 41368)
+++ trunk/blender/source/blender/editors/physics/physics_fluid.c 2011-10-29 23:56:07 UTC (rev 41369)
@@ -85,7 +85,7 @@
#include "physics_intern.h" // own include
/* enable/disable overall compilation */
-#ifndef DISABLE_ELBEEM
+#ifdef WITH_MOD_FLUID
#include "WM_api.h"
@@ -1111,7 +1111,7 @@
/* not implemented yet */
}
-#else /* DISABLE_ELBEEM */
+#else /* WITH_MOD_FLUID */
/* compile dummy functions for disabled fluid sim */
@@ -1135,7 +1135,7 @@
return 0;
}
-#endif /* DISABLE_ELBEEM */
+#endif /* WITH_MOD_FLUID */
/***************************** Operators ******************************/
Modified: trunk/blender/source/blender/makesrna/intern/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/makesrna/intern/CMakeLists.txt 2011-10-29 16:14:38 UTC (rev 41368)
+++ trunk/blender/source/blender/makesrna/intern/CMakeLists.txt 2011-10-29 23:56:07 UTC (rev 41369)
@@ -195,8 +195,8 @@
add_definitions(-DWITH_FFMPEG)
endif()
-if(NOT WITH_MOD_FLUID)
- add_definitions(-DDISABLE_ELBEEM)
+if(WITH_MOD_FLUID)
+ add_definitions(-DWITH_MOD_FLUID)
endif()
if(WITH_FFTW3)
Modified: trunk/blender/source/blender/makesrna/intern/rna_fluidsim.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_fluidsim.c 2011-10-29 16:14:38 UTC (rev 41368)
+++ trunk/blender/source/blender/makesrna/intern/rna_fluidsim.c 2011-10-29 23:56:07 UTC (rev 41369)
@@ -170,7 +170,7 @@
static void rna_DomainFluidSettings_memory_estimate_get(PointerRNA *ptr, char *value)
{
-#ifdef DISABLE_ELBEEM
+#ifndef WITH_MOD_FLUID
(void)ptr;
value[0]= '\0';
#else
@@ -183,7 +183,7 @@
static int rna_DomainFluidSettings_memory_estimate_length(PointerRNA *UNUSED(ptr))
{
-#ifdef DISABLE_ELBEEM
+#ifndef WITH_MOD_FLUID
return 0;
#else
return 31;
Modified: trunk/blender/source/blender/modifiers/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/modifiers/CMakeLists.txt 2011-10-29 16:14:38 UTC (rev 41368)
+++ trunk/blender/source/blender/modifiers/CMakeLists.txt 2011-10-29 23:56:07 UTC (rev 41369)
@@ -111,8 +111,8 @@
)
endif()
-if(NOT WITH_MOD_FLUID)
- add_definitions(-DDISABLE_ELBEEM)
+if(WITH_MOD_FLUID)
+ add_definitions(-DWITH_MOD_FLUID)
endif()
if(WITH_GAMEENGINE)
Modified: trunk/blender/source/blender/modifiers/SConscript
===================================================================
--- trunk/blender/source/blender/modifiers/SConscript 2011-10-29 16:14:38 UTC (rev 41368)
+++ trunk/blender/source/blender/modifiers/SConscript 2011-10-29 23:56:07 UTC (rev 41369)
@@ -13,13 +13,15 @@
defs = []
-# could be made optional
-defs += ['WITH_MOD_BOOLEAN']
-defs += ['WITH_MOD_DECIMATE']
+if env ['WITH_BF_BOOLEAN']:
+ defs.append('WITH_MOD_BOOLEAN')
-if env['BF_NO_ELBEEM']:
- defs.append('DISABLE_ELBEEM')
+if env ['WITH_BF_DECIMATE']:
+ defs.append('WITH_MOD_DECIMATE')
+if env['WITH_BF_FLUID']:
+ defs.append('WITH_MOD_FLUID')
+
if env['WITH_BF_GAMEENGINE']:
incs += ' #/extern/recastnavigation'
defs.append('WITH_GAMEENGINE')
Modified: trunk/blender/source/blender/modifiers/intern/MOD_fluidsim_util.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_fluidsim_util.c 2011-10-29 16:14:38 UTC (rev 41368)
+++ trunk/blender/source/blender/modifiers/intern/MOD_fluidsim_util.c 2011-10-29 23:56:07 UTC (rev 41369)
@@ -62,9 +62,10 @@
// headers for fluidsim bobj meshes
#include "LBM_fluidsim.h"
+
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list