[Python-ogre-commit] SF.net SVN: python-ogre: [498] trunk/python-ogre

[<and...@us...>]

Revision: 498
          http://python-ogre.svn.sourceforge.net/python-ogre/?rev=498&view=rev
Author:   andy_miller
Date:     2007-12-09 01:24:43 -0800 (Sun, 09 Dec 2007)

Log Message:
-----------
I'm hoping that this fixes the relative library path stuff for Linux
Also change to look in the parent directory for plugins.cfg

Modified Paths:
--------------
    trunk/python-ogre/SConstruct
    trunk/python-ogre/packages_2.5/ogre/renderer/OGRE/sf_OIS.py
    trunk/python-ogre/scripts/04-BuildBaseLibs.sh
    trunk/python-ogre/scripts/config.sh

Modified: trunk/python-ogre/SConstruct
===================================================================
--- trunk/python-ogre/SConstruct	2007-12-09 01:08:24 UTC (rev 497)
+++ trunk/python-ogre/SConstruct	2007-12-09 09:24:43 UTC (rev 498)
@@ -150,7 +150,7 @@
         
         if environment.rpath:
             _env.Append(RPATH=_env.Literal(environment.rpath))
-            print "****", _env['RPATH']
+            _env.Append( LINKFLAGS = Split('-z origin') )
         
         # Stores signatures in a separate .sconsign file 
         # in each directory as the single one was getting huge

Modified: trunk/python-ogre/packages_2.5/ogre/renderer/OGRE/sf_OIS.py
===================================================================
--- trunk/python-ogre/packages_2.5/ogre/renderer/OGRE/sf_OIS.py	2007-12-09 01:08:24 UTC (rev 497)
+++ trunk/python-ogre/packages_2.5/ogre/renderer/OGRE/sf_OIS.py	2007-12-09 09:24:43 UTC (rev 498)
@@ -19,7 +19,8 @@
     import os
     import os.path
     
-    paths = [os.path.join(os.getcwd(), 'plugins.cfg'),
+    paths = [os.path.join(os.getcwd(), '../plugins.cfg'),
+             os.path.join(os.getcwd(), 'plugins.cfg'),
              '/etc/OGRE/plugins.cfg',
              os.path.join(os.path.dirname(os.path.abspath(__file__)),
                               'plugins.cfg')]

Modified: trunk/python-ogre/scripts/04-BuildBaseLibs.sh
===================================================================
--- trunk/python-ogre/scripts/04-BuildBaseLibs.sh	2007-12-09 01:08:24 UTC (rev 497)
+++ trunk/python-ogre/scripts/04-BuildBaseLibs.sh	2007-12-09 09:24:43 UTC (rev 498)
@@ -67,6 +67,7 @@
 # Install Ogre (Object Oriented Graphics Rendering Engine)
 #
 echo " -- Building Ogre"
+export ZZIPLIB_LIBS="-lzzip"
 pushd ogrenew 
 aclocal
 ./bootstrap

Modified: trunk/python-ogre/scripts/config.sh
===================================================================
--- trunk/python-ogre/scripts/config.sh	2007-12-09 01:08:24 UTC (rev 497)
+++ trunk/python-ogre/scripts/config.sh	2007-12-09 09:24:43 UTC (rev 498)
@@ -5,6 +5,7 @@
 WGETARGS="-c -nc --tries=3 --random-wait"
 WGET="`which wget` $WGETARGS"
 
+
 TEMPFILE=`mktemp`
 cat << EOF > $TEMPFILE
 #!/usr/bin/python
@@ -19,6 +20,7 @@
 export LD_LIBRARY_PATH=$PREFIX/lib
 export CFLAGS="-I$PREFIX/include -L$PREFIX/lib"
 export CXXFLAGS=$CFLAGS
+export LDFLAGS="-Wl,-rpath='\$\$ORIGIN/../../lib' -Wl,-rpath='\$\$ORIGIN' -Wl,-z,origin"
 export PATH=$PREFIX/bin:$PATH
 export PYTHONPATH=$PREFIX/lib/python$PYTHONVERSION/site-packages
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.