- corrected MSVC6 fix in ntl_vector3dim.h (caused problems with SDL includes)

- removed print from SConscript

intern/elbeem/SConscript

@@ -2,7 +2,7 @@
 Import ('library_env')
 Import('user_options_dict');
 
-print "Including El'Beem Fluid Simulation..."
+# print "Including El'Beem Fluid Simulation..." # debug
 elbeem_env = library_env.Copy();
 elbeem_env.Append(CPPDEFINES= 'NOGUI');
 elbeem_env.Append(CPPDEFINES= [('ELBEEM_BLENDER',1)] );

intern/elbeem/intern/factory_fsgr.cpp

@@ -7,22 +7,11 @@
  *
  *****************************************************************************/
 
-#include "factory_lbm.h"
-
-// compiler sanity check
-#ifndef LBMDIM
-#if LBMDIM!=2
-#if LBMDIM!=3
-print("Error - LBMDIM has to be defined (2/3)!");
-#endif
-#endif
-#endif
-
 // disable sometimes to speed up compiling/2d tests
 #define DISABLE 0
 
-#include "lbmdimensions.h"
 #include "lbmfsgrsolver.h"
+#include "factory_lbm.h"
 
 //! lbm factory functions
 LbmSolverInterface* createSolverLbmFsgr() {

intern/elbeem/intern/lbmfsgrsolver.h

@@ -11,6 +11,22 @@
 
 
 #ifndef LBMFSGRSOLVER_H
+
+// blender interface
+#if ELBEEM_BLENDER==1
+// warning - for MSVC this has to be included
+// _before_ ntl_vector3dim
+#include "SDL.h"
+#include "SDL_thread.h"
+#include "SDL_mutex.h"
+extern "C" {
+	void simulateThreadIncreaseFrame(void);
+	extern SDL_mutex *globalBakeLock;
+	extern int        globalBakeState;
+	extern int        globalBakeFrame;
+}
+#endif // ELBEEM_BLENDER==1
+
 #include "utilities.h"
 #include "lbmdimensions.h"
 #include "lbmfunctions.h"
@@ -24,18 +40,6 @@
 #define PARALLEL 0
 #endif // PARALLEL
 
-// blender interface
-#if ELBEEM_BLENDER==1
-#include "SDL.h"
-#include "SDL_thread.h"
-#include "SDL_mutex.h"
-extern "C" {
-	void simulateThreadIncreaseFrame(void);
-	extern SDL_mutex *globalBakeLock;
-	extern int        globalBakeState;
-	extern int        globalBakeFrame;
-}
-#endif // ELBEEM_BLENDER==1
 
 #ifndef LBMMODEL_DEFINED
 // force compiler error!

intern/elbeem/intern/ntl_vector3dim.h

@@ -23,12 +23,18 @@
 #include <string.h>
 #include <stdio.h>
 
-// hack for crappy MSVC6.0 compiler
+// hack for dxxx MSVC6.0 compiler
 #ifdef _MSC_VER
+#if _MSC_VER < 1300
 #define for     if(false); else for
 #define map     std::map
 #define vector  std::vector
 #define string  std::string
+#else // _MSC_VER < 1300 , 7.0 or higher
+using std::map;
+using std::vector;
+using std::string;
+#endif
 #else // MSVC6
 // for proper compilers...
 using std::map;