From 466c92c91db32e349dd67d1457b5d29a5f6046f3 Mon Sep 17 00:00:00 2001
From: Nils Thuerey <nils@thuerey.de>
Date: Thu, 1 Dec 2005 16:10:38 +0000
Subject: [PATCH] - last bugfix caused problems when using the makefile, this
 should work as well now

---
 intern/elbeem/SConscript              | 1 +
 intern/elbeem/intern/blenderdummy.cpp | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/intern/elbeem/SConscript b/intern/elbeem/SConscript
index d0ccff153b4..5d30b58a982 100644
--- 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",
diff --git a/intern/elbeem/intern/blenderdummy.cpp b/intern/elbeem/intern/blenderdummy.cpp
index e5f576b5538..3111c9359dd 100644
--- 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
+