[Python-ogre-commit] SF.net SVN: python-ogre: [426] trunk/python-ogre
Brought to you by:
andy_miller,
roman_yakovenko
From: <and...@us...> - 2007-10-15 23:38:25
|
Revision: 426 http://python-ogre.svn.sourceforge.net/python-ogre/?rev=426&view=rev Author: andy_miller Date: 2007-10-15 16:38:29 -0700 (Mon, 15 Oct 2007) Log Message: ----------- Linux fix for Quickgui Change order and method for patching boost Add bullet to the default build Modified Paths: -------------- trunk/python-ogre/ThirdParty/quickgui/QuickGUIExportDLL.h trunk/python-ogre/scripts/02-ExtractAndPatch.sh trunk/python-ogre/scripts/03-BuildTools.sh trunk/python-ogre/scripts/07-BuildModules.sh Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUIExportDLL.h =================================================================== --- trunk/python-ogre/ThirdParty/quickgui/QuickGUIExportDLL.h 2007-10-15 23:29:46 UTC (rev 425) +++ trunk/python-ogre/ThirdParty/quickgui/QuickGUIExportDLL.h 2007-10-15 23:38:29 UTC (rev 426) @@ -1,16 +1,5 @@ #ifndef QUICKGUIEXPORTDLL_H #define QUICKGUIEXPORTDLL_H - -#ifndef _QuickGUIExport - #if OGRE_PLATFORM == OGRE_PLATFORM_WIN32 && !defined ( __MINGW32__ ) - # if defined( QUICKGUI_EXPORTS ) - # define _QuickGUIExport __declspec( dllexport ) - # else - # define _QuickGUIExport __declspec( dllimport ) - # endif - #else - # define _QuickGUIExport - #endif + +#define _QuickGUIExport #endif - -#endif Modified: trunk/python-ogre/scripts/02-ExtractAndPatch.sh =================================================================== --- trunk/python-ogre/scripts/02-ExtractAndPatch.sh 2007-10-15 23:29:46 UTC (rev 425) +++ trunk/python-ogre/scripts/02-ExtractAndPatch.sh 2007-10-15 23:38:29 UTC (rev 426) @@ -73,6 +73,8 @@ echo " -- Patching Boost" chmod -R +rw boost_1_34_0 cp -r python-ogre/boost/* boost_1_34_0 +sed -i s/BJAM_CONFIG=\"\"/BJAM_CONFIG=release/ boost_1_34_0/configure +sed -i s/'BOOST_PYTHON_MAX_ARITY 15'/'BOOST_PYTHON_MAX_ARITY 19'/ boost_1_34_0/boost/python/detail/preprocessor.hpp echo " -- Patching Ogre" patch -s -N -i ./python-ogre/patch/ogre.patch -p0 Modified: trunk/python-ogre/scripts/03-BuildTools.sh =================================================================== --- trunk/python-ogre/scripts/03-BuildTools.sh 2007-10-15 23:29:46 UTC (rev 425) +++ trunk/python-ogre/scripts/03-BuildTools.sh 2007-10-15 23:38:29 UTC (rev 426) @@ -24,20 +24,6 @@ echo " -- building boost" cd boost_1_34_0 ./configure --with-libraries=python --prefix=$PREFIX -cat << EOF > boost.patch ---- Makefile 2007-05-12 12:10:17.000000000 -0300 -+++ Makefile.new 2007-05-12 12:10:52.000000000 -0300 -@@ -1,6 +1,4 @@ --BJAM=./tools/jam/src/bin.linuxx86 --don't know how to make trie.c --...skipped bjam for lack of trie.c.../bjam -+BJAM=bjam -BJAM_CONFIG=release -PREFIX=/usr/local -EPREFIX=/usr/local -EOF -patch -N -p0 < boost.patch -sed -i s/'BOOST_PYTHON_MAX_ARITY 15'/'BOOST_PYTHON_MAX_ARITY 19'/ boost/python/detail/preprocessor.hpp make make install cd $INSTALL_DIR Modified: trunk/python-ogre/scripts/07-BuildModules.sh =================================================================== --- trunk/python-ogre/scripts/07-BuildModules.sh 2007-10-15 23:29:46 UTC (rev 425) +++ trunk/python-ogre/scripts/07-BuildModules.sh 2007-10-15 23:38:29 UTC (rev 426) @@ -12,7 +12,8 @@ then scons PROJECTS=$1 else - scons PROJECTS=ogre,ois,cegui,plib,ogreode,ogrenewt,ogreal,quickgui,et,caelum -i + scons PROJECTS=ogre,ois,cegui,plib,ogrenewt,ogreode,ogreal,quickgui,et,caelum,bullet +#,ogrebulletc,ogrebulletd -i fi #opcode -- not really suited to a linux build -- lots of work needed ? # This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |