diff options
| author | Nils Thuerey <nils@thuerey.de> | 2005-12-01 18:44:08 +0300 |
|---|---|---|
| committer | Nils Thuerey <nils@thuerey.de> | 2005-12-01 18:44:08 +0300 |
| commit | ee20ed8e6703587f7ded5e1d28f61a29bc19aa4f (patch) | |
| tree | b79ae30f8b670563d1a0d51c96452f39c36ea2ac /intern | |
| parent | 8a7242ff16286a5f2c1ef075c07d588aa59c7fd7 (diff) | |
- this should fix bug #3468 (scons problem with fluidsim off)
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/elbeem/SConscript | 1 | ||||
| -rw-r--r-- | intern/elbeem/intern/blenderdummy.cpp | 17 |
2 files changed, 17 insertions, 1 deletions
diff --git a/intern/elbeem/SConscript b/intern/elbeem/SConscript index 3ef20b9be3a..d0ccff153b4 100644 --- a/intern/elbeem/SConscript +++ b/intern/elbeem/SConscript @@ -10,6 +10,7 @@ elbeem_env.Append(CPPDEFINES= [('ELBEEM_BLENDER',1)] ); if use_fluidsim=='false': # print "El'Beem Fluid Simulation Disabled..." # debug elbeem_env.Append (CPPPATH = user_options_dict['PNG_INCLUDE']) + elbeem_env.Append (CPPPATH = user_options_dict['SDL_INCLUDE']) # dummy interface build Sources = [ "intern/utilities.cpp", diff --git a/intern/elbeem/intern/blenderdummy.cpp b/intern/elbeem/intern/blenderdummy.cpp index 4d672dee528..e5f576b5538 100644 --- a/intern/elbeem/intern/blenderdummy.cpp +++ b/intern/elbeem/intern/blenderdummy.cpp @@ -10,10 +10,25 @@ *****************************************************************************/ #include <stdlib.h> +#include "ntl_vector3dim.h" extern "C" int performElbeemSimulation(char *cfgfilename) { - return 1; + return 1; // dummy }; +// dummies from intern/elbeem/intern/solver_interface.cpp +// for utilities.cpp + +void initGridSizes(int &sizex, int &sizey, int &sizez, + ntlVec3Gfx &geoStart, ntlVec3Gfx &geoEnd, + int mMaxRefine, bool parallel) +{ + // dummy +} + +void calculateMemreqEstimate( int resx,int resy,int resz, int refine, + double *reqret, string *reqstr) { + *reqret = 0.0; // dummy +} |