[Python-ogre-commit] SF.net SVN: python-ogre: [425] trunk/python-ogre

[<and...@us...>]

Revision: 425
          http://python-ogre.svn.sourceforge.net/python-ogre/?rev=425&view=rev
Author:   andy_miller
Date:     2007-10-15 16:29:46 -0700 (Mon, 15 Oct 2007)

Log Message:
-----------
Fix for Linux ogrenewt and ogre renderqueuelistener

Modified Paths:
--------------
    trunk/python-ogre/code_generators/ogre/hand_made_wrappers.py
    trunk/python-ogre/environment.py

Modified: trunk/python-ogre/code_generators/ogre/hand_made_wrappers.py
===================================================================
--- trunk/python-ogre/code_generators/ogre/hand_made_wrappers.py	2007-10-15 23:13:19 UTC (rev 424)
+++ trunk/python-ogre/code_generators/ogre/hand_made_wrappers.py	2007-10-15 23:29:46 UTC (rev 425)
@@ -851,8 +851,10 @@
         
     rt = mb.class_( 'RenderQueueListener' )   
     print "WRAPPER CODE\n\n"
-    print rt.wrapper_code
-    rt.add_wrapper_code ( WRAPPER_WRAPPER_RenderQueueListener )
+    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 "NOW\n\n"
     print rt.wrapper_code
              

Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py	2007-10-15 23:13:19 UTC (rev 424)
+++ trunk/python-ogre/environment.py	2007-10-15 23:29:46 UTC (rev 425)
@@ -249,7 +249,10 @@
     active=True
     version = "1.0"
     parent = "ogre/physics"
-    libs = ['Newton', Config.LIB_Boost, 'OgreNewt_Main', 'OgreMain']
+    if os.name =="nt":
+        libs = ['Newton', Config.LIB_Boost, 'OgreNewt_Main', 'OgreMain']
+    else:
+        libs = ['Newton', Config.LIB_Boost, 'OgreNewt', 'OgreMain']
     include_dirs = [Config.PATH_Boost
                     , Config.PATH_Newton   # only one path for Newton
                     , Config.PATH_INCLUDE_Ogre 
@@ -656,7 +659,7 @@
 class bullet:
     version= "2.62"
     parent = "ogre/physics"
-    libs=[Config.LIB_Boost,  'libbulletcollision', 'libbulletdynamics','libbulletmath']
+    libs=[Config.LIB_Boost,  'LibBulletCollision', 'LibBulletDynamics'] #,'libbulletmath']
     lib_dirs = [ Config.PATH_LIB_Boost
                 ,  Config.PATH_LIB_Bullet
                 ]
@@ -675,7 +678,7 @@
     cflags = ""
     parent = "ogre/physics"
     libs = [Config.LIB_Boost,  'OgreMain', 
-        'libbulletcollision', 'libbulletmath','libbulletdynamics'
+        'LibBulletCollision', 'LibBulletDynamics'
         ]
     include_dirs = [Config.PATH_Boost
                     , Config.PATH_INCLUDE_Bullet
@@ -700,7 +703,7 @@
     cflags = ""
     parent = "ogre/physics"
     libs = [Config.LIB_Boost,  'OgreMain', 
-        'libbulletcollision', 'libbulletmath','libbulletdynamics'
+        'LibBulletCollision', 'LibBulletDynamics'
         ]
     include_dirs = [Config.PATH_Boost
                     , Config.PATH_INCLUDE_Bullet


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.