Revision: 6966
http://playerstage.svn.sourceforge.net/playerstage/?rev=6966&view=rev
Author: natepak
Date: 2008-08-20 22:19:04 +0000 (Wed, 20 Aug 2008)
Log Message:
-----------
Added patch 2044161 from John Hsu
Modified Paths:
--------------
code/gazebo/trunk/SConstruct
Modified: code/gazebo/trunk/SConstruct
===================================================================
--- code/gazebo/trunk/SConstruct 2008-08-20 21:53:33 UTC (rev 6965)
+++ code/gazebo/trunk/SConstruct 2008-08-20 22:19:04 UTC (rev 6966)
@@ -128,22 +128,28 @@
print "You requested to activate the support for 3D audio. But OgreAL
is not found."
print "http://www.ogre3d.org/phpBB2addons/viewtopic.php?t=3293";
Exit(1)
-
+
+ #FIXME: if this check fails, it makes it fail the check for ODE
+ # This test should be done outside of the configure context below, because
+ # otherwise it tries to link against the not-yet-built libgazebo, causing
+ # the test to always fail.
+ simpleenv = Environment()
+ simpleconf = Configure(env)
+ if not simpleconf.CheckLibWithHeader('ltdl','ltdl.h','CXX'):
+ print " Warning: Failed to find ltdl, no plugin support will be included"
+ env["HAVE_LTDL"]=False
+ else:
+ env["HAVE_LTDL"]=True
+ env["CCFLAGS"].append("-DHAVE_LTDL")
+ simpleconf.Finish()
+
conf = Configure(env, custom_tests = {'CheckODELib' : CheckODELib})
#Check for the ODE library and header
if not conf.CheckCHeader('ode/ode.h'):
print " Error: Install ODE (http://www.ode.org)"
Exit(1)
-
- #FIXME: if this check fails, it makes it fail the check for ODE
- if not conf.CheckLibWithHeader('ltdl','ltdl.h','CXX'):
- print " Warning: Failed to find ltdl, no plugin support will be included"
- env["HAVE_LTDL"]=False
- else:
- env["HAVE_LTDL"]=True
- env["CCFLAGS"].append("-DHAVE_LTDL")
-
+
# Check for trimesh support in ODE
if not conf.CheckODELib():
print ' Error: ODE not compiled with trimesh support.'
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Playerstage-commit mailing list
Playerstage-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
