yade-dev team mailing list archive

[eudoxos at BerliOS <eudoxos@xxxxxxxxxxxxxxx>]

Author: eudoxos
Date: 2009-03-04 08:00:46 +0100 (Wed, 04 Mar 2009)
New Revision: 1710

Modified:
   trunk/SConstruct
   trunk/pkg/realtime-rigidbody/SConscript
Log:
1. Fix linking of realtime-rigidbody WRT PersistentSAPCollider


Modified: trunk/SConstruct
===================================================================
--- trunk/SConstruct	2009-03-03 09:07:53 UTC (rev 1709)
+++ trunk/SConstruct	2009-03-04 07:00:46 UTC (rev 1710)
@@ -323,6 +323,7 @@
 	# check "optional" libs
 	if 'log4cxx' in env['features']:
 		ok=conf.CheckLibWithHeader('log4cxx','log4cxx/logger.h','c++','log4cxx::Logger::getLogger("");',autoadd=1)
+			#env.Append(CPPDEFINES=[('LOG4CXX','9'])
 		if not ok: featureNotOK('log4cxx')
 		env.Append(CPPDEFINES=['LOG4CXX'])
 	if 'python' in env['features']:

Modified: trunk/pkg/realtime-rigidbody/SConscript
===================================================================
--- trunk/pkg/realtime-rigidbody/SConscript	2009-03-03 09:07:53 UTC (rev 1709)
+++ trunk/pkg/realtime-rigidbody/SConscript	2009-03-04 07:00:46 UTC (rev 1710)
@@ -61,7 +61,7 @@
 			'Box',
 			'Sphere',
 			'AABB',
-			'SAPCollider',
+			'PersistentSAPCollider',
 			'MetaInteractingGeometry2AABB',
 			'TranslationEngine',
 			'yade-multimethods'],
@@ -88,7 +88,7 @@
 			'AABB',
 			'Box',
 			'Sphere',
-			'SAPCollider',
+			'PersistentSAPCollider',
 			'MetaInteractingGeometry2AABB',
 			'RotationEngine',
 			'yade-multimethods'],