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

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

Revision: 804
          http://python-ogre.svn.sourceforge.net/python-ogre/?rev=804&view=rev
Author:   andy_miller
Date:     2008-11-19 10:38:17 +0000 (Wed, 19 Nov 2008)

Log Message:
-----------
Fix for OgreBulletc under Linux

Modified Paths:
--------------
    trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsRay.cpp
    trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsRay.h
    trunk/python-ogre/environment.py

Modified: trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsRay.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsRay.cpp	2008-11-18 23:15:10 UTC (rev 803)
+++ trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsRay.cpp	2008-11-19 10:38:17 UTC (rev 804)
@@ -72,6 +72,11 @@
     {
       return mRay.getPoint(mMaxDistance);
     }
+    // basic CollisionRay inline methods
+    const Ogre::Ray & CollisionRayResultCallback ::getRay() const 
+    {
+        return mRay;
+    }
     // -------------------------------------------------------------------------
     bool  CollisionRayResultCallback::doesCollide() const
     {

Modified: trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsRay.h
===================================================================
--- trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsRay.h	2008-11-18 23:15:10 UTC (rev 803)
+++ trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsRay.h	2008-11-19 10:38:17 UTC (rev 804)
@@ -48,7 +48,7 @@
 		void setWorld(CollisionsWorld *world);
 		void setMaxDistance(Ogre::Real max_distance);
 
-        inline const Ogre::Ray &getRay() const;
+        const Ogre::Ray & getRay() const;
 		inline Ogre::Vector3 getRayStartPoint() const;
 		inline Ogre::Vector3 getRayEndPoint() const;
 
@@ -61,11 +61,7 @@
 
     };
     // -------------------------------------------------------------------------
-    // basic CollisionRay inline methods
-    inline const Ogre::Ray &CollisionRayResultCallback ::getRay() const 
-    {
-        return mRay;
-    }
+    
     // -------------------------------------------------------------------------
     //  CollisionClosestRay
     class CollisionClosestRayResultCallback : public CollisionRayResultCallback

Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py	2008-11-18 23:15:10 UTC (rev 803)
+++ trunk/python-ogre/environment.py	2008-11-19 10:38:17 UTC (rev 804)
@@ -1600,7 +1600,7 @@
     if isWindows():
         CCFLAGS =  ' -DWIN32 -DNDEBUG -D_WINDOWS -D_PRECOMP '
     else:
-        CCFLAGS = ' -D_PRECOMP '
+        CCFLAGS = ' -D_PRECOMP -fno-inline '
         libs.append ( boost_python_index.lib )
     ModuleName = 'OgreBulletC'
     CheckIncludes=['boost/python.hpp', 'Ogre.h']    


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