diff options
author | Nils Thuerey <nils@thuerey.de> | 2005-09-28 21:52:06 +0400 |
---|---|---|
committer | Nils Thuerey <nils@thuerey.de> | 2005-09-28 21:52:06 +0400 |
commit | 227c88c2931e9afdc685bb335bf667e980a4eab4 (patch) | |
tree | 4925cfcfa0e21b1029123f72be30a03fd357f032 /intern | |
parent | d7b441473a0e00c49c7986ea98bb87b4537247f8 (diff) |
- corrected MSVC6 fix in ntl_vector3dim.h (caused problems with SDL includes)
- removed print from SConscript
Diffstat (limited to 'intern')
-rw-r--r-- | intern/elbeem/SConscript | 2 | ||||
-rw-r--r-- | intern/elbeem/intern/factory_fsgr.cpp | 13 | ||||
-rw-r--r-- | intern/elbeem/intern/lbmfsgrsolver.h | 28 | ||||
-rw-r--r-- | intern/elbeem/intern/ntl_vector3dim.h | 8 |
4 files changed, 25 insertions, 26 deletions
diff --git a/intern/elbeem/SConscript b/intern/elbeem/SConscript index 3f859752b26..c882f5186e3 100644 --- a/intern/elbeem/SConscript +++ b/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)] ); diff --git a/intern/elbeem/intern/factory_fsgr.cpp b/intern/elbeem/intern/factory_fsgr.cpp index c64f54cc7ad..8b5128a0254 100644 --- a/intern/elbeem/intern/factory_fsgr.cpp +++ b/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() { diff --git a/intern/elbeem/intern/lbmfsgrsolver.h b/intern/elbeem/intern/lbmfsgrsolver.h index 22f1f361644..d9622fd65ac 100644 --- a/intern/elbeem/intern/lbmfsgrsolver.h +++ b/intern/elbeem/intern/lbmfsgrsolver.h @@ -11,21 +11,11 @@ #ifndef LBMFSGRSOLVER_H -#include "utilities.h" -#include "lbmdimensions.h" -#include "lbmfunctions.h" -#include "ntl_scene.h" -#include <stdio.h> - -#if PARALLEL==1 -#include <omp.h> -#endif // PARALLEL=1 -#ifndef PARALLEL -#define PARALLEL 0 -#endif // PARALLEL // 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" @@ -37,6 +27,20 @@ extern "C" { } #endif // ELBEEM_BLENDER==1 +#include "utilities.h" +#include "lbmdimensions.h" +#include "lbmfunctions.h" +#include "ntl_scene.h" +#include <stdio.h> + +#if PARALLEL==1 +#include <omp.h> +#endif // PARALLEL=1 +#ifndef PARALLEL +#define PARALLEL 0 +#endif // PARALLEL + + #ifndef LBMMODEL_DEFINED // force compiler error! ERROR - define model first! diff --git a/intern/elbeem/intern/ntl_vector3dim.h b/intern/elbeem/intern/ntl_vector3dim.h index ca039883919..fe43fab462f 100644 --- a/intern/elbeem/intern/ntl_vector3dim.h +++ b/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; |