[Bf-committers] make El'Beem compile on MSVC6 for time beeing

[bjornmose]

hi to all stuck on msvc6
i feel fluid sim code will change a bit in future,
however for time beeing i fixed the scons build to work again
with this little patch (see below)

it is even possible to resolve the linker errors working with msvc6 
projects if you link the blender project with the blender_elbeem.lib you 
might have succesfully build with scons.

And no.. i won't set up a msvc6 project for building blender_elbeem.lib 
until things calmed down a bit.

BM

patch ---->
Index: intern/elbeem/intern/cfgparser.cpp
===================================================================
RCS file: /cvsroot/bf-blender/blender/intern/elbeem/intern/cfgparser.cpp,v
retrieving revision 1.3
diff -r1.3 cfgparser.cpp
1233a1234
 >
1235a1237
 >   case 0:
Index: intern/elbeem/intern/lbmfsgrsolver.h
===================================================================
RCS file: /cvsroot/bf-blender/blender/intern/elbeem/intern/lbmfsgrsolver.h,v
retrieving revision 1.4
diff -r1.4 lbmfsgrsolver.h
424c424,426
< 		long long int mAvgNumUsedCells;
---
 > //		long long int mAvgNumUsedCells;
 > //		long long ?  msvc6 says huh on that
 > 		_int64 mAvgNumUsedCells;
2702c2704,2705
< 			" avgcls:"<< (int)(mAvgNumUsedCells/(long long int)D::mStepCnt)<< 
sepStr<<
---
 > //			" avgcls:"<< (int)(mAvgNumUsedCells/(long long 
int)D::mStepCnt)<< sepStr<<
 > 			" avgcls:"<< (int)(mAvgNumUsedCells/(_int64)D::mStepCnt)<< sepStr<<
Index: intern/elbeem/intern/lbminterface.h
===================================================================
RCS file: /cvsroot/bf-blender/blender/intern/elbeem/intern/lbminterface.h,v
retrieving revision 1.4
diff -r1.4 lbminterface.h
301c301,302
< 		void triangulateSurface() { return mpIso->triangulate(); }
---
 > 		// void funcs must not return a value in msvc6
 > 		void triangulateSurface() { mpIso->triangulate(); }
Index: intern/elbeem/intern/ntl_bsptree.cpp
===================================================================
RCS file: /cvsroot/bf-blender/blender/intern/elbeem/intern/ntl_bsptree.cpp,v
retrieving revision 1.2
diff -r1.2 ntl_bsptree.cpp
889c889
< void ntlTree::getChildren(BSPNode *curr, ntlVec3Gfx origin, BSPNode 
*&near, BSPNode *&far) const
---
 > void ntlTree::getChildren(BSPNode *curr, ntlVec3Gfx origin, BSPNode 
*&nearnode, BSPNode *&farnode) const
892,893c892,893
<     near = curr->child[0];
<     far = curr->child[1];
---
 >     nearnode = curr->child[0];
 >     farnode = curr->child[1];
895,896c895,896
<     near = curr->child[1];
<     far = curr->child[0];
---
 >     nearnode = curr->child[1];
 >     farnode = curr->child[0];
Index: intern/elbeem/intern/ntl_bsptree.h
===================================================================
RCS file: /cvsroot/bf-blender/blender/intern/elbeem/intern/ntl_bsptree.h,v
retrieving revision 1.2
diff -r1.2 ntl_bsptree.h
69c69,70
< 		void getChildren(BSPNode *curr, ntlVec3Gfx origin, BSPNode *&near, 
BSPNode *&far) const;
---
 > 		// near / far are old reserved words in msvc6
 > 		void getChildren(BSPNode *curr, ntlVec3Gfx origin, BSPNode 
*&nearnode, BSPNode *&farnode) const;
Index: intern/elbeem/intern/simulation_object.h
===================================================================
RCS file: 
/cvsroot/bf-blender/blender/intern/elbeem/intern/simulation_object.h,v
retrieving revision 1.1
diff -r1.1 simulation_object.h
165c165,168
< 		static const int MAX_DEBDISPSET = 10;
---
 > //		static const int MAX_DEBDISPSET = 10;
 > // so this is a known and documented MSVC6 bug
 > // work around
 > 		enum {MAX_DEBDISPSET = 10};

***** CVS exited normally with code 1 *****