[Python-ogre-commit] SF.net SVN: python-ogre: [479] trunk/python-ogre
Brought to you by:
andy_miller,
roman_yakovenko
From: <and...@us...> - 2007-11-14 03:30:47
|
Revision: 479 http://python-ogre.svn.sourceforge.net/python-ogre/?rev=479&view=rev Author: andy_miller Date: 2007-11-13 19:30:52 -0800 (Tue, 13 Nov 2007) Log Message: ----------- Updates to support rpath/ORIGIN - allow linux build to find the necessary libraries Modified Paths: -------------- trunk/python-ogre/PythonOgreConfig_posix.py trunk/python-ogre/SConstruct Modified: trunk/python-ogre/PythonOgreConfig_posix.py =================================================================== --- trunk/python-ogre/PythonOgreConfig_posix.py 2007-11-14 03:04:08 UTC (rev 478) +++ trunk/python-ogre/PythonOgreConfig_posix.py 2007-11-14 03:30:52 UTC (rev 479) @@ -18,7 +18,7 @@ LIB_Boost = 'libboost_python-gcc41-1_34' # in Linux we need to code in the Relative path for the library -RPATH="../lib" +RPATH=os.path.join('\\$$ORIGIN',os.pardir,os.pardir, 'lib') # We need to know where to find gccxml...... gccxml_bin = os.path.join(BASE_DIR,'gccxml-build/bin') Modified: trunk/python-ogre/SConstruct =================================================================== --- trunk/python-ogre/SConstruct 2007-11-14 03:04:08 UTC (rev 478) +++ trunk/python-ogre/SConstruct 2007-11-14 03:30:52 UTC (rev 479) @@ -94,8 +94,9 @@ # Let us select the projects to build possible_projects = [] -for name in environment.projects.keys(): - possible_projects.append ( name ) +for name,cls in environment.projects.items(): + if cls.active: + possible_projects.append ( name ) # ['ogre' , 'ois', 'ogrerefapp', 'ogrenewt', 'cegui', 'ode',\ # 'ogreode', 'ogreal', 'quickgui', 'opcode', 'nxogre', 'bullet', 'physx', 'betagui','theora',\ # 'ogrevideoffmpeg', 'ogredshow', 'plib', 'ogrebulletc', 'ogrebulletd', @@ -127,7 +128,7 @@ _env = Environment(ENV=os.environ) if environment.rpath: - _env.Append(RPATH=environment.rpath) + _env.Append(RPATH=_env.Literal(environment.rpath)) ## Use custom compilier if wanted (things like ccache) @@ -141,6 +142,8 @@ linkflags=get_linkflags() if hasattr ( cls, 'LINKFLAGS' ): linkflags += cls.LINKFLAGS + if environment.rpath: + linkflags += ' -z origin ' _env.Append( LINKFLAGS=linkflags ) _env.Append ( LIBS = cls.libs ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |