yade-dev team mailing list archive
-
yade-dev team
-
Mailing list archive
-
Message #06897
[Branch ~yade-dev/yade/trunk] Rev 2700: 1. yade-support plugin is added to lib/SConscript as described here https://bugs.launchpad.net/ya...
------------------------------------------------------------
revno: 2700
committer: Anton Gladky <gladky.anton@xxxxxxxxx>
branch nick: yade
timestamp: Mon 2011-01-31 13:39:42 +0100
message:
1. yade-support plugin is added to lib/SConscript as described here https://bugs.launchpad.net/yade/+bug/707966/comments/2
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 2011-01-29 22:47:18 +0000
+++ lib/SConscript 2011-01-31 12:39:42 +0000
@@ -9,5 +9,5 @@
+(Split('triangulation/KinematicLocalisationAnalyser.cpp triangulation/Operations.cpp triangulation/RegularTriangulation.cpp triangulation/Timer.cpp triangulation/basicVTKwritter.cpp triangulation/FlowBoundingSphere.cpp triangulation/Network.cpp triangulation/Deformation.cpp triangulation/Empilement.cpp triangulation/stdafx.cpp triangulation/Tenseur3.cpp triangulation/Tesselation.cpp triangulation/TriaxialState.cpp') if 'cgal' in env['features'] else [])
+(['opengl/GLUtils.cpp'] if 'opengl' in env['features'] else [])
),
- ],LIBS=['dl','m']+(['glut','GL','GLU'] if 'opengl' in env['features'] else []),CXXFLAGS=env['CXXFLAGS']+['-fPIC']
+ ],LIBS=['dl','m']+[l for l in env['LIBS'] if l!='yade-support']+(['glut','GL','GLU'] if 'opengl' in env['features'] else []),CXXFLAGS=env['CXXFLAGS']+['-fPIC']
))