[Bf-committers] msvc6 build broken due to fluid sim
bjornmose
bjornmose at gmx.net
Thu Sep 22 01:32:30 CEST 2005
JLuc Peuriere wrote:
> lukep (JLuc Peuriere ) 2005/09/18 15:27:12 CEST
>
> Modified files:
> blender/intern Makefile SConscript
> blender/source Makefile nan_definitions.mk
> blender/source/blender/blenkernel BKE_modifier.h SConscript
> blender/source/blender/blenkernel/intern DerivedMesh.c
> Makefile depsgraph.c
> object.c
> blender/source/blender/blenloader/intern readfile.c
> writefile.c
> blender/source/blender/include butspace.h
> blender/source/blender/makesdna DNA_object_types.h
> blender/source/blender/makesdna/intern makesdna.c
> blender/source/blender/src Makefile SConscript
> buttons_object.c
> blender/tools/scons/bs bs_libs.py
> Added files:
> blender/intern/elbeem COPYING COPYING_trimesh2 Makefile
> SConscript
> blender/intern/elbeem/extern LBM_fluidsim.h
> blender/intern/elbeem/intern Makefile arrays.h attributes.cpp
> attributes.h blendercall.cpp
> cfglexer.cpp cfgparser.cpp
> cfgparser.hpp elbeem.cpp
> factory_fsgr.cpp factory_lbm.h
> globals.h isosurface.cpp
> isosurface.h lbmdimensions.h
> lbmfsgrsolver.h lbmfunctions.h
> lbminterface.cpp lbminterface.h
> mcubes_tables.h
> ntl_blenderdumper.cpp
> ntl_blenderdumper.h
> ntl_bsptree.cpp ntl_bsptree.h
> ntl_geometrybox.cpp
> ntl_geometrybox.h
> ntl_geometryclass.h
> ntl_geometrymodel.cpp
> ntl_geometrymodel.h
> ntl_geometryobject.cpp
> ntl_geometryobject.h
> ntl_geometryshader.h
> ntl_geometrysphere.cpp
> ntl_geometrysphere.h
> ntl_image.cpp ntl_image.h
> ntl_lightobject.cpp
> ntl_lightobject.h ntl_material.h
> ntl_matrices.h ntl_ray.cpp
> ntl_ray.h ntl_raytracer.cpp
> ntl_raytracer.h
> ntl_renderglobals.h
> ntl_rndstream.h ntl_scene.cpp
> ntl_scene.h ntl_triangle.h
> ntl_vector3dim.h parametrizer.cpp
> parametrizer.h particletracer.cpp
> particletracer.h
> simulation_object.cpp
> simulation_object.h typeslbm.h
> utilities.cpp utilities.h
>
> Log:
> initial commit of the fluid simulator.
> Ton reviewed and gave his blessing.
> Zr, can you have a look ?
>
> see :
> http://projects.blender.org/tracker/?func=detail&atid=127&aid=3039&group_id=9
>
> for initial comments.
>
> N_T : the solver itself (elbeem) needs some works to get rid of
> warnings
>
> Revision Changes Path
> 1.16 +2 -2 blender/intern/Makefile
> <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/Makefile.diff?r1=1.15&r2=1.16&cvsroot=bf-blender>
> 1.5 +1 -0 blender/intern/SConscript
> <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/SConscript.diff?r1=1.4&r2=1.5&cvsroot=bf-blender>
> 1.91 +2 -1 blender/source/Makefile
> <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/Makefile.diff?r1=1.90&r2=1.91&cvsroot=bf-blender>
> 1.75 +2 -1 blender/source/nan_definitions.mk
> <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/nan_definitions.mk.diff?r1=1.74&r2=1.75&cvsroot=bf-blender>
> 1.17 +9 -1 blender/source/blender/blenkernel/BKE_modifier.h
> <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/blenkernel/BKE_modifier.h.diff?r1=1.16&r2=1.17&cvsroot=bf-blender>
> 1.18 +2 -0 blender/source/blender/blenkernel/SConscript
> <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/blenkernel/SConscript.diff?r1=1.17&r2=1.18&cvsroot=bf-blender>
> 1.86 +386 -2 blender/source/blender/blenkernel/intern/DerivedMesh.c
> <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/blenkernel/intern/DerivedMesh.c.diff?r1=1.85&r2=1.86&cvsroot=bf-blender>
> 1.13 +2 -1 blender/source/blender/blenkernel/intern/Makefile
> <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/blenkernel/intern/Makefile.diff?r1=1.12&r2=1.13&cvsroot=bf-blender>
> 1.20 +12 -1 blender/source/blender/blenkernel/intern/depsgraph.c
> <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/blenkernel/intern/depsgraph.c.diff?r1=1.19&r2=1.20&cvsroot=bf-blender>
> 1.74 +10 -1 blender/source/blender/blenkernel/intern/object.c
> <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/blenkernel/intern/object.c.diff?r1=1.73&r2=1.74&cvsroot=bf-blender>
> 1.188 +7 -1 blender/source/blender/blenloader/intern/readfile.c
> <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/blenloader/intern/readfile.c.diff?r1=1.187&r2=1.188&cvsroot=bf-blender>
> 1.59 +2 -1 blender/source/blender/blenloader/intern/writefile.c
> <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/blenloader/intern/writefile.c.diff?r1=1.58&r2=1.59&cvsroot=bf-blender>
> 1.56 +5 -1 blender/source/blender/include/butspace.h
> <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/include/butspace.h.diff?r1=1.55&r2=1.56&cvsroot=bf-blender>
> 1.38 +6 -1 blender/source/blender/makesdna/DNA_object_types.h
> <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/makesdna/DNA_object_types.h.diff?r1=1.37&r2=1.38&cvsroot=bf-blender>
> 1.19 +4 -2 blender/source/blender/makesdna/intern/makesdna.c
> <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/makesdna/intern/makesdna.c.diff?r1=1.18&r2=1.19&cvsroot=bf-blender>
> 1.25 +2 -1 blender/source/blender/src/Makefile
> <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/Makefile.diff?r1=1.24&r2=1.25&cvsroot=bf-blender>
> 1.26 +3 -1 blender/source/blender/src/SConscript
> <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/SConscript.diff?r1=1.25&r2=1.26&cvsroot=bf-blender>
> 1.115 +185 -1 blender/source/blender/src/buttons_object.c
> <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/buttons_object.c.diff?r1=1.114&r2=1.115&cvsroot=bf-blender>
> 1.9 +2 -1 blender/tools/scons/bs/bs_libs.py
> <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/tools/scons/bs/bs_libs.py.diff?r1=1.8&r2=1.9&cvsroot=bf-blender>
> _______________________________________________
> Bf-blender-cvs mailing list
> Bf-blender-cvs at projects.blender.org
> http://projects.blender.org/mailman/listinfo/bf-blender-cvs
>
>
Hum .. Spent some time trying to get SCONS on msvc6 working ..
but that code needs review badly -->
MSVC6 refuses compiling for some reasons:
1. STL <vector> and <map> variables should have namespace .. e.g:
std::vector .. (yadada) since in C++ allows to redifine 'em in any
namespace. So a R3::vector.. might be a class repesenting something we
know from linear algebra ..
2. MSVC6 does not allow -->
{
for (int i .. )
{}
for (int i .. )
{}
}
for reasons i don't know, but compiler
complains about 'redefinition of variable'
while
{
int i;
for (i .. )
{}
for (i .. )
{}
}
goes OK
3. there are macros for shortcutting 'for' statements
like *FORDF1* ( finding this i gave up compiling with msvc6 )
which finnaly make repairing msvc6 builds impossible (see 2)
so ..
BM
More information about the Bf-committers
mailing list