diff options
author | Campbell Barton <ideasman42@gmail.com> | 2009-07-03 02:22:35 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2009-07-03 02:22:35 +0400 |
commit | fb5f9273eba4b30e1aa0573388367592b18bdbba (patch) | |
tree | 602d0f284227f636dbfb9478ca186ecbadde6932 | |
parent | 093ff8202ced6391a2ef657abe42615672146954 (diff) |
cmake support for building without fluidsim
-rw-r--r-- | source/blender/editors/CMakeLists.txt | 4 | ||||
-rw-r--r-- | source/blender/makesrna/intern/CMakeLists.txt | 4 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_fluidsim.c | 4 |
3 files changed, 12 insertions, 0 deletions
diff --git a/source/blender/editors/CMakeLists.txt b/source/blender/editors/CMakeLists.txt index 914fdaa4bc6..b7a868ad537 100644 --- a/source/blender/editors/CMakeLists.txt +++ b/source/blender/editors/CMakeLists.txt @@ -64,6 +64,10 @@ IF(WITH_FFMPEG) ADD_DEFINITIONS(-DWITH_FFMPEG) ENDIF(WITH_FFMPEG) +IF(NOT WITH_ELBEEM) + ADD_DEFINITIONS(-DDISABLE_ELBEEM) +ENDIF(NOT WITH_ELBEEM) + IF(WITH_PYTHON) SET(INC ${INC} ${PYTHON_INC}) ELSE(WITH_PYTHON) diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt index 963e4f9aeff..3400b69ee38 100644 --- a/source/blender/makesrna/intern/CMakeLists.txt +++ b/source/blender/makesrna/intern/CMakeLists.txt @@ -62,6 +62,10 @@ IF(WITH_FFMPEG) ADD_DEFINITIONS(-DWITH_FFMPEG) ENDIF(WITH_FFMPEG) +IF(NOT WITH_ELBEEM) + ADD_DEFINITIONS(-DDISABLE_ELBEEM) +ENDIF(NOT WITH_ELBEEM) + # Build makesrna executable ADD_EXECUTABLE(makesrna ${SRC} ${INC_FILES}) TARGET_LINK_LIBRARIES(makesrna bf_dna) diff --git a/source/blender/makesrna/intern/rna_fluidsim.c b/source/blender/makesrna/intern/rna_fluidsim.c index 4316666700f..44a50fbae25 100644 --- a/source/blender/makesrna/intern/rna_fluidsim.c +++ b/source/blender/makesrna/intern/rna_fluidsim.c @@ -130,10 +130,14 @@ static void rna_FluidSettings_update_type(bContext *C, PointerRNA *ptr) static void rna_DomainFluidSettings_memory_estimate_get(PointerRNA *ptr, char *value) { +#ifdef DISABLE_ELBEEM + value[0]= '\0'; +#else Object *ob= (Object*)ptr->id.data; FluidsimSettings *fss= (FluidsimSettings*)ptr->data; fluid_estimate_memory(ob, fss, value); +#endif } static int rna_DomainFluidSettings_memory_estimate_length(PointerRNA *ptr) |