- last bugfix caused problems when using the makefile, this should work as well now

2005-12-01 16:10:38 +00:00
parent 64a6fde567
commit 466c92c91d
2 changed files with 5 additions and 0 deletions
--- a/intern/elbeem/SConscript
+++ b/intern/elbeem/SConscript
@@ -11,6 +11,7 @@ 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'])
+	elbeem_env.Append(CPPDEFINES= 'ELBEEM_DUMMIES');
 	# dummy interface build
 	Sources = [ 
 		"intern/utilities.cpp",
--- a/intern/elbeem/intern/blenderdummy.cpp
+++ b/intern/elbeem/intern/blenderdummy.cpp
@@ -9,6 +9,8 @@
 *
 *****************************************************************************/
 
+#ifdef ELBEEM_DUMMIES
+
 #include <stdlib.h>
 #include "ntl_vector3dim.h"

@@ -32,3 +34,5 @@ void calculateMemreqEstimate( int resx,int resy,int resz, int refine,
 	*reqret =  0.0; // dummy
 }

+#endif // ELBEEM_DUMMIES
+