yade-dev team mailing list archive

["jerier@xxxxxxxxxxxxxxx" <jerier@xxxxxxxxxxxxxxx>]

Hello Vaclav,

 Sorry for the mistakes are generated by my post. Thank you for your
corrections. 

I thought that the libTesselationWrapper.a file was integrated within the
Yade version in the extra file !!!???

Concerning the mark >>>>>>>> etc in the code, i didn't receive by the Yade
mail list my commit. I don't know why ? but if you have the files, can you
send me them because in my files (TriaxialTest.cpp,
TriaxialCompressionEngine.cpp, ...), i have not these marks.

I must understand what happen. 

Thank again for all these informations. Now, i will exclude in my commit
the files concerning the VolumicContactLaw. 

JF



Original Message:
-----------------
From: Václav ©milauer eudoxos@xxxxxxxx
Date: Sat, 25 Oct 2008 21:04:39 +0200
To: yade-dev@xxxxxxxxxxxxxxxxxxx
Subject: [Yade-dev] trunk doesn't compile (TesselationWrapper)


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

_______________________________________________
Mailing list: https://launchpad.net/~yade-dev
Post to     : yade-dev@xxxxxxxxxxxxxxxxxxx
Unsubscribe : https://launchpad.net/~yade-dev
More help   : https://help.launchpad.net/ListHelp










--------------------------------------------------------------------
myhosting.com - Premium Microsoft® Windows® and Linux web and application
hosting - http://link.myhosting.com/myhosting