[Python-ogre-commit] SF.net SVN: python-ogre: [466] trunk/python-ogre
Brought to you by:
andy_miller,
roman_yakovenko
From: <and...@us...> - 2007-11-11 01:30:58
|
Revision: 466 http://python-ogre.svn.sourceforge.net/python-ogre/?rev=466&view=rev Author: andy_miller Date: 2007-11-10 17:31:00 -0800 (Sat, 10 Nov 2007) Log Message: ----------- general Update Modified Paths: -------------- trunk/python-ogre/PythonOgreConfig_nt.py trunk/python-ogre/PythonOgreConfig_posix.py trunk/python-ogre/README trunk/python-ogre/SConstruct trunk/python-ogre/code_generators/caelum/generate_code.py trunk/python-ogre/code_generators/caelum/hand_made_wrappers.py trunk/python-ogre/code_generators/ogre/generate_code.py trunk/python-ogre/code_generators/ogre/hand_made_wrappers.py trunk/python-ogre/code_generators/ogre/python_ogre_aliases.h trunk/python-ogre/code_generators/ogre/python_ogre_sizeof.h trunk/python-ogre/code_generators/ogreforests/generate_code.py trunk/python-ogre/environment.py trunk/python-ogre/setup.py Modified: trunk/python-ogre/PythonOgreConfig_nt.py =================================================================== --- trunk/python-ogre/PythonOgreConfig_nt.py 2007-11-02 10:51:56 UTC (rev 465) +++ trunk/python-ogre/PythonOgreConfig_nt.py 2007-11-11 01:31:00 UTC (rev 466) @@ -1,6 +1,6 @@ import os -SDK=True ## set to true if buiding from 1.4 release source... +SDK=False # True ## set to true if buiding from 1.4 release source... ## The root directory is where this module is located module_dir = os.path.abspath(os.path.dirname(__file__) ) @@ -13,6 +13,9 @@ ## and the name of the boost python library LIB_Boost = r'boost_python-vc80-mt-1_35' +# in Linux we need to code in the Relative path for the library +RPATH="" + # We need to know where to find gccxml...... gccxml_bin = os.path.join(BASE_DIR, 'gccxml/bin/release/gccxml.exe') # and the Py++ directory as sometimes we need access to the code repository there @@ -23,14 +26,13 @@ PATH_Ogre = os.path.join(BASE_DIR, 'ogrenew') PATH_OgreAddons = os.path.join(BASE_DIR, 'OgreAddons') PATH_CEGUI = os.path.join(BASE_DIR, 'CEGUI-0.5.0') -PATH_OIS = os.path.join(BASE_DIR, 'ois-1.0RC1') +PATH_OIS = os.path.join(BASE_DIR, 'ois' ) ##'ois-1.0RC1') PATH_Newton = os.path.join(BASE_DIR, 'newtonsdk','sdk') PATH_FMOD = os.path.join(BASE_DIR, 'fmod') PATH_ODE = os.path.join(BASE_DIR, 'ode-0.9') PATH_OGG = os.path.join(BASE_DIR, 'ogg') PATH_VORBIS= os.path.join(BASE_DIR, 'vorbis') PATH_OPENAL= os.path.join(BASE_DIR, 'openal') -PATH_ALUT= os.path.join(BASE_DIR, 'freealut') PATH_OgreOde= os.path.join(BASE_DIR, PATH_OgreAddons,'ogreode') # # PATH_OgreBullet= os.path.join(PATH_OgreAddons,'ogrebullet') # # PATH_ogreforests= os.path.join(PATH_OgreAddons,'forests') @@ -46,8 +48,10 @@ PATH_et = os.path.join(PATH_THIRDPARTY, 'et') PATH_caelum = os.path.join(PATH_THIRDPARTY, 'caelum') PATH_NxOgre= os.path.join(PATH_THIRDPARTY, 'nxogre') +PATH_watermesh= os.path.join(PATH_THIRDPARTY, 'watermesh') # PATH_NxOgre= os.path.join(BASE_DIR, 'nxogre/NxOgre') PATH_noise= os.path.join(PATH_THIRDPARTY, 'noise') +PATH_ofusion= os.path.join(PATH_THIRDPARTY, 'ofusion') PATH_ogrevideoffmpeg = os.path.join(PATH_THIRDPARTY,'ffmpeg') @@ -72,7 +76,7 @@ PATH_LIB_OgreRefApp = os.path.join( PATH_Ogre, 'lib') PATH_LIB_OgreNewt = os.path.join( PATH_OgreAddons, 'ogrenewt/OgreNewt_Main/lib/Release') PATH_LIB_Newton = os.path.join( PATH_Newton ,'dll') ##NOTE Posix platforms this lives in 'lib-mt' -PATH_LIB_OIS = os.path.join( PATH_OIS, 'dll') ## NOTE Posix platforms this lives in'lib' not 'dll' +PATH_LIB_OIS = os.path.join( PATH_OIS, 'lib') ## NOTE Posix platforms this lives in'lib' not 'dll' PATH_LIB_CEGUI = os.path.join( PATH_CEGUI, 'lib' ) PATH_LIB_ODE = os.path.join( PATH_ODE, 'lib/releaselib')## probable releaselib for posix PATH_LIB_OPCODE = os.path.join( PATH_OPCODE ) @@ -105,7 +109,7 @@ PATH_INCLUDE_OIS = os.path.join(PATH_OIS,'includes') ## Note the plural include's PATH_INCLUDE_OgreRefApp = os.path.join(PATH_Ogre,'ReferenceApplication/ReferenceAppLayer/include') PATH_INCLUDE_OgreNewt = os.path.join(PATH_OgreAddons,'ogrenewt/OgreNewt_Main/inc') -PATH_INCLUDE_CEGUI = os.path.join(PATH_CEGUI, 'include/CEGUI') +PATH_INCLUDE_CEGUI = os.path.join(PATH_CEGUI, 'include') PATH_INCLUDE_ODE = os.path.join( PATH_ODE, 'include') PATH_INCLUDE_OPCODE = PATH_OPCODE PATH_INCLUDE_ODESOURCE = os.path.join( PATH_ODE, 'ode/src') @@ -113,7 +117,6 @@ PATH_INCLUDE_OPENAL = os.path.join( PATH_OPENAL, 'include') PATH_INCLUDE_OGG= os.path.join( PATH_OGG, 'include' ) PATH_INCLUDE_VORBIS= os.path.join( PATH_VORBIS, 'include' ) -PATH_INCLUDE_ALUT= os.path.join( PATH_ALUT, 'include' ) # # PATH_INCLUDE_OgreBullet = [ # # os.path.join( PATH_OgreBullet,'Collisions','include') Modified: trunk/python-ogre/PythonOgreConfig_posix.py =================================================================== --- trunk/python-ogre/PythonOgreConfig_posix.py 2007-11-02 10:51:56 UTC (rev 465) +++ trunk/python-ogre/PythonOgreConfig_posix.py 2007-11-11 01:31:00 UTC (rev 466) @@ -17,6 +17,9 @@ ## and the name of the boost python library LIB_Boost = 'libboost_python-gcc41-1_34' +# in Linux we need to code in the Relative path for the library +RPATH="../lib" + # We need to know where to find gccxml...... gccxml_bin = os.path.join(BASE_DIR,'gccxml-build/bin') # and the Py++ directory as sometimes we need access to the code repository there @@ -34,7 +37,6 @@ 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') -PATH_ALUT= os.path.join(BASE_DIR, 'freealut-1.1.0') PATH_OgreOde= os.path.join(PATH_OgreAddons,'ogreode') # PATH_OgreBullet= os.path.join(PATH_OgreAddons,'ogrebullet') # PATH_ogreforests= os.path.join(PATH_OgreAddons,'forests') @@ -105,7 +107,6 @@ PATH_INCLUDE_OPENAL = os.path.join( LOCAL_INCLUDE ) #os.path.join( PATH_OPENAL, 'include') PATH_INCLUDE_OGG= os.path.join( LOCAL_INCLUDE,'ogg' ) #os.path.join( PATH_OGG, 'include' ) PATH_INCLUDE_VORBIS= os.path.join( LOCAL_INCLUDE,'vorbis' ) #os.path.join( PATH_VORBIS, 'include' ) -PATH_INCLUDE_ALUT= os.path.join( LOCAL_INCLUDE ) #os.path.join( PATH_ALUT, 'include' ) # PATH_INCLUDE_OgreBullet = [ # os.path.join( PATH_OgreBullet,'Collisions','include') Modified: trunk/python-ogre/README =================================================================== --- trunk/python-ogre/README 2007-11-02 10:51:56 UTC (rev 465) +++ trunk/python-ogre/README 2007-11-11 01:31:00 UTC (rev 466) @@ -1,4 +1,4 @@ -Please see http://python-ogre.python.hosting.com for info +Please see http://python-ogre.org for info ----- Modified: trunk/python-ogre/SConstruct =================================================================== --- trunk/python-ogre/SConstruct 2007-11-02 10:51:56 UTC (rev 465) +++ trunk/python-ogre/SConstruct 2007-11-11 01:31:00 UTC (rev 466) @@ -92,15 +92,20 @@ return LINKFLAGS # Let us select the projects to build -possible_projects = ['ogre' , 'ois', 'ogrerefapp', 'ogrenewt', 'cegui', 'ode',\ - 'ogreode', 'ogreal', 'quickgui', 'opcode', 'nxogre', 'bullet', 'physx', 'betagui','theora',\ - 'ogrevideoffmpeg', 'ogredshow', 'plib', 'ogrebulletc', 'ogrebulletd', - 'ogreforests', 'et', 'navi', 'caelum', 'noise' ] # , 'raknet' -default_projects = ['ogre' , 'ois', 'ogrerefapp', 'ogrenewt', 'cegui', 'ode',\ - 'ogreode', 'ogreal', 'quickgui', 'opcode', 'nxogre', 'bullet', 'physx', 'betagui','theora',\ - 'ogrevideoffmpeg', 'ogredshow', 'plib', 'ogrebulletc', 'ogrebulletd', - 'ogreforests', 'et', 'caelum' ] # 'navi', +possible_projects = [] +for name in environment.projects.keys(): + possible_projects.append ( name ) +# ['ogre' , 'ois', 'ogrerefapp', 'ogrenewt', 'cegui', 'ode',\ +# 'ogreode', 'ogreal', 'quickgui', 'opcode', 'nxogre', 'bullet', 'physx', 'betagui','theora',\ +# 'ogrevideoffmpeg', 'ogredshow', 'plib', 'ogrebulletc', 'ogrebulletd', +# 'ogreforests', 'et', 'navi', 'caelum', 'noise', 'watermesh' ] # , 'raknet' +default_projects = possible_projects ## environment.projects +# ['ogre' , 'ois', 'ogrerefapp', 'ogrenewt', 'cegui', 'ode',\ +# 'ogreode', 'ogreal', 'quickgui', 'opcode', 'nxogre', 'bullet', 'physx', 'betagui','theora',\ +# 'ogrevideoffmpeg', 'ogredshow', 'plib', 'ogrebulletc', 'ogrebulletd', +# 'ogreforests', 'et', 'caelum' ] # 'navi', + # This lets you call scons like: 'scons PROJECTS=ogre,cegui' opts = Options('custom.py') opts.Add(ListOption('PROJECTS', 'Project to build wrappers for', @@ -121,6 +126,9 @@ cls._name = name _env = Environment(ENV=os.environ) + if environment.rpath: + _env.Append(RPATH=environment.rpath) + ## Use custom compilier if wanted (things like ccache) if hasattr(environment, 'cxx_compiler'): Modified: trunk/python-ogre/code_generators/caelum/generate_code.py =================================================================== --- trunk/python-ogre/code_generators/caelum/generate_code.py 2007-11-02 10:51:56 UTC (rev 465) +++ trunk/python-ogre/code_generators/caelum/generate_code.py 2007-11-11 01:31:00 UTC (rev 466) @@ -100,7 +100,14 @@ def create_output( size ): return [ ft.output( i ) for i in range( size ) ] + + for x in main_ns.mem_funs('::caelum::UniversalClock::getGregorianDateFromJulianDay'): + x.add_transformation( ft.output('year'), ft.output('month'), ft.output('day'), alias = 'getGregorianDateFromJulianDay' ) + x.documentation = docit ("","JulianDay", "tuple - year,month,day") + x=main_ns.mem_fun('::caelum::UniversalClock::getGregorianDateTimeFromJulianDay') + x.add_transformation( ft.output('year'), ft.output('month'), ft.output('day'),ft.output('hour'), ft.output('minute'), ft.output('second') ) + x.documentation = docit ("","JulianDay", "tuple - year,month,day,hour, minute, second") ############################################################################### ## Modified: trunk/python-ogre/code_generators/caelum/hand_made_wrappers.py =================================================================== --- trunk/python-ogre/code_generators/caelum/hand_made_wrappers.py 2007-11-02 10:51:56 UTC (rev 465) +++ trunk/python-ogre/code_generators/caelum/hand_made_wrappers.py 2007-11-11 01:31:00 UTC (rev 466) @@ -112,6 +112,7 @@ class_.add_registration_code ( c ) def apply( mb ): + return # rt = mb.class_( 'Sun' ) # rt.add_declaration_code( WRAPPER_DEFINITION_Sun ) # apply_reg (rt, WRAPPER_REGISTRATION_Sun ) Modified: trunk/python-ogre/code_generators/ogre/generate_code.py =================================================================== --- trunk/python-ogre/code_generators/ogre/generate_code.py 2007-11-02 10:51:56 UTC (rev 465) +++ trunk/python-ogre/code_generators/ogre/generate_code.py 2007-11-11 01:31:00 UTC (rev 466) @@ -185,7 +185,15 @@ main_ns.constructor("IndexData",arg_types=['::Ogre::IndexData const &']).exclude() global_ns.class_('::Ogre::OverlayManager').\ mem_fun('destroyOverlayElementImpl', arg_types=['::Ogre::OverlayElement *',None] ).exclude() + + + excludes = ['::Ogre::Any::getType' ## this returns a std::type_info which doesn't make any sense in Python + ] + for e in excludes: + print "excluding ", e + main_ns.member_functions(e).exclude() + ## change due to CVS Ogre update (Thanks Dermont) AttribParserList = main_ns.typedef( name="AttribParserList" ) declarations.class_traits.get_declaration( AttribParserList ).exclude() @@ -241,6 +249,9 @@ main_ns.class_("VertexBoneAssignment_s").include() # A couple of Std's that need exposing std_ns = global_ns.namespace("std") + for c in std_ns.classes(): + print c +# std_ns.class_("pair<unsigned int, unsigned int>").include() std_ns.class_("pair<unsigned, unsigned>").include() std_ns.class_("pair<bool, float>").include() if not HACK: @@ -880,13 +891,13 @@ , messages.W1031 , messages.W1035 , messages.W1040 - , messages.W1041 # overlapping names when creating a property - , messages.W1038 - , messages.W1036 # pointer to Python immutable member - , messages.W1033 # unnamed variables - , messages.W1018 # expose unnamed classes - , messages.W1049 # returns reference to local variable - , messages.W1014 # unsupported '=' operator +# , messages.W1041 # overlapping names when creating a property +# , messages.W1038 +# , messages.W1036 # pointer to Python immutable member +# , messages.W1033 # unnamed variables +# , messages.W1018 # expose unnamed classes +# , messages.W1049 # returns reference to local variable +# , messages.W1014 # unsupported '=' operator ) # sort_algorithms.USE_CALLDEF_ORGANIZER = True ## tried this to remove a couple of order issues, without success :) # Modified: trunk/python-ogre/code_generators/ogre/hand_made_wrappers.py =================================================================== --- trunk/python-ogre/code_generators/ogre/hand_made_wrappers.py 2007-11-02 10:51:56 UTC (rev 465) +++ trunk/python-ogre/code_generators/ogre/hand_made_wrappers.py 2007-11-11 01:31:00 UTC (rev 466) @@ -851,10 +851,8 @@ rt = mb.class_( 'RenderQueueListener' ) print "WRAPPER CODE\n\n" - print rt.wrapper_code -### AJM: this adds the required wrapper code however you need to edit renderqueuelistener.pypp.cpp to remove -### the duplicated function definations for it to compile correctly -##### rt.add_wrapper_code ( WRAPPER_WRAPPER_RenderQueueListener ) + print rt.wrapper_code + rt.add_wrapper_code ( WRAPPER_WRAPPER_RenderQueueListener ) print "NOW\n\n" print rt.wrapper_code Modified: trunk/python-ogre/code_generators/ogre/python_ogre_aliases.h =================================================================== --- trunk/python-ogre/code_generators/ogre/python_ogre_aliases.h 2007-11-02 10:51:56 UTC (rev 465) +++ trunk/python-ogre/code_generators/ogre/python_ogre_aliases.h 2007-11-11 01:31:00 UTC (rev 466) @@ -115,7 +115,7 @@ typedef Ogre::Singleton<Ogre::ArchiveManager> SingletonArchiveManager; typedef Ogre::RenderSystem* RenderSystemPtr; -typedef Ogre::Mesh::SubMeshNameMap MeshSubMeshNameMap; +typedef Ogre::Mesh::SubMeshNameMap SubMeshNameMap; typedef Ogre::RenderSystem RenderSystem; typedef Ogre::ConvexBody::PolygonList PolygonList; typedef Ogre::Polygon::VertexList VertexList; @@ -364,4 +364,4 @@ - + Modified: trunk/python-ogre/code_generators/ogre/python_ogre_sizeof.h =================================================================== --- trunk/python-ogre/code_generators/ogre/python_ogre_sizeof.h 2007-11-02 10:51:56 UTC (rev 465) +++ trunk/python-ogre/code_generators/ogre/python_ogre_sizeof.h 2007-11-11 01:31:00 UTC (rev 466) @@ -3,6 +3,49 @@ // sizeof ( Ogre::ConstVectorIterator ); // sizeof ( Ogre::ConstMapIterator ); +Ogre::AnyNumeric AnyNumInt (1); +Ogre::AnyNumeric AnyNumReal ((Ogre::Real)1.0); +Ogre::AnyNumeric AnyNumUint8 ((Ogre::uint8)0); +Ogre::AnyNumeric AnyNumUint16 ((Ogre::uint16)0); +Ogre::AnyNumeric AnyNumUint32 ((Ogre::uint32)0); +Ogre::AnyNumeric AnyNumUint ((Ogre::uint)0); +Ogre::AnyNumeric AnyNumUlong ((Ogre::ulong)0); +Ogre::AnyNumeric AnyNumUshort ((Ogre::ushort)0); +Ogre::AnyNumeric AnyNumUchar ((Ogre::uchar) 0); + +Ogre::Any AnyInt (1); +Ogre::Any AnyReal ((Ogre::Real)1.0); +Ogre::Any AnyUint8 ((Ogre::uint8)0); +Ogre::Any AnyUint16 ((Ogre::uint16)0); +Ogre::Any AnyUint32 ((Ogre::uint32)0); +Ogre::Any AnyUint ((Ogre::uint)0); +Ogre::Any AnyUlong ((Ogre::ulong)0); +Ogre::Any AnyUshort ((Ogre::ushort)0); +Ogre::Any AnyUchar ((Ogre::uchar) 0); +Ogre::Any AnyString ((Ogre::String) ""); + + +sizeof ( AnyNumInt ); +sizeof ( AnyNumReal ); +sizeof ( AnyNumUint8 ); +sizeof ( AnyNumUint16 ); +sizeof ( AnyNumUint32 ); +sizeof ( AnyNumUint ); +sizeof ( AnyNumUlong ); +sizeof ( AnyNumUshort ); +sizeof ( AnyNumUchar ); + +sizeof ( AnyInt ); +sizeof ( AnyReal ); +sizeof ( AnyUint8 ); +sizeof ( AnyUint16 ); +sizeof ( AnyUint32 ); +sizeof ( AnyUint ); +sizeof ( AnyUlong ); +sizeof ( AnyUshort ); +sizeof ( AnyUchar ); +sizeof ( AnyString ); + sizeof ( Ogre::SharedPtr<Ogre::WaveformControllerFunction> ); // sizeof ( Ogre::ControllerFunction<float>); // sizeof ( Ogre::SharedPtr<Ogre::ControllerFunction<float>>); Modified: trunk/python-ogre/code_generators/ogreforests/generate_code.py =================================================================== --- trunk/python-ogre/code_generators/ogreforests/generate_code.py 2007-11-02 10:51:56 UTC (rev 465) +++ trunk/python-ogre/code_generators/ogreforests/generate_code.py 2007-11-11 01:31:00 UTC (rev 466) @@ -150,6 +150,8 @@ def create_output( size ): return [ ft.output( i ) for i in range( size ) ] + x=main_ns.mem_fun('::GeometryPageManager::update') + x.add_transformation( ft.input('enableCache')) ############################################################################### ## @@ -337,10 +339,11 @@ recursive=False ) ## and we do a special here as we have to modify a header (PagedGeomerty) to with with GCCXML - os.remove ( os.path.join ( environment.ogreforests.generated_dir, "PagedGeometry.h" ) ) - common_utils.copyTree ( sourcePath = os.path.join(environment.Config.PATH_INCLUDE_ogreforests,"orig"), - destPath = environment.ogreforests.generated_dir, - recursive=False ) + ## Not needed now as GCCXML has been updated +# # os.remove ( os.path.join ( environment.ogreforests.generated_dir, "PagedGeometry.h" ) ) +# # common_utils.copyTree ( sourcePath = os.path.join(environment.Config.PATH_INCLUDE_ogreforests,"orig"), +# # destPath = environment.ogreforests.generated_dir, +# # recursive=False ) if __name__ == '__main__': start_time = time.clock() Modified: trunk/python-ogre/environment.py =================================================================== --- trunk/python-ogre/environment.py 2007-11-02 10:51:56 UTC (rev 465) +++ trunk/python-ogre/environment.py 2007-11-11 01:31:00 UTC (rev 466) @@ -119,18 +119,26 @@ includePaths = [] myIncludes = [] libaries = myLibraries # a list of the libraries I need plus - mySource = [] # where to get the source - tuples, {'svn|cvs|ftp|http','utl'} - myBuildCmds = [] # commands to build the library with + Source = [] # where to get the source - tuples, {'svn|cvs|ftp|http','utl'} + BuildCmds = [] # commands to build the library with ###################### +class GeneralModules: + pythonModule = False + Source = [ + ["wget", "http://developer.download.nvidia.com/cg/Cg_1.5/1.5.0/0022/Cg-1.5_Aug2007_x86.tar.gz",''], + ["wget", "http://www.cmake.org/files/v2.4/cmake-2.4.6-Linux-i386.tar.gz",''], + ["wget", "http://downloads.sourceforge.net/scons/scons-0.97.0d20070918.tar.gz",''], + ] + class boost: + active = True version = "3.4" pythonModule = False ModuleName = "" myHome = 'boost' myLibraryPaths = [ 'boost/bin.v2/libs/python2.5/build/msvc-8.0/release/threading-multi' ] myLibraries = [ 'boost_python-vc80-mt-1_35'] - parent = None children = [] codeGenerationFlags=[] @@ -140,9 +148,11 @@ includePaths = [] myIncludes = [] libaries = myLibraries # a list of the libraries I need plus - mySource = ['http://prdownloads.sourceforge.net/boost/boost-jam-3.1.13-1-linuxx86.tgz', - 'http://downloads.sourceforge.net/boost/boost_1_34_0.tar.bz2'] # where to get the source - tuples, {'svn|cvs|ftp|http','utl'} - myBuildCmds = [] # commands to build the library with + Source = [ + ['wget','http://prdownloads.sourceforge.net/boost/boost-jam-3.1.13-1-linuxx86.tgz',''] , + ['wget','http://downloads.sourceforge.net/boost/boost_1_34_0.tar.bz2',''] + ] # where to get the source - tuples, {'svn|cvs|ftp|http','utl'} + BuildCmds = [] # commands to build the library with class ogre: active = True @@ -199,11 +209,17 @@ cflags += '--gccxml-cxxflags "-DCF_OPEN_SOURCE -D_POSIX_C_SOURCE -isysroot /Developer/SDKs/MacOSX10.4u.sdk"' CheckIncludes=['boost/python.hpp', 'Ogre.h'] - + Source = [ + ["wget", "http://prdownloads.sourceforge.net/ogre/ogre-linux_osx-v1-4-5.tar.bz2",''], + ["wget", "http://prdownloads.sourceforge.net/freeimage/FreeImage393.zip",''], + + ] class ois: active = True - version= "1.0" + pythonModule = True + version= "1.1" + cflags='' parent = "ogre/io" if os.name=='nt': libs=['OIS_Static',Config.LIB_Boost] @@ -316,7 +332,10 @@ ModuleName = 'ODE' CheckIncludes = ['boost/python.hpp', 'ode/ode.h'] active=True - + Source = [ + ["wget", "http://prdownloads.sourceforge.net/opende/ode-src-0.8.zip",''] + ] + class opcode: version= "1.3" parent = "ogre/physics" @@ -570,7 +589,6 @@ , Config.PATH_INCLUDE_OGG , Config.PATH_INCLUDE_VORBIS , Config.PATH_INCLUDE_OPENAL - , Config.PATH_INCLUDE_ALUT ] if os.name=='nt': lib_dirs = [ Config.PATH_LIB_Boost @@ -580,7 +598,6 @@ ,os.path.join(Config.PATH_VORBIS, 'win32','VorbisEnc_Static_Release') ,os.path.join(Config.PATH_VORBIS, 'win32','VorbisFile_Static_Release') ,os.path.join(Config.PATH_OPENAL, 'libs','Win32') - ,os.path.join(Config.PATH_ALUT, 'lib') ] else: lib_dirs = [ Config.PATH_LIB_Boost @@ -591,19 +608,21 @@ CCFLAGS = ' -DOgreAL_Export="" -DWIN32 -DNDEBUG -D_LIB -D_WIN32 -D_WINDOWS -DVORBIS_IEEE_FLOAT32 -D_USE_NON_INTEL_COMPILER ' libs=[Config.LIB_Boost, 'OgreMain', 'ogg_static', - 'alut', 'vorbis_static','vorbisfile_static','vorbisenc_static', 'OpenAL32', 'EFX-Util'] ## 'OgreAL' -- going to compile OgreAL ourselves else: libs=[Config.LIB_Boost, 'OgreMain', 'ogg', - 'alut', 'vorbis','vorbisfile','vorbisenc', 'openal'] ## 'OgreAL' -- going to compile OgreAL ourselves ModuleName = 'OgreAL' CheckIncludes = ['OgreAL.h'] active=True - + Source = [ + ["wget", "http://www.openal.org/openal_webstf/downloads/openal-0.0.8.tar.gz",''], + ["wget", "http://downloads.xiph.org/releases/ogg/libogg-1.1.3.tar.gz",''], + ["wget", "http://downloads.xiph.org/releases/vorbis/libvorbis-1.2.0.tar.gz",''], + ] class ogrevideoffmpeg: version="0.2.1" parent="ogre/addons" @@ -686,8 +705,10 @@ cflags = "" parent = "ogre/physics" libs = [Config.LIB_Boost, 'OgreMain', - 'LibBulletCollision', 'LibBulletDynamics', 'LibBulletMath' + 'LibBulletCollision', 'LibBulletDynamics' ] + if os.name == 'nt': + libs.append('LibBulletMath') include_dirs = [Config.PATH_Boost , Config.PATH_INCLUDE_Bullet , os.path.join(Config.PATH_OgreBullet, 'Collisions' ) @@ -711,8 +732,10 @@ cflags = "" parent = "ogre/physics" libs = [Config.LIB_Boost, 'OgreMain', - 'LibBulletCollision', 'LibBulletDynamics', 'LibBulletMath' + 'LibBulletCollision', 'LibBulletDynamics' ] + if os.name == 'nt': + libs.append('LibBulletMath') include_dirs = [Config.PATH_Boost , Config.PATH_INCLUDE_Bullet , os.path.join(Config.PATH_OgreBullet, 'Collisions' ) @@ -747,6 +770,38 @@ ModuleName="noise" active=True +class watermesh: + version="1.0" + parent="ogre/addons" + cflags = "" + include_dirs = [ Config.PATH_Boost, + Config.PATH_watermesh + , Config.PATH_INCLUDE_Ogre + ] + lib_dirs = [Config.PATH_LIB_Boost, + Config.PATH_LIB_Ogre_OgreMain + ] + CheckIncludes=[] + libs=[ Config.LIB_Boost, 'OgreMain' ] + ModuleName="watermesh" + active=True + +class ofusion: + version="1.0" + parent="ogre/addons" + cflags = "" + include_dirs = [ Config.PATH_Boost, + Config.PATH_ofusion + , Config.PATH_INCLUDE_Ogre + ] + lib_dirs = [Config.PATH_LIB_Boost, + Config.PATH_LIB_Ogre_OgreMain + ] + CheckIncludes=[] + libs=[ Config.LIB_Boost, 'OgreMain' ] + ModuleName="ofusion" + active=True + ############################################################################################ ## Here is the master list.... @@ -779,6 +834,8 @@ , 'et' : et , 'caelum' : caelum , 'noise' : noise + , 'watermesh' : watermesh + , 'ofusion' : ofusion } # @@ -813,8 +870,10 @@ # # a couple of specials that should be done differently gccxml_bin = Config.gccxml_bin -pyplusplus_install_dir = Config.pyplusplus_install_dir - +pyplusplus_install_dir = Config.pyplusplus_install_dir + +rpath= Config.RPATH + for name, cls in projects.items(): # little hack to allow overriding of settings from the config file Modified: trunk/python-ogre/setup.py =================================================================== --- trunk/python-ogre/setup.py 2007-11-02 10:51:56 UTC (rev 465) +++ trunk/python-ogre/setup.py 2007-11-11 01:31:00 UTC (rev 466) @@ -70,7 +70,7 @@ 'ogre.addons.ogrevideoffmpeg', 'ogre.addons.ogredshow', 'ogre.addons.plib','ogre.gui.navi', 'ogre.addons.ogreforests', 'ogre.addons.et', 'ogre.addons.caelum', - 'ogre.addons.noise' ], + 'ogre.addons.noise', 'ogre.addons.watermesh', 'ogre.addons.ofusion' ], "package_dir": {'': 'packages_'+ PythonVersionString }, "package_data": {'': ['*.pyd', '*.dll', '*.so']} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |