yade-dev team mailing list archive

[eudoxos at BerliOS <eudoxos@xxxxxxxxxxxxxxx>]

Author: eudoxos
Date: 2009-06-05 23:12:15 +0200 (Fri, 05 Jun 2009)
New Revision: 1791

Modified:
   trunk/core/yade.cpp
   trunk/gui/qt3/GLViewer.cpp
   trunk/pkg/dem/SConscript
Log:
1. Fix missing libs for linkage
2. Fix a few typos



Modified: trunk/core/yade.cpp
===================================================================
--- trunk/core/yade.cpp	2009-06-04 15:50:18 UTC (rev 1790)
+++ trunk/core/yade.cpp	2009-06-05 21:12:15 UTC (rev 1791)
@@ -154,7 +154,7 @@
 		"   YADE_OPENMP   (supports openMP; set OMP_NUM_THREADS env. var to control parallelism.)\n"
 	#endif
 	#ifdef LOG4CXX
-		"   LOG4CXX       (configurable logging framework enabled; ~/.yade-" SUFFIX "/logging.conf)\n"
+		"   LOG4CXX       (configurable logging framework enabled; ~/.yade" SUFFIX "/logging.conf)\n"
 	#endif
 	#ifdef YADE_OPENGL
 		"   YADE_OPENGL   (3d rendering)\n"

Modified: trunk/gui/qt3/GLViewer.cpp
===================================================================
--- trunk/gui/qt3/GLViewer.cpp	2009-06-04 15:50:18 UTC (rev 1790)
+++ trunk/gui/qt3/GLViewer.cpp	2009-06-05 21:12:15 UTC (rev 1791)
@@ -164,7 +164,7 @@
 	const Se3r se3(renderer->clipPlaneSe3[planeNo]);
 	manipulatedFrame()->setPositionAndOrientation(qglviewer::Vec(se3.position[0],se3.position[1],se3.position[2]),qglviewer::Quaternion(se3.orientation[0],se3.orientation[1],se3.orientation[2],se3.orientation[3]));
 	string grp=strBoundGroup();
-	displayMessage("Manipulating clip plane #"+lexical_cast<string>(planeNo+1)+(grp.empty()?grp:"(bound planes:"+grp+")"));
+	displayMessage("Manipulating clip plane #"+lexical_cast<string>(planeNo+1)+(grp.empty()?grp:" (bound planes:"+grp+")"));
 }
 
 void GLViewer::useDisplayParameters(size_t n){

Modified: trunk/pkg/dem/SConscript
===================================================================
--- trunk/pkg/dem/SConscript	2009-06-04 15:50:18 UTC (rev 1790)
+++ trunk/pkg/dem/SConscript	2009-06-05 21:12:15 UTC (rev 1791)
@@ -40,7 +40,7 @@
 
 	env.SharedLibrary('UniaxialStrainer',['Engine/StandAloneEngine/UniaxialStrainer.cpp'],LIBS=env['LIBS']+['ParticleParameters','AABB']),
 
-	env.SharedLibrary('ConcretePM',['ConcretePM.cpp'],CXXFLAGS=env['CXXFLAGS']+cpmInclude,LIBS=env['LIBS']+['Shop','DemXDofGeom']),
+	env.SharedLibrary('ConcretePM',['ConcretePM.cpp'],CXXFLAGS=env['CXXFLAGS']+cpmInclude,LIBS=env['LIBS']+['Shop','DemXDofGeom','$QGLVIEWER_LIB' if 'YADE_OPENGL' in env['CPPDEFINES'] else '']),
 
 	env.SharedLibrary('Clump',['DataClass/Clump.cpp'],LIBS=env['LIBS']+['Shop']),
 
@@ -119,6 +119,7 @@
 			'BodyMacroParameters',
 			'RigidBodyParameters',
 			'ParticleParameters',
+			'DemXDofGeom',
 			'InteractionPhysicsMetaEngine']),
 
 	env.SharedLibrary('InteractingBox2InteractingSphere4SpheresContactGeometry',