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

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

Revision: 806
          http://python-ogre.svn.sourceforge.net/python-ogre/?rev=806&view=rev
Author:   andy_miller
Date:     2008-11-21 03:53:18 +0000 (Fri, 21 Nov 2008)

Log Message:
-----------
Fix for OgreOde in Linux -- files missing from make..

Modified Paths:
--------------
    trunk/python-ogre/ThirdParty/nxogre/BetajaenSL.h
    trunk/python-ogre/demos/ogreode/Demo_GranTurism.py
    trunk/python-ogre/environment.py
    trunk/python-ogre/patch/ogreode.patch

Modified: trunk/python-ogre/ThirdParty/nxogre/BetajaenSL.h
===================================================================
--- trunk/python-ogre/ThirdParty/nxogre/BetajaenSL.h	2008-11-21 02:25:55 UTC (rev 805)
+++ trunk/python-ogre/ThirdParty/nxogre/BetajaenSL.h	2008-11-21 03:53:18 UTC (rev 806)
@@ -40,12 +40,12 @@
 
 /** \brief Export Class Macro, replace value with your export macro
 */
-#define BETAJAEN_SL_CLASS __declspec(dllexport)
+#define BETAJAEN_SL_CLASS // __declspec(dllexport)
 #define BETAJAEN_SL_CLASS_FUNCTION
 #define BETAJAEN_SL_TEMPLATE_CLASS 
-#define BETAJAEN_SL_TEMPLATE_CLASS_FUNCTION __forceinline
-#define BETAJAEN_SL_CLASS_EXPORT __declspec(dllexport)
-#define BETAJAEN_SL_TEMPLATE_CLASS_EXPORT __forceinline
+#define BETAJAEN_SL_TEMPLATE_CLASS_FUNCTION // __forceinline
+#define BETAJAEN_SL_CLASS_EXPORT // __declspec(dllexport)
+#define BETAJAEN_SL_TEMPLATE_CLASS_EXPORT // __forceinline
 // __declspec(dllexport)
 
 /** \brief Delete macro. Used if you have your own leak checker, etc.

Modified: trunk/python-ogre/demos/ogreode/Demo_GranTurism.py
===================================================================
--- trunk/python-ogre/demos/ogreode/Demo_GranTurism.py	2008-11-21 02:25:55 UTC (rev 805)
+++ trunk/python-ogre/demos/ogreode/Demo_GranTurism.py	2008-11-21 03:53:18 UTC (rev 806)
@@ -25,7 +25,6 @@
 #------------------------------------------------------------------------------------------------
 class GranTurismOgreFrameListener ( sf.FrameListener ):
     def __init__(self, win, cam,time_step,root,world) :
-        print "frame init"
         sf.FrameListener.__init__(self, win,cam)
         self.camera = cam
         self.vehicle = None
@@ -129,7 +128,6 @@
 
     #------------------------------------------------------------------------------------------------
     def frameStarted( self, evt):
-        print "*** frameStarted"
         time = evt.timeSinceLastFrame
 
         ret = sf.FrameListener.frameStarted(self,evt)

Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py	2008-11-21 02:25:55 UTC (rev 805)
+++ trunk/python-ogre/environment.py	2008-11-21 03:53:18 UTC (rev 806)
@@ -1054,7 +1054,7 @@
             [0, "patch -s -N -i ../../python-ogre/patch/ogreode.patch -p0", baseDir], 
             [0, "chmod +x autogen.sh", baseDir],
             [0, "./autogen.sh", baseDir],
-            [0, "./configure --without-samples --prefix=%s" % PREFIX, baseDir],
+            [0, "./configure --without-SAMPLES --prefix=%s" % PREFIX, baseDir],
             [0, "make", baseDir],
             [0, "make install", baseDir],
             ]

Modified: trunk/python-ogre/patch/ogreode.patch
===================================================================
--- trunk/python-ogre/patch/ogreode.patch	2008-11-21 02:25:55 UTC (rev 805)
+++ trunk/python-ogre/patch/ogreode.patch	2008-11-21 03:53:18 UTC (rev 806)
@@ -1,6 +1,6 @@
 Index: include/OgreOdeEntityInformer.h
 ===================================================================
---- include/OgreOdeEntityInformer.h	(revision 2510)
+--- include/OgreOdeEntityInformer.h	(revision 2512)
 +++ include/OgreOdeEntityInformer.h	(working copy)
 @@ -36,12 +36,12 @@
  		const TriangleIndex* getIndices();
@@ -18,7 +18,7 @@
  		Ogre::SceneNode*	_node;
 Index: src/OgreOdeGeometry.cpp
 ===================================================================
---- src/OgreOdeGeometry.cpp	(revision 2510)
+--- src/OgreOdeGeometry.cpp	(revision 2512)
 +++ src/OgreOdeGeometry.cpp	(working copy)
 @@ -924,7 +924,7 @@
  
@@ -31,7 +31,7 @@
  	registerGeometry();
 Index: src/OgreOdeTriangleMeshDataManager.cpp
 ===================================================================
---- src/OgreOdeTriangleMeshDataManager.cpp	(revision 2510)
+--- src/OgreOdeTriangleMeshDataManager.cpp	(revision 2512)
 +++ src/OgreOdeTriangleMeshDataManager.cpp	(working copy)
 @@ -6,7 +6,7 @@
  using namespace Ogre;
@@ -42,6 +42,19 @@
  
  namespace OgreOde
  {
+Index: src/Makefile.am
+===================================================================
+--- src/Makefile.am	(revision 2512)
++++ src/Makefile.am	(working copy)
+@@ -22,6 +22,8 @@
+ 	OgreOdeSpace.cpp \
+ 	OgreOdeStepper.cpp \
+ 	OgreOdeUtility.cpp \
++    OgreOdeTriangleMeshData.cpp \
++    OgreOdeTriangleMeshDataManager.cpp \
+ 	OgreOdeWorld.cpp
+ 
+ libOgreOde_Core_la_LIBADD = \
 Index: prefab/src/OgreOdeRagdoll.cpp
 ===================================================================
 --- prefab/src/OgreOdeRagdoll.cpp	(revision 2512)
@@ -63,7 +76,7 @@
 +} 
 Index: loader/include/OgreOdeDotLoader.h
 ===================================================================
---- loader/include/OgreOdeDotLoader.h	(revision 2510)
+--- loader/include/OgreOdeDotLoader.h	(revision 2512)
 +++ loader/include/OgreOdeDotLoader.h	(working copy)
 @@ -15,8 +15,8 @@
          DotLoader(OgreOde::World * world = 0, OgreOde::Space * space = 0);
@@ -78,7 +91,7 @@
          void         save(const Ogre::String &filename, const Ogre::StringVector &objects_names, ObjectList  *objects);
 Index: loader/src/OgreOdeDotLoader.cpp
 ===================================================================
---- loader/src/OgreOdeDotLoader.cpp	(revision 2510)
+--- loader/src/OgreOdeDotLoader.cpp	(revision 2512)
 +++ loader/src/OgreOdeDotLoader.cpp	(working copy)
 @@ -62,6 +62,12 @@
  {


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