[Python-ogre-commit] SF.net SVN: python-ogre: [451] trunk/python-ogre
Brought to you by:
andy_miller,
roman_yakovenko
From: <and...@us...> - 2007-10-22 09:55:02
|
Revision: 451 http://python-ogre.svn.sourceforge.net/python-ogre/?rev=451&view=rev Author: andy_miller Date: 2007-10-22 02:55:04 -0700 (Mon, 22 Oct 2007) Log Message: ----------- Fixed Linux build issue where --includedir needs to be forced on CEGUI, OIS etc otherwise the $includedir isn't set in their pkgconfig files Change to using ode 0.9 Modified Paths: -------------- trunk/python-ogre/PythonOgreConfig_posix.py trunk/python-ogre/environment.py trunk/python-ogre/scripts/01-RetrieveSource.sh trunk/python-ogre/scripts/02-ExtractAndPatch.sh trunk/python-ogre/scripts/04-BuildBaseLibs.sh Modified: trunk/python-ogre/PythonOgreConfig_posix.py =================================================================== --- trunk/python-ogre/PythonOgreConfig_posix.py 2007-10-22 03:57:27 UTC (rev 450) +++ trunk/python-ogre/PythonOgreConfig_posix.py 2007-10-22 09:55:04 UTC (rev 451) @@ -30,7 +30,7 @@ PATH_CEGUI = os.path.join(BASE_DIR, 'CEGUI-0.5.0') PATH_OIS = os.path.join(BASE_DIR, 'ois-1.0RC1') PATH_Newton = os.path.join(BASE_DIR, 'newtonSDK','sdk') -PATH_ODE = os.path.join(BASE_DIR, 'ode-0.8') +PATH_ODE = os.path.join(BASE_DIR, 'ode-0.9') PATH_OGG = os.path.join(BASE_DIR, 'libogg-1.1.3') PATH_VORBIS= os.path.join(BASE_DIR, 'libvorbis-1.2.0') PATH_OPENAL= os.path.join(BASE_DIR, 'openal-0.0.8') Modified: trunk/python-ogre/environment.py =================================================================== --- trunk/python-ogre/environment.py 2007-10-22 03:57:27 UTC (rev 450) +++ trunk/python-ogre/environment.py 2007-10-22 09:55:04 UTC (rev 451) @@ -300,7 +300,7 @@ ############# these are under construction and DO NOT WORK (Yet) ##################### class ode: - version= "0.8" + version= "0.9" parent = "ogre/physics" libs=[Config.LIB_Boost, 'ode'] if os.name=="nt": @@ -309,7 +309,8 @@ , Config.PATH_LIB_ODE ] include_dirs = [ Config.PATH_Boost - , Config.PATH_INCLUDE_ODE + , Config.PATH_INCLUDE_ODE + , os.path.join(Config.PATH_ODE, 'OPCODE') ] ModuleName = 'ODE' Modified: trunk/python-ogre/scripts/01-RetrieveSource.sh =================================================================== --- trunk/python-ogre/scripts/01-RetrieveSource.sh 2007-10-22 03:57:27 UTC (rev 450) +++ trunk/python-ogre/scripts/01-RetrieveSource.sh 2007-10-22 09:55:04 UTC (rev 451) @@ -19,7 +19,7 @@ ##$WGET http://prdownloads.sourceforge.net/scons/scons-0.96.96.tar.gz $WGET http://downloads.sourceforge.net/scons/scons-0.97.0d20070918.tar.gz $WGET http://prdownloads.sourceforge.net/ogre/ogre-linux_osx-v1-4-5.tar.bz2 -$WGET http://prdownloads.sourceforge.net/opende/ode-src-0.8.zip +$WGET http://prdownloads.sourceforge.net/opende/ode-src-0.9.zip $WGET http://downloads.sourceforge.net/boost/boost_1_34_0.tar.bz2 $WGET http://www.newtondynamics.com/downloads/newtonLinux-1.53.tar.gz $WGET http://www.openal.org/openal_webstf/downloads/openal-0.0.8.tar.gz Modified: trunk/python-ogre/scripts/02-ExtractAndPatch.sh =================================================================== --- trunk/python-ogre/scripts/02-ExtractAndPatch.sh 2007-10-22 03:57:27 UTC (rev 450) +++ trunk/python-ogre/scripts/02-ExtractAndPatch.sh 2007-10-22 09:55:04 UTC (rev 451) @@ -19,7 +19,7 @@ echo " -- Unpacking Newton" tar zxf $DOWNLOADS/newtonLinux-1.53.tar.gz echo " -- Unpacking ODE" -unzip -q -o $DOWNLOADS/ode-src-0.8.zip +unzip -q -o $DOWNLOADS/ode-src-0.9.zip echo " -- Unpacking OgreAL Support" tar zxf $DOWNLOADS/libogg-1.1.3.tar.gz tar zxf $DOWNLOADS/libvorbis-1.2.0.tar.gz Modified: trunk/python-ogre/scripts/04-BuildBaseLibs.sh =================================================================== --- trunk/python-ogre/scripts/04-BuildBaseLibs.sh 2007-10-22 03:57:27 UTC (rev 450) +++ trunk/python-ogre/scripts/04-BuildBaseLibs.sh 2007-10-22 09:55:04 UTC (rev 451) @@ -11,7 +11,7 @@ echo " -- building zzlib --" pushd zziplib-0.13.49 aclocal -./configure --prefix=$PREFIX --datadir=$PREFIX/share +./configure --prefix=$PREFIX --datadir=$PREFIX/share --includedir=$PREFIX/include make make install popd @@ -24,8 +24,9 @@ #patch -q -i ../python-ogre/patch/cegui.patch -p0 #echo "EMPTY" >>./INSTALL #echo "EMPTY" >>./NEWS +## Note the --includedir to ensure it writes the correct pkgconfig/CEGUI.pc automake -./configure --prefix=$PREFIX --enable-freeimage=yes --disable-samples --without-ogre-renderer +./configure --prefix=$PREFIX --enable-freeimage=yes --disable-samples --without-ogre-renderer --includedir=$PREFIX/include make make install popd @@ -36,7 +37,7 @@ echo " -- Builing OIS" pushd ois-1.0RC1 ./bootstrap -./configure --prefix=$PREFIX +./configure --prefix=$PREFIX --includedir=$PREFIX/include make make install popd @@ -46,10 +47,10 @@ # Install and build ODE # echo " -- Building ODE" -pushd ode-0.8 +pushd ode-0.9 chmod +x autogen.sh ./autogen.sh -./configure --prefix=$PREFIX +./configure --prefix=$PREFIX --includedir=$PREFIX/include make make install popd This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |