[Python-ogre-commit] SF.net SVN: python-ogre: [488] trunk/python-ogre
Brought to you by:
andy_miller,
roman_yakovenko
From: <and...@us...> - 2007-12-04 07:49:37
|
Revision: 488 http://python-ogre.svn.sourceforge.net/python-ogre/?rev=488&view=rev Author: andy_miller Date: 2007-12-03 23:49:39 -0800 (Mon, 03 Dec 2007) Log Message: ----------- Update Linux build to Bullet 2.64 Add new line to GroundFog to stop warning Modified Paths: -------------- trunk/python-ogre/PythonOgreConfig_posix.py trunk/python-ogre/ThirdParty/caelum/GroundFog.h trunk/python-ogre/scripts/01-RetrieveSource.sh trunk/python-ogre/scripts/02-ExtractAndPatch.sh trunk/python-ogre/scripts/05-BuildAdditionalLibs.sh trunk/python-ogre/scripts/07-BuildModules.sh trunk/python-ogre/scripts/gen_code.sh Modified: trunk/python-ogre/PythonOgreConfig_posix.py =================================================================== --- trunk/python-ogre/PythonOgreConfig_posix.py 2007-12-04 03:39:50 UTC (rev 487) +++ trunk/python-ogre/PythonOgreConfig_posix.py 2007-12-04 07:49:39 UTC (rev 488) @@ -38,8 +38,6 @@ PATH_VORBIS= os.path.join(BASE_DIR, 'libvorbis-1.2.0') PATH_OPENAL= os.path.join(BASE_DIR, 'openal-0.0.8') PATH_OgreOde= os.path.join(PATH_OgreAddons,'ogreode') -# PATH_OgreBullet= os.path.join(PATH_OgreAddons,'ogrebullet') -# PATH_ogreforests= os.path.join(PATH_OgreAddons,'forests') PATH_OgreBullet= os.path.join(PATH_THIRDPARTY,'ogrebullet') PATH_ogreforests= os.path.join(PATH_THIRDPARTY,'forests') @@ -57,8 +55,8 @@ PATH_ogrevideoffmpeg = os.path.join(PATH_THIRDPARTY,'ffmpeg') PATH_NxOgre= os.path.join(PATH_THIRDPARTY, 'nxogre') # PATH_NxOgre= os.path.join(BASE_DIR, 'nxogre/NxOgre') -PATH_Bullet= os.path.join(BASE_DIR, 'bullet-2.63final') -###PATH_PhysX= os.path.join(BASE_DIR, 'Physx/v2.7.2/SDKs') +PATH_Bullet= os.path.join(BASE_DIR, 'bullet-2.64') +###PATH_PhysX= os.path.join(BASE_DIR, 'Physx/v2.7.3/SDKs') PATH_Theora= os.path.join(PATH_OgreAddons,'videoplugin','TheoraVideo') PATH_ffmpeg= os.path.join(BASE_DIR, 'ffmpeg') PATH_navi = os.path.join(BASE_DIR, 'navi','Navi') @@ -86,7 +84,7 @@ PATH_LIB_betagui = PATH_betagui PATH_LIB_quickgui = PATH_quickgui # PATH_LIB_NxOgre= os.path.join(LOCAL_LIB ) -PATH_LIB_PhysX = os.path.join(LOCAL_LIB, 'PhysX','v2.7.2') +PATH_LIB_PhysX = os.path.join(LOCAL_LIB, 'PhysX','v2.7.3') PATH_LIB_Bullet = os.path.join( LOCAL_LIB ) PATH_LIB_Theora= os.path.join(PATH_Theora, 'bin', 'Release') PATH_LIB_ogrevideoffmpeg = PATH_ogrevideoffmpeg @@ -137,9 +135,10 @@ PATH_INCLUDE_OggVorbisTheora = [ os.path.join(BASE_DIR,'ogg','include') ,os.path.join(BASE_DIR, 'vorbis', 'include') ,os.path.join(PATH_OgreAddons,'videoplugin','theora','include') - ,os.path.join(PATH_OgreAddons,'videoplugin','ptypes-1.8.3','include') + ##,os.path.join(PATH_OgreAddons,'videoplugin','ptypes-1.8.3','include') + ,os.path.join(PATH_THIRDPARTY,'ptypes','include') ] -physxbase = os.path.join(LOCAL_INCLUDE, 'PhysX','v2.7.2', 'SDKs') +physxbase = os.path.join(LOCAL_INCLUDE, 'PhysX','v2.7.3', 'SDKs') PATH_INCLUDE_PhysX= [ physxbase ,os.path.join(physxbase, 'Cooking','Include') ,os.path.join(physxbase, 'Foundation','include') Modified: trunk/python-ogre/ThirdParty/caelum/GroundFog.h =================================================================== --- trunk/python-ogre/ThirdParty/caelum/GroundFog.h 2007-12-04 03:39:50 UTC (rev 487) +++ trunk/python-ogre/ThirdParty/caelum/GroundFog.h 2007-12-04 07:49:39 UTC (rev 488) @@ -129,4 +129,5 @@ } -#endif //GROUNDFOG_H \ No newline at end of file +#endif //GROUNDFOG_H + Modified: trunk/python-ogre/scripts/01-RetrieveSource.sh =================================================================== --- trunk/python-ogre/scripts/01-RetrieveSource.sh 2007-12-04 03:39:50 UTC (rev 487) +++ trunk/python-ogre/scripts/01-RetrieveSource.sh 2007-12-04 07:49:39 UTC (rev 488) @@ -28,7 +28,7 @@ $WGET http://downloads.xiph.org/releases/vorbis/libvorbis-1.2.0.tar.gz $WGET http://downloads.sourceforge.net/zziplib/zziplib-0.13.49.tar.bz2 ##$WGET http://devfiles.ageia.com/PhysX_2.7.2_SDK_CoreLinux_deb.tar.gz? -$WGET http://downloads.sourceforge.net/bullet/bullet-2.63final.tgz +$WGET http://downloads.sourceforge.net/bullet/bullet-2.64.tgz popd cd $INSTALL_DIR echo " -- getting pygccxml" @@ -36,7 +36,8 @@ echo " -- getting python-ogre" svn co https://python-ogre.svn.sourceforge.net/svnroot/python-ogre/trunk/python-ogre python-ogre echo " -- getting gccxml" -cvs -z3 -q -d :pserver:an...@ww...:/cvsroot/GCC_XML co -D "1 Oct 2007" gccxml +##cvs -z3 -q -d :pserver:an...@ww...:/cvsroot/GCC_XML co -D "1 Oct 2007" gccxml +cvs -z3 -q -d :pserver:an...@ww...:/cvsroot/GCC_XML co gccxml echo " -- getting ogreode" cvs -z3 -q -d :pserver:ano...@cv...:/cvsroot/ogre co -P ogreaddons/ogreode echo " -- getting ogrenewt" Modified: trunk/python-ogre/scripts/02-ExtractAndPatch.sh =================================================================== --- trunk/python-ogre/scripts/02-ExtractAndPatch.sh 2007-12-04 03:39:50 UTC (rev 487) +++ trunk/python-ogre/scripts/02-ExtractAndPatch.sh 2007-12-04 07:49:39 UTC (rev 488) @@ -95,7 +95,7 @@ echo "EMPTY" >>./NEWS popd echo " -- Unpacking Bullet" -tar zxf $DOWNLOADS/bullet-2.63final.tgz +tar zxf $DOWNLOADS/bullet-2.64.tgz echo echo "== Finished Extraction and Patching ==" echo Modified: trunk/python-ogre/scripts/05-BuildAdditionalLibs.sh =================================================================== --- trunk/python-ogre/scripts/05-BuildAdditionalLibs.sh 2007-12-04 03:39:50 UTC (rev 487) +++ trunk/python-ogre/scripts/05-BuildAdditionalLibs.sh 2007-12-04 07:49:39 UTC (rev 488) @@ -64,7 +64,7 @@ # Bullet # echo " -- Building Bullet --" -pushd bullet-2.63final +pushd bullet-2.64 cmake . -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX make find . -name *.a -execdir cp {} $PREFIX/lib \; Modified: trunk/python-ogre/scripts/07-BuildModules.sh =================================================================== --- trunk/python-ogre/scripts/07-BuildModules.sh 2007-12-04 03:39:50 UTC (rev 487) +++ trunk/python-ogre/scripts/07-BuildModules.sh 2007-12-04 07:49:39 UTC (rev 488) @@ -10,10 +10,10 @@ cd python-ogre if [ $1 != "" ] then - scons PROJECTS=$1 -i + scons PROJECTS=$1 else - scons PROJECTS=ogre,ois,cegui,plib,ogrenewt,ogreode,ogreal,quickgui,et,bullet,ogreforests -i -#,ogrebulletc,ogrebulletd,caelum -i + scons PROJECTS=ogre,ois,caelum,cegui,plib,ogrenewt,ogreode,quickgui,et,bullet,ogreforests -i +#ogreal,ogrebulletc,ogrebulletd,nxogre -i fi #opcode -- not really suited to a linux build -- lots of work needed ? # Modified: trunk/python-ogre/scripts/gen_code.sh =================================================================== --- trunk/python-ogre/scripts/gen_code.sh 2007-12-04 03:39:50 UTC (rev 487) +++ trunk/python-ogre/scripts/gen_code.sh 2007-12-04 07:49:39 UTC (rev 488) @@ -4,5 +4,5 @@ # master config setup source ./config.sh pushd $INSTALL_DIR/python-ogre/code_generators/$1 -python generate_code.py > build.out +python generate_code.py > build.out 2>&1 popd This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |