yade-dev team mailing list archive

[Václav Šmilauer <eudoxos@xxxxxxxx>]

It seems that Jean-François commited broken code, including some
conflicts that svn marks with >>>>>>>> etc in the code. Please always
make sure that your code compiles before commiting.

I added conditional compilation of VolumicContactLaw, so that it is
compiled only in case the file
extra/triangulation/libTesselationWrapper.a exists. Otherwise, linking
would fail. It is at the beginning of pkg/dem/SConscript, kif you need
to change that.

I commited both fixes, so it compiles at least for those who don't have
TesselationWrapper.

Regards, Vaclav