[Python-ogre-commit] SF.net SVN: python-ogre:[855] trunk/python-ogre
Brought to you by:
andy_miller,
roman_yakovenko
From: <and...@us...> - 2009-01-26 13:15:09
|
Revision: 855 http://python-ogre.svn.sourceforge.net/python-ogre/?rev=855&view=rev Author: andy_miller Date: 2009-01-26 12:03:56 +0000 (Mon, 26 Jan 2009) Log Message: ----------- Final set of Linux updates before moving to branch (1.6.1) Modified Paths: -------------- trunk/python-ogre/code_generators/ogrenewt/generate_code.py trunk/python-ogre/environment.py Added Paths: ----------- trunk/python-ogre/ReportVersion.out.linux trunk/python-ogre/demos/plugins.cfg.posix Removed Paths: ------------- trunk/python-ogre/demos/plugins.cfg.linux Added: trunk/python-ogre/ReportVersion.out.linux =================================================================== --- trunk/python-ogre/ReportVersion.out.linux (rev 0) +++ trunk/python-ogre/ReportVersion.out.linux 2009-01-26 12:03:56 UTC (rev 855) @@ -0,0 +1,94 @@ +Module OGRE ( ogre.renderer.OGRE ) + PythonOgre Ver: 1.6.1 + Module Version: 1.6.1 + Python Version: 2.5.2 (r252:60911, Oct 5 2008, 19:24:49) [GCC 4.3.2] + Code Generated: 1 + Compiled : 16:48:28 Jan 26 2009 + Raw Detail : 1.6.1_853M_ogre_1.6.1_1 +Module OIS ( ogre.io.OIS ) + PythonOgre Ver: 1.6.1 + Module Version: 1.0 + Python Version: 2.5.2 (r252:60911, Oct 5 2008, 19:24:49) [GCC 4.3.2] + Code Generated: 1 + Compiled : 19:50:58 Jan 26 2009 + Raw Detail : 1.6.1_853:854_ois_1.0_1 +Import failed: betagui +Module OgreAL ( ogre.sound.OgreAL ) + PythonOgre Ver: 1.6.1 + Module Version: r115 + Python Version: 2.5.2 (r252:60911, Oct 5 2008, 19:24:49) [GCC 4.3.2] + Code Generated: 1 + Compiled : 17:48:43 Jan 26 2009 + Raw Detail : 1.6.1_853_ogreal_r115_1 +Import failed: ODE +Import failed: OgreRefApp +Module OgreOde ( ogre.physics.OgreOde ) + PythonOgre Ver: 1.6.1 + Module Version: r2497 + Python Version: 2.5.2 (r252:60911, Oct 5 2008, 19:24:49) [GCC 4.3.2] + Code Generated: 1 + Compiled : 19:37:20 Jan 26 2009 + Raw Detail : 1.6.1_853_ogreode_r2497_1 +Import failed: OgreNewt +Import failed: Opcode +Import failed: bullet +Import failed: PhysX +Import failed: NxOgre +Import failed: OgreBulletC +Import failed: OgreBulletD +Import failed: theora +Module plib ( ogre.addons.plib ) + PythonOgre Ver: 1.6.1 + Module Version: 1.6.1 + Python Version: 2.5.2 (r252:60911, Oct 5 2008, 19:24:49) [GCC 4.3.2] + Code Generated: 1 + Compiled : 18:53:22 Jan 26 2009 + Raw Detail : 1.6.1_853_ogre_1.6.1_1 +Module ogreforests ( ogre.addons.ogreforests ) + PythonOgre Ver: 1.6.1 + Module Version: r2615 + Python Version: 2.5.2 (r252:60911, Oct 5 2008, 19:24:49) [GCC 4.3.2] + Code Generated: 1 + Compiled : 18:39:01 Jan 26 2009 + Raw Detail : 1.6.1_853_ogreforests_r2615_1 +Module et ( ogre.addons.et ) + PythonOgre Ver: 1.6.1 + Module Version: 2.3.1 + Python Version: 2.5.2 (r252:60911, Oct 5 2008, 19:24:49) [GCC 4.3.2] + Code Generated: 1 + Compiled : 18:28:25 Jan 26 2009 + Raw Detail : 1.6.1_853_et_2.3.1_1 +Module caelum ( ogre.addons.caelum ) + PythonOgre Ver: 1.6.1 + Module Version: 0.4 + Python Version: 2.5.2 (r252:60911, Oct 5 2008, 19:24:49) [GCC 4.3.2] + Code Generated: 1 + Compiled : 17:44:38 Jan 26 2009 + Raw Detail : 1.6.1_853_caelum_0.4_1 +Module noise ( ogre.addons.noise ) + PythonOgre Ver: 1.6.1 + Module Version: r2486 + Python Version: 2.5.2 (r252:60911, Oct 5 2008, 19:24:49) [GCC 4.3.2] + Code Generated: 1 + Compiled : 19:41:07 Jan 26 2009 + Raw Detail : 1.6.1_853_noise_r2486_1 +Import failed: watermesh +Import failed: particleuniverse +Module cadunetree ( ogre.addons.cadunetree ) + PythonOgre Ver: 1.6.1 + Module Version: 0.6 + Python Version: 2.5.2 (r252:60911, Oct 5 2008, 19:24:49) [GCC 4.3.2] + Code Generated: 1 + Compiled : 19:48:28 Jan 26 2009 + Raw Detail : 1.6.1_853_cadunetree_0.6_1 +Import failed: ogrepcz +Module hydrax ( ogre.addons.hydrax ) + PythonOgre Ver: 1.6.1 + Module Version: 0.4 + Python Version: 2.5.2 (r252:60911, Oct 5 2008, 19:24:49) [GCC 4.3.2] + Code Generated: 1 + Compiled : 19:57:00 Jan 26 2009 + Raw Detail : 1.6.1_853_hydrax_0.4_1 +Import failed: hikari +Import failed: canvas +Import failed: mygui Modified: trunk/python-ogre/code_generators/ogrenewt/generate_code.py =================================================================== --- trunk/python-ogre/code_generators/ogrenewt/generate_code.py 2009-01-26 09:34:29 UTC (rev 854) +++ trunk/python-ogre/code_generators/ogrenewt/generate_code.py 2009-01-26 12:03:56 UTC (rev 855) @@ -220,7 +220,9 @@ if environment._USE_THREADS: defined_symbols.append('BOOST_HAS_THREADS') defined_symbols.append('BOOST_HAS_WINTHREADS') - + if environment.isLinux(): + defined_symbols.append('BOOST_IS_ENUM') + mb = module_builder.module_builder_t( [ xml_cached_fc ] , gccxml_path=environment.gccxml_bin , working_directory=environment.root_dir Deleted: trunk/python-ogre/demos/plugins.cfg.linux =================================================================== --- trunk/python-ogre/demos/plugins.cfg.linux 2009-01-26 09:34:29 UTC (rev 854) +++ trunk/python-ogre/demos/plugins.cfg.linux 2009-01-26 12:03:56 UTC (rev 855) @@ -1,13 +0,0 @@ -# Defines plugins to load - -## Use this for Windows - - -## -## NOTE use this for MacOS or Linux -PluginFolder=/home/andy/development/root/usr/lib/OGRE -Plugin=RenderSystem_GL -Plugin=Plugin_ParticleFX -Plugin=Plugin_BSPSceneManager -Plugin=Plugin_OctreeSceneManager -Plugin=Plugin_CgProgramManager Copied: trunk/python-ogre/demos/plugins.cfg.posix (from rev 853, trunk/python-ogre/demos/plugins.cfg.linux) =================================================================== --- trunk/python-ogre/demos/plugins.cfg.posix (rev 0) +++ trunk/python-ogre/demos/plugins.cfg.posix 2009-01-26 12:03:56 UTC (rev 855) @@ -0,0 +1,13 @@ +# Defines plugins to load + +## Use this for Windows + + +## +## NOTE use this for MacOS or Linux +PluginFolder=/home/andy/development/root/usr/lib/OGRE +Plugin=RenderSystem_GL +Plugin=Plugin_ParticleFX +Plugin=Plugin_BSPSceneManager +Plugin=Plugin_OctreeSceneManager +Plugin=Plugin_CgProgramManager Property changes on: trunk/python-ogre/demos/plugins.cfg.posix ___________________________________________________________________ Added: svn:mergeinfo + Modified: trunk/python-ogre/environment.py =================================================================== --- trunk/python-ogre/environment.py 2009-01-26 09:34:29 UTC (rev 854) +++ trunk/python-ogre/environment.py 2009-01-26 12:03:56 UTC (rev 855) @@ -747,7 +747,7 @@ libs=['OIS_static',boost.lib] else: - libs=['OIS_static',boost.lib] + libs=['OIS',boost.lib] #libs.append ( boost_python_index.lib ) if os.name=="nt": libs.append ( "User32" ) # needed for static linking @@ -823,8 +823,10 @@ [0, "patch -s -N -i ../../python-ogre/patch/ogrenewt.patch -p0", baseDir], #[0, "cp SConscript OgreNewt_Main", baseDir], #[0, "rm SConscript", baseDir], - [0, rm + " -rf ./OgreNewt_Main/inc/boost", baseDir], - [0, "scons prefix=%s boost=%s/include/boost-1_34_1 install" % (PREFIX, PREFIX), baseDir], ##WARNING -- boost include dir name is different than build name (dash not underscore) + [0, rm + " -rf ./OgreNewt_Main/inc/boost", baseDir], + [0, 'cp SConscript OgreNewt_Main', baseDir], + [0, "scons prefix=%s boost=%s/include/boost-1_37 build" % (PREFIX, PREFIX), baseDir], ##WARNING -- boost include dir name is different than build name (dash not underscore) + [0, "scons prefix=%s boost=%s/include/boost-1_37 install" % (PREFIX, PREFIX), baseDir], ] if isWindows(): buildCmds = [ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |