yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2998
committer: Bruno Chareyre <bruno.chareyre@xxxxxxxxxxx>
branch nick: trunk
timestamp: Fri 2012-01-20 19:05:02 +0100
message:
  - remove custom dependencies breaking compilation
modified:
  lib/SConscript


--
lp:yade
https://code.launchpad.net/~yade-dev/yade/trunk

Your team Yade developers is subscribed to branch lp:yade.
To unsubscribe from this branch go to https://code.launchpad.net/~yade-dev/yade/trunk/+edit-subscription

=== modified file 'lib/SConscript'
--- lib/SConscript	2012-01-20 17:31:56 +0000
+++ lib/SConscript	2012-01-20 18:05:02 +0000
@@ -9,6 +9,6 @@
 		+(Split('triangulation/KinematicLocalisationAnalyser.cpp triangulation/Timer.cpp triangulation/basicVTKwritter.cpp triangulation/FlowBoundingSphere.cpp triangulation/Tenseur3.cpp triangulation/TriaxialState.cpp') if 'cgal' in env['features'] else [])
 		+(['opengl/GLUtils.cpp'] if 'opengl' in env['features'] else [])
 		),
- 		],LIBS=['dl','m']+(['taucs','pardiso400_GNU430_IA64','metis','g2c','blas','lapack','pthread','gfortran'] if 'cgal' in env['features'] else [])+[l for l in env['LIBS'] if l!='yade-support']+(['glut','GL','GLU'] if 'opengl' in env['features'] else []),LINKFLAGS=env['LINKFLAGS']+['-pthread','-Wl','-Bsymbolic-function','-ansi'],CXXFLAGS=env['CXXFLAGS']+['-pthread','-fPIC','-frounding-math','-ansi']
+ 		],LIBS=['dl','m']+[l for l in env['LIBS'] if l!='yade-support']+(['glut','GL','GLU'] if 'opengl' in env['features'] else []),LINKFLAGS=env['LINKFLAGS']+['-pthread','-Wl','-Bsymbolic-function','-ansi'],CXXFLAGS=env['CXXFLAGS']+['-pthread','-fPIC','-frounding-math','-ansi']
 ))