[Python-ogre-commit] SF.net SVN: python-ogre:[785] trunk/python-ogre
Brought to you by:
andy_miller,
roman_yakovenko
From: <and...@us...> - 2008-10-31 08:18:21
|
Revision: 785 http://python-ogre.svn.sourceforge.net/python-ogre/?rev=785&view=rev Author: andy_miller Date: 2008-10-31 08:18:17 +0000 (Fri, 31 Oct 2008) Log Message: ----------- Updates to enable threading in Ogre Modified Paths: -------------- trunk/python-ogre/code_generators/betagui/generate_code.py trunk/python-ogre/code_generators/cadunetree/generate_code.py trunk/python-ogre/code_generators/caelum/generate_code.py trunk/python-ogre/code_generators/cegui/generate_code.py trunk/python-ogre/code_generators/et/generate_code.py trunk/python-ogre/code_generators/hikari/generate_code.py trunk/python-ogre/code_generators/hydrax/generate_code.py trunk/python-ogre/code_generators/noise/generate_code.py trunk/python-ogre/code_generators/nxogre/generate_code.py trunk/python-ogre/code_generators/ofusion/generate_code.py trunk/python-ogre/code_generators/ogre/generate_code.py trunk/python-ogre/code_generators/ogreal/generate_code.py trunk/python-ogre/code_generators/ogrebulletc/generate_code.py trunk/python-ogre/code_generators/ogrebulletd/generate_code.py trunk/python-ogre/code_generators/ogreforests/generate_code.py trunk/python-ogre/code_generators/ogrenewt/generate_code.py trunk/python-ogre/code_generators/ogreode/generate_code.py trunk/python-ogre/code_generators/ogrepcz/generate_code.py trunk/python-ogre/code_generators/ogrerefapp/generate_code.py trunk/python-ogre/code_generators/particleuniverse/generate_code.py trunk/python-ogre/code_generators/quickgui/generate_code.py trunk/python-ogre/code_generators/theora/generate_code.py trunk/python-ogre/demos/particleuniverse/Demo_Particle.py trunk/python-ogre/environment.py trunk/python-ogre/scripts/compilesource.bat trunk/python-ogre/scripts/vsvars32.bat Modified: trunk/python-ogre/code_generators/betagui/generate_code.py =================================================================== --- trunk/python-ogre/code_generators/betagui/generate_code.py 2008-10-30 06:12:20 UTC (rev 784) +++ trunk/python-ogre/code_generators/betagui/generate_code.py 2008-10-31 08:18:17 UTC (rev 785) @@ -371,7 +371,7 @@ os.path.join( environment.betagui.root_dir, "python_betagui.h" ) , environment.betagui.cache_file ) - defined_symbols = [ 'OGRE_NONCLIENT_BUILD' ] + defined_symbols = [ 'OGRE_NONCLIENT_BUILD','__PYTHONOGRE_BUILD_CODE' ] if environment._USE_THREADS: defined_symbols.append('BOOST_HAS_THREADS') Modified: trunk/python-ogre/code_generators/cadunetree/generate_code.py =================================================================== --- trunk/python-ogre/code_generators/cadunetree/generate_code.py 2008-10-30 06:12:20 UTC (rev 784) +++ trunk/python-ogre/code_generators/cadunetree/generate_code.py 2008-10-31 08:18:17 UTC (rev 785) @@ -199,9 +199,13 @@ os.path.join( environment.cadunetree.root_dir, "python_cadunetree.h" ) , environment.cadunetree.cache_file ) - defined_symbols = [ 'OGRE_NONCLIENT_BUILD', 'OGRE_GCC_VISIBILITY' ] + defined_symbols = [ 'OGRE_NONCLIENT_BUILD', 'OGRE_GCC_VISIBILITY','__PYTHONOGRE_BUILD_CODE' ] defined_symbols.append( 'VERSION_' + environment.cadunetree.version ) - + + if environment._USE_THREADS: + defined_symbols.append('BOOST_HAS_THREADS') + defined_symbols.append('BOOST_HAS_WINTHREADS') + # # build the core Py++ system from the GCCXML created source # Modified: trunk/python-ogre/code_generators/caelum/generate_code.py =================================================================== --- trunk/python-ogre/code_generators/caelum/generate_code.py 2008-10-30 06:12:20 UTC (rev 784) +++ trunk/python-ogre/code_generators/caelum/generate_code.py 2008-10-31 08:18:17 UTC (rev 785) @@ -254,8 +254,11 @@ os.path.join( environment.caelum.root_dir, "python_caelum.h" ) , environment.caelum.cache_file ) - defined_symbols = [ 'OGRE_NONCLIENT_BUILD' ] + defined_symbols = [ 'OGRE_NONCLIENT_BUILD','__PYTHONOGRE_BUILD_CODE' ] defined_symbols.append( 'VERSION_' + environment.caelum.version ) + if environment._USE_THREADS: + defined_symbols.append('BOOST_HAS_THREADS') + defined_symbols.append('BOOST_HAS_WINTHREADS') # # build the core Py++ system from the GCCXML created source Modified: trunk/python-ogre/code_generators/cegui/generate_code.py =================================================================== --- trunk/python-ogre/code_generators/cegui/generate_code.py 2008-10-30 06:12:20 UTC (rev 784) +++ trunk/python-ogre/code_generators/cegui/generate_code.py 2008-10-31 08:18:17 UTC (rev 785) @@ -258,12 +258,19 @@ xml_cached_fc = parser.create_cached_source_fc( os.path.join( environment.cegui.root_dir, "python_CEGUI.h" ) , environment.cegui.cache_file ) + + defined_symbols = [ 'OGRE_NONCLIENT_BUILD', 'CEGUI_NONCLIENT_BUILD','OGRE_GCC_VISIBILITY','__PYTHONOGRE_BUILD_CODE' ] + defined_symbols.append( 'VERSION_' + environment.cegui.version ) + if environment._USE_THREADS: + defined_symbols.append('BOOST_HAS_THREADS') + defined_symbols.append('BOOST_HAS_WINTHREADS') + mb = module_builder.module_builder_t( [ xml_cached_fc ] , gccxml_path=environment.gccxml_bin , working_directory=environment.root_dir , include_paths=environment.cegui.include_dirs - , define_symbols=['CEGUI_NONCLIENT_BUILD', 'OGRE_NONCLIENT_BUILD'] + , define_symbols=defined_symbols , indexing_suite_version=2 ) filter_declarations (mb) Modified: trunk/python-ogre/code_generators/et/generate_code.py =================================================================== --- trunk/python-ogre/code_generators/et/generate_code.py 2008-10-30 06:12:20 UTC (rev 784) +++ trunk/python-ogre/code_generators/et/generate_code.py 2008-10-31 08:18:17 UTC (rev 785) @@ -224,9 +224,12 @@ os.path.join( environment.et.root_dir, "python_et.h" ) , environment.et.cache_file ) - defined_symbols = ['OGRE_NONCLIENT_BUILD' ] + defined_symbols = ['OGRE_NONCLIENT_BUILD','__PYTHONOGRE_BUILD_CODE' ] defined_symbols.append( 'VERSION_' + environment.et.version ) - + if environment._USE_THREADS: + defined_symbols.append('BOOST_HAS_THREADS') + defined_symbols.append('BOOST_HAS_WINTHREADS') + # # build the core Py++ system from the GCCXML created source # Modified: trunk/python-ogre/code_generators/hikari/generate_code.py =================================================================== --- trunk/python-ogre/code_generators/hikari/generate_code.py 2008-10-30 06:12:20 UTC (rev 784) +++ trunk/python-ogre/code_generators/hikari/generate_code.py 2008-10-31 08:18:17 UTC (rev 785) @@ -233,8 +233,11 @@ , environment.hikari.cache_file ) # Vector_c define to allow GCC to process delegates.h - defined_symbols = ['OGRE_NONCLIENT_BUILD', 'HIKARI_NONCLIENT_BUILD', '__VECTOR_C' ] + defined_symbols = ['OGRE_NONCLIENT_BUILD', 'HIKARI_NONCLIENT_BUILD', '__VECTOR_C', '__PYTHONOGRE_BUILD_CODE' ] defined_symbols.append( 'VERSION_' + environment.hikari.version ) + if environment._USE_THREADS: + defined_symbols.append('BOOST_HAS_THREADS') + defined_symbols.append('BOOST_HAS_WINTHREADS') # # build the core Py++ system from the GCCXML created source Modified: trunk/python-ogre/code_generators/hydrax/generate_code.py =================================================================== --- trunk/python-ogre/code_generators/hydrax/generate_code.py 2008-10-30 06:12:20 UTC (rev 784) +++ trunk/python-ogre/code_generators/hydrax/generate_code.py 2008-10-31 08:18:17 UTC (rev 785) @@ -200,9 +200,12 @@ os.path.join( environment.hydrax.root_dir, "python_hydrax.h" ) , environment.hydrax.cache_file ) - defined_symbols = ['OGRE_NONCLIENT_BUILD' ] + defined_symbols = ['OGRE_NONCLIENT_BUILD','__PYTHONOGRE_BUILD_CODE' ] defined_symbols.append( 'VERSION_' + environment.hydrax.version ) - + if environment._USE_THREADS: + defined_symbols.append('BOOST_HAS_THREADS') + defined_symbols.append('BOOST_HAS_WINTHREADS') + # # build the core Py++ system from the GCCXML created source # Modified: trunk/python-ogre/code_generators/noise/generate_code.py =================================================================== --- trunk/python-ogre/code_generators/noise/generate_code.py 2008-10-30 06:12:20 UTC (rev 784) +++ trunk/python-ogre/code_generators/noise/generate_code.py 2008-10-31 08:18:17 UTC (rev 785) @@ -248,7 +248,10 @@ , environment.noise.cache_file ) - defined_symbols = [ 'OGRE_NONCLIENT_BUILD' ] + defined_symbols = [ 'OGRE_NONCLIENT_BUILD','__PYTHONOGRE_BUILD_CODE' ] + if environment._USE_THREADS: + defined_symbols.append('BOOST_HAS_THREADS') + defined_symbols.append('BOOST_HAS_WINTHREADS') defined_symbols.append( 'VERSION_' + environment.noise.version ) Modified: trunk/python-ogre/code_generators/nxogre/generate_code.py =================================================================== --- trunk/python-ogre/code_generators/nxogre/generate_code.py 2008-10-30 06:12:20 UTC (rev 784) +++ trunk/python-ogre/code_generators/nxogre/generate_code.py 2008-10-31 08:18:17 UTC (rev 785) @@ -612,9 +612,9 @@ os.path.join( environment.nxogre.root_dir, "python_nxogre.h" ) , environment.nxogre.cache_file ) if os.name == 'nt': - defined_symbols = [ 'NxExport','OGRE_NONCLIENT_BUILD', 'OGRE_GCC_VISIBILITY', 'WIN32', 'GCC_XML']#NXOGRE_EXPORTS' + defined_symbols = [ '__PYTHONOGRE_BUILD_CODE','NxExport','OGRE_NONCLIENT_BUILD', 'OGRE_GCC_VISIBILITY', 'WIN32', 'GCC_XML']#NXOGRE_EXPORTS' else: - defined_symbols = [ 'LINUX','NX_LINUX', 'NX_DISABLE_FLUIDS', 'OGRE_NONCLIENT_BUILD', 'OGRE_GCC_VISIBILITY', 'GCC_XML'] + defined_symbols = [ '__PYTHONOGRE_BUILD_CODE','LINUX','NX_LINUX', 'NX_DISABLE_FLUIDS', 'OGRE_NONCLIENT_BUILD', 'OGRE_GCC_VISIBILITY', 'GCC_XML'] if environment._USE_THREADS: defined_symbols.append('BOOST_HAS_THREADS') Modified: trunk/python-ogre/code_generators/ofusion/generate_code.py =================================================================== --- trunk/python-ogre/code_generators/ofusion/generate_code.py 2008-10-30 06:12:20 UTC (rev 784) +++ trunk/python-ogre/code_generators/ofusion/generate_code.py 2008-10-31 08:18:17 UTC (rev 785) @@ -201,9 +201,12 @@ os.path.join( environment.ofusion.root_dir, "python_ofusion.h" ) , environment.ofusion.cache_file ) - defined_symbols = ['OGRE_NONCLIENT_BUILD' ] + defined_symbols = ['OGRE_NONCLIENT_BUILD','__PYTHONOGRE_BUILD_CODE' ] defined_symbols.append( 'VERSION_' + environment.ofusion.version ) - + if environment._USE_THREADS: + defined_symbols.append('BOOST_HAS_THREADS') + defined_symbols.append('BOOST_HAS_WINTHREADS') + # # build the core Py++ system from the GCCXML created source # Modified: trunk/python-ogre/code_generators/ogre/generate_code.py =================================================================== --- trunk/python-ogre/code_generators/ogre/generate_code.py 2008-10-30 06:12:20 UTC (rev 784) +++ trunk/python-ogre/code_generators/ogre/generate_code.py 2008-10-31 08:18:17 UTC (rev 785) @@ -281,7 +281,14 @@ print '{*} function "%s" is marked as internal' % declarations.full_name( func ) # this change was for 1.7 but also needed for 1.4 - noncopy=['Camera','Frustum', 'Log'] + noncopy=['Camera','Frustum', 'Log' ] + + # these showed up during threading -- possible needs to be done all the time (needs to be looked at) + if environment._USE_THREADS: + noncopy = noncopy + ['Compositor', 'DefaultHardwareBufferManager', 'DefaultSceneManager', 'Font', 'FontManager', + 'HighLevelGpuProgramManager','Material', 'Mesh', 'MeshManager', + 'ParticleSystemManager', 'Pass', 'PatchMesh', 'ResourceGroupManager', + 'Skeleton', 'SkeletonInstance', 'SkeletonManager', 'UnifiedHighLevelGpuProgram'] for c in noncopy: main_ns.class_(c).noncopyable = True @@ -1064,7 +1071,7 @@ xml_cached_fc = parser.create_cached_source_fc( os.path.join( environment.ogre.root_dir, "python_ogre.h" ) , environment.ogre.cache_file ) - defined_symbols = [ 'OGRE_NONCLIENT_BUILD', 'OGRE_GCC_VISIBILITY'] + defined_symbols = [ 'OGRE_NONCLIENT_BUILD', 'OGRE_GCC_VISIBILITY', '__PYTHONOGRE_BUILD_CODE'] undefine_symbols=[] if environment._USE_THREADS: defined_symbols.append('BOOST_HAS_THREADS') Modified: trunk/python-ogre/code_generators/ogreal/generate_code.py =================================================================== --- trunk/python-ogre/code_generators/ogreal/generate_code.py 2008-10-30 06:12:20 UTC (rev 784) +++ trunk/python-ogre/code_generators/ogreal/generate_code.py 2008-10-31 08:18:17 UTC (rev 785) @@ -235,8 +235,11 @@ os.path.join( environment.ogreal.root_dir, "python_ogreal.h" ) , environment.ogreal.cache_file ) - defined_symbols = [ 'OGRE_NONCLIENT_BUILD' ] + defined_symbols = [ 'OGRE_NONCLIENT_BUILD','__PYTHONOGRE_BUILD_CODE' ] defined_symbols.append( 'VERSION_' + environment.ogreal.version ) + if environment._USE_THREADS: + defined_symbols.append('BOOST_HAS_THREADS') + defined_symbols.append('BOOST_HAS_WINTHREADS') # # build the core Py++ system from the GCCXML created source Modified: trunk/python-ogre/code_generators/ogrebulletc/generate_code.py =================================================================== --- trunk/python-ogre/code_generators/ogrebulletc/generate_code.py 2008-10-30 06:12:20 UTC (rev 784) +++ trunk/python-ogre/code_generators/ogrebulletc/generate_code.py 2008-10-31 08:18:17 UTC (rev 785) @@ -212,10 +212,14 @@ , environment.ogrebulletc.cache_file ) if os.name == 'nt': - defined_symbols = ["WIN32","NDEBUG","_WINDOWS", "_PRECOMP", 'OGRE_NONCLIENT_BUILD' ] + defined_symbols = ["WIN32","NDEBUG","_WINDOWS", "_PRECOMP", 'OGRE_NONCLIENT_BUILD','__PYTHONOGRE_BUILD_CODE' ] else: defined_symbols = ["NDEBUG", "_PRECOMP", 'OGRE_NONCLIENT_BUILD' ] - defined_symbols.append( 'VERSION_' + environment.ogrebulletc.version ) + defined_symbols.append( 'VERSION_' + environment.ogrebulletc.version ) + if environment._USE_THREADS: + defined_symbols.append('BOOST_HAS_THREADS') + defined_symbols.append('BOOST_HAS_WINTHREADS') + # # build the core Py++ system from the GCCXML created source Modified: trunk/python-ogre/code_generators/ogrebulletd/generate_code.py =================================================================== --- trunk/python-ogre/code_generators/ogrebulletd/generate_code.py 2008-10-30 06:12:20 UTC (rev 784) +++ trunk/python-ogre/code_generators/ogrebulletd/generate_code.py 2008-10-31 08:18:17 UTC (rev 785) @@ -200,11 +200,15 @@ , environment.ogrebulletd.cache_file ) if os.name == 'nt': - defined_symbols = ["WIN32","NDEBUG","_WINDOWS", "_PRECOMP", 'OGRE_NONCLIENT_BUILD' ] + defined_symbols = ["WIN32","NDEBUG","_WINDOWS", "_PRECOMP", 'OGRE_NONCLIENT_BUILD','__PYTHONOGRE_BUILD_CODE' ] else: defined_symbols = ["NDEBUG", "_PRECOMP", 'OGRE_NONCLIENT_BUILD' ] - defined_symbols.append( 'VERSION_' + environment.ogrebulletd.version ) - + defined_symbols.append( 'VERSION_' + environment.ogrebulletd.version ) + + if environment._USE_THREADS: + defined_symbols.append('BOOST_HAS_THREADS') + defined_symbols.append('BOOST_HAS_WINTHREADS') + # # build the core Py++ system from the GCCXML created source # Modified: trunk/python-ogre/code_generators/ogreforests/generate_code.py =================================================================== --- trunk/python-ogre/code_generators/ogreforests/generate_code.py 2008-10-30 06:12:20 UTC (rev 784) +++ trunk/python-ogre/code_generators/ogreforests/generate_code.py 2008-10-31 08:18:17 UTC (rev 785) @@ -255,7 +255,12 @@ os.path.join( environment.ogreforests.root_dir, "python_forests.h" ) , environment.ogreforests.cache_file ) - defined_symbols = ['OGRE_NONCLIENT_BUILD', 'WIN32', "GCCXML_BUG" ] + defined_symbols = ['OGRE_NONCLIENT_BUILD', 'WIN32', "GCCXML_BUG", '__PYTHONOGRE_BUILD_CODE' ] + undefine_symbols=[] + if environment._USE_THREADS: + defined_symbols.append('BOOST_HAS_THREADS') + defined_symbols.append('BOOST_HAS_WINTHREADS') + defined_symbols.append( 'VERSION_' + environment.ogreforests.version ) # Modified: trunk/python-ogre/code_generators/ogrenewt/generate_code.py =================================================================== --- trunk/python-ogre/code_generators/ogrenewt/generate_code.py 2008-10-30 06:12:20 UTC (rev 784) +++ trunk/python-ogre/code_generators/ogrenewt/generate_code.py 2008-10-31 08:18:17 UTC (rev 785) @@ -207,13 +207,20 @@ xml_cached_fc = parser.create_cached_source_fc( os.path.join( environment.ogrenewt.root_dir, "python_ogrenewt.h" ) , environment.ogrenewt.cache_file ) - + + defined_symbols = [ 'OGRE_NONCLIENT_BUILD','__PYTHONOGRE_BUILD_CODE', + 'ogrenewt_NONCLIENT_BUILD','OIS_NONCLIENT_BUILD', 'OIS_STATIC_BUILD' ] + defined_symbols.append( 'VERSION_' + environment.ogrenewt.version ) + + if environment._USE_THREADS: + defined_symbols.append('BOOST_HAS_THREADS') + defined_symbols.append('BOOST_HAS_WINTHREADS') + mb = module_builder.module_builder_t( [ xml_cached_fc ] , gccxml_path=environment.gccxml_bin , working_directory=environment.root_dir , include_paths=environment.ogrenewt.include_dirs - , define_symbols=['ogrenewt_NONCLIENT_BUILD', 'OGRE_NONCLIENT_BUILD', - 'OIS_NONCLIENT_BUILD', 'OIS_STATIC_BUILD'] + , define_symbols=defined_symbols , indexing_suite_version=2 ) ## This module depends on Ogre Modified: trunk/python-ogre/code_generators/ogreode/generate_code.py =================================================================== --- trunk/python-ogre/code_generators/ogreode/generate_code.py 2008-10-30 06:12:20 UTC (rev 784) +++ trunk/python-ogre/code_generators/ogreode/generate_code.py 2008-10-31 08:18:17 UTC (rev 785) @@ -265,9 +265,13 @@ os.path.join( environment.ogreode.root_dir, "python_ogreode.h" ) , environment.ogreode.cache_file ) - defined_symbols = ['OGRE_NONCLIENT_BUILD', 'ODE_LIB' ] - defined_symbols.append( 'OGREODE_VERSION_' + environment.ogreode.version ) - + defined_symbols = ['OGRE_NONCLIENT_BUILD', 'ODE_LIB','__PYTHONOGRE_BUILD_CODE' ] + defined_symbols.append( 'OGREODE_VERSION_' + environment.ogreode.version ) + + if environment._USE_THREADS: + defined_symbols.append('BOOST_HAS_THREADS') + defined_symbols.append('BOOST_HAS_WINTHREADS') + # # build the core Py++ system from the GCCXML created source # Modified: trunk/python-ogre/code_generators/ogrepcz/generate_code.py =================================================================== --- trunk/python-ogre/code_generators/ogrepcz/generate_code.py 2008-10-30 06:12:20 UTC (rev 784) +++ trunk/python-ogre/code_generators/ogrepcz/generate_code.py 2008-10-31 08:18:17 UTC (rev 785) @@ -158,7 +158,13 @@ print "Including Special:", c c.include() - + noncopy=[] + # these showed up during threading -- possible needs to be done all the time (needs to be looked at) + if environment._USE_THREADS: + noncopy = noncopy + ['PCZSceneManager' ] + for c in noncopy: + main_ns.class_(c).noncopyable = True + ############################################################ ## ## And things that need to have their argument and call values fixed. @@ -282,9 +288,12 @@ os.path.join( environment.ogrepcz.root_dir, "python_ogrepcz.h" ) , environment.ogrepcz.cache_file ) - defined_symbols = [ 'OGRE_NONCLIENT_BUILD', 'OGRE_GCC_VISIBILITY'] + defined_symbols = [ 'OGRE_NONCLIENT_BUILD', 'OGRE_GCC_VISIBILITY','__PYTHONOGRE_BUILD_CODE'] defined_symbols.append( 'VERSION_' + environment.ogrepcz.version ) - + if environment._USE_THREADS: + defined_symbols.append('BOOST_HAS_THREADS') + defined_symbols.append('BOOST_HAS_WINTHREADS') + # # build the core Py++ system from the GCCXML created source # Modified: trunk/python-ogre/code_generators/ogrerefapp/generate_code.py =================================================================== --- trunk/python-ogre/code_generators/ogrerefapp/generate_code.py 2008-10-30 06:12:20 UTC (rev 784) +++ trunk/python-ogre/code_generators/ogrerefapp/generate_code.py 2008-10-31 08:18:17 UTC (rev 785) @@ -75,8 +75,12 @@ os.path.join( environment.ogrerefapp.root_dir, "python_ogre.h" ) , environment.ogrerefapp.cache_file ) - defined_symbols = [ 'OGREREFAPP_NONCLIENT_BUILD', 'OGRE_NONCLIENT_BUILD' ] + defined_symbols = [ 'OGREREFAPP_NONCLIENT_BUILD', 'OGRE_NONCLIENT_BUILD','__PYTHONOGRE_BUILD_CODE' ] defined_symbols.append( 'OGREREFAPP_VERSION_' + environment.ogrerefapp.version ) + if environment._USE_THREADS: + defined_symbols.append('BOOST_HAS_THREADS') + defined_symbols.append('BOOST_HAS_WINTHREADS') + mb = module_builder.module_builder_t( [ xml_cached_fc ] , gccxml_path=environment.gccxml_bin , working_directory=environment.root_dir Modified: trunk/python-ogre/code_generators/particleuniverse/generate_code.py =================================================================== --- trunk/python-ogre/code_generators/particleuniverse/generate_code.py 2008-10-30 06:12:20 UTC (rev 784) +++ trunk/python-ogre/code_generators/particleuniverse/generate_code.py 2008-10-31 08:18:17 UTC (rev 785) @@ -227,8 +227,11 @@ , environment.particleuniverse.cache_file ) defined_symbols = [ 'OGRE_NONCLIENT_BUILD', 'OGRE_GCC_VISIBILITY' ,'PARTICLE_UNIVERSE_EXPORTS', '__PYTHONOGRE_BUILD_CODE' ] - defined_symbols.append( 'VERSION_' + environment.particleuniverse.version ) - + defined_symbols.append( 'VERSION_' + environment.particleuniverse.version ) + if environment._USE_THREADS: + defined_symbols.append('BOOST_HAS_THREADS') + defined_symbols.append('BOOST_HAS_WINTHREADS') + # # build the core Py++ system from the GCCXML created source # Modified: trunk/python-ogre/code_generators/quickgui/generate_code.py =================================================================== --- trunk/python-ogre/code_generators/quickgui/generate_code.py 2008-10-30 06:12:20 UTC (rev 784) +++ trunk/python-ogre/code_generators/quickgui/generate_code.py 2008-10-31 08:18:17 UTC (rev 785) @@ -422,7 +422,7 @@ os.path.join( environment.quickgui.root_dir, "python_quickgui.h" ) , environment.quickgui.cache_file ) - defined_symbols = [ 'OGRE_NONCLIENT_BUILD', + defined_symbols = [ 'OGRE_NONCLIENT_BUILD','__PYTHONOGRE_BUILD_CODE', 'WIN32', 'NDEBUG', 'WINDOWS' , '_PRECOMP'] ## , 'QUICKGUI_EXPORTS' if environment._USE_THREADS: defined_symbols.append('BOOST_HAS_THREADS') Modified: trunk/python-ogre/code_generators/theora/generate_code.py =================================================================== --- trunk/python-ogre/code_generators/theora/generate_code.py 2008-10-30 06:12:20 UTC (rev 784) +++ trunk/python-ogre/code_generators/theora/generate_code.py 2008-10-31 08:18:17 UTC (rev 785) @@ -460,7 +460,7 @@ os.path.join( environment.theora.root_dir, "python_theora.h" ) , environment.theora.cache_file ) - defined_symbols = [ 'THEORAVIDEO_PLUGIN_EXPORTS','OGRE_NONCLIENT_BUILD', 'OGRE_GCC_VISIBILITY'] + defined_symbols = [ 'THEORAVIDEO_PLUGIN_EXPORTS','OGRE_NONCLIENT_BUILD', 'OGRE_GCC_VISIBILITY','__PYTHONOGRE_BUILD_CODE'] if os.name == 'nt': defined_symbols.append ( 'WIN32' ) if environment._USE_THREADS: Modified: trunk/python-ogre/demos/particleuniverse/Demo_Particle.py =================================================================== --- trunk/python-ogre/demos/particleuniverse/Demo_Particle.py 2008-10-30 06:12:20 UTC (rev 784) +++ trunk/python-ogre/demos/particleuniverse/Demo_Particle.py 2008-10-31 08:18:17 UTC (rev 785) @@ -60,6 +60,9 @@ # and don't forget to start it self.particleSystem2.start() + name= self.particleSystem2.name + self.ps = self.sceneManager.getMovableObject(name, PU.ParticleSystemFactory.PU_FACTORY_TYPE_NAME) + print "\n\n", self.ps if __name__ == '__main__': try: Modified: trunk/python-ogre/environment.py =================================================================== --- trunk/python-ogre/environment.py 2008-10-30 06:12:20 UTC (rev 784) +++ trunk/python-ogre/environment.py 2008-10-31 08:18:17 UTC (rev 785) @@ -563,7 +563,8 @@ pythonModule = True name='ogre' ModuleName='OGRE' - cflags = "" + CCFLAGS = "" + cflags='' moduleParentLocation = "renderer" parent = "ogre/renderer" dependsOn = ['boost'] @@ -1421,7 +1422,7 @@ version="0.2.1" name='ogrevideoffmpeg' parent="ogre/addons" - cflags = "" + CCFLAGS = "" include_dirs = [ Config.PATH_Boost, Config.PATH_INCLUDE_Ogre, Config.PATH_INCLUDE_ogrevideoffmpeg, @@ -1486,7 +1487,8 @@ ] ModuleName = 'et' CheckIncludes = ['boost/python.hpp'] - cflags = "" + CCFLAGS = " " + cflags='' class bullet: active = True Modified: trunk/python-ogre/scripts/compilesource.bat =================================================================== --- trunk/python-ogre/scripts/compilesource.bat 2008-10-30 06:12:20 UTC (rev 784) +++ trunk/python-ogre/scripts/compilesource.bat 2008-10-31 08:18:17 UTC (rev 785) @@ -4,13 +4,13 @@ set _ROOT=c:\\development call vcvars32 cd %_ROOT%\\ogre -%_VCBUILD% /useenv Ogre_vc8.sln "Release|Win32" +%_VCBUILD% /useenv Ogre_vc9.sln "Release|Win32" rem cd %_ROOT%\\NxOgre\\NxOgre rem %_VCBUILD% /useenv NxOgre.VC8.Windows.sln "Release|Win32" cd %_ROOT%\\ogreaddons\\ogreode\\scripts\\vc8 -%_VCBUILD% /useenv OgreOde_Source.sln "Release|Win32" +%_VCBUILD% /useenv OgreOde_SDK.sln "Release|Win32" cd %_ROOT%\\ogreaddons\\ogrenewt %_VCBUILD% /useenv OgreNewt_vc71.sln "Release|Win32" Modified: trunk/python-ogre/scripts/vsvars32.bat =================================================================== --- trunk/python-ogre/scripts/vsvars32.bat 2008-10-30 06:12:20 UTC (rev 784) +++ trunk/python-ogre/scripts/vsvars32.bat 2008-10-31 08:18:17 UTC (rev 785) @@ -22,9 +22,9 @@ @rem @set DevEnvDir=C:\Program Files\Microsoft Visual Studio 9.0\Common7\IDE -@set PATH=C:\Program Files\Microsoft Visual Studio 9.0\Common7\IDE;C:\Program Files\Microsoft Visual Studio 9.0\VC\BIN;C:\Program Files\Microsoft Visual Studio 9.0\Common7\Tools;C:\WINDOWS\Microsoft.NET\Framework\v3.5;C:\WINDOWS\Microsoft.NET\Framework\v2.0.50727;C:\Program Files\Microsoft Visual Studio 9.0\VC\VCPackages;%PATH% -@set INCLUDE=C:\Program Files\Microsoft Visual Studio 9.0\VC\INCLUDE;C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\include;c:\program files\Microsoft DirectX SDK (June 2008)\include;%INCLUDE% -@set LIB=C:\Program Files\Microsoft Visual Studio 9.0\VC\LIB;C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\lib;c:\program files\Microsoft DirectX SDK (June 2008)\lib\x86;%LIB% +@set PATH=%PATH%;C:\Program Files\Microsoft Visual Studio 9.0\Common7\IDE;C:\Program Files\Microsoft Visual Studio 9.0\VC\BIN;C:\Program Files\Microsoft Visual Studio 9.0\Common7\Tools;C:\WINDOWS\Microsoft.NET\Framework\v3.5;C:\WINDOWS\Microsoft.NET\Framework\v2.0.50727;C:\Program Files\Microsoft Visual Studio 9.0\VC\VCPackages +@set INCLUDE=%INCLUDE%;C:\Program Files\Microsoft Visual Studio 9.0\VC\INCLUDE;C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\include;c:\program files\Microsoft DirectX SDK (August 2008)\include +@set LIB=%LIB%;C:\Program Files\Microsoft Visual Studio 9.0\VC\LIB;C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\lib;c:\program files\Microsoft DirectX SDK (August 2008)\lib\x86 @set LIBPATH=C:\WINDOWS\Microsoft.NET\Framework\v3.5;C:\WINDOWS\Microsoft.NET\Framework\v2.0.50727;C:\Program Files\Microsoft Visual Studio 9.0\VC\LIB;%LIBPATH% @goto end This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |