source: downloads/ogreode/fix_and_remove_demos.patch @ 45

Makefile.am

@@ -1 @@
-SUBDIRS = include src prefab loader demos
+SUBDIRS = include src prefab loader
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = OgreOde_Core.pc OgreOde_Prefab.pc OgreOde_Loader.pc

src/OgreOdeBody.cpp

@@ -520 +520 @@
 //-----------------------------------------------------------------------
 Joint* Body::getJoint(int index)
 {
-        return (Joint*)_world->getJointList().findItem((unsigned int)dBodyGetJoint(_body,index)); 
+        return (Joint*)_world->getJointList().findItem((long unsigned int)dBodyGetJoint(_body,index)); 
 }
 //-----------------------------------------------------------------------
 size_t Body::getGeometryCount()
@@ -717 +717 @@
         destroyDebugNode();
         delete _mass;
 
-        _world->getBodyList().unregisterItem((unsigned int)_body);
+        _world->getBodyList().unregisterItem((long unsigned int)_body);
         dBodyDestroy(_body);
 }
 
@@ -852 +852 @@
 
     }
     return collided;
-}
- No newline at end of file
+}

src/OgreOdeGeometry.cpp

@@ -211 +211 @@
     {
         _debug_contacts = new DebugContact*[_max_contacts];
         for (unsigned int i = 0; i < _max_contacts; i++)
-            _debug_contacts[i] = new DebugContact(Ogre::StringConverter::toString((int)_geom) + 
+            _debug_contacts[i] = new DebugContact(Ogre::StringConverter::toString(_geom) + 
                                                     "_Contact_" + 
                                                     Ogre::StringConverter::toString(i),
                                                     _world);
@@ -273 +273 @@
 //------------------------------------------------------------------------------------------------
 Space* Geometry::getSpace()
 {
-        return (Space*)_world->getSpaceList().findItem((unsigned int)dGeomGetSpace(_geom));
+        return (Space*)_world->getSpaceList().findItem((long unsigned int)dGeomGetSpace(_geom));
 }
 
 
@@ -425 +425 @@
         }
         _debug_contacts = new DebugContact*[max_contacts];
         for (unsigned int i = 0; i < max_contacts; i++)
-            _debug_contacts[i] = new DebugContact(Ogre::StringConverter::toString((int)_geom) +  + "_Contact_" + Ogre::StringConverter::toString(i),
+            _debug_contacts[i] = new DebugContact(Ogre::StringConverter::toString(_geom) +  + "_Contact_" + Ogre::StringConverter::toString(i),
             _world);
     }
     _max_contacts = max_contacts;

src/OgreOdeJoint.cpp

@@ -25 +25 @@
 
 unsigned long JointGroup::getID()
 {
-        return (unsigned long)_joint_group;
+        return (long unsigned long)_joint_group;
 }
 
 void JointGroup::empty()
@@ -35 +35 @@
 
 JointGroup::~JointGroup()
 {
-        _world->getJointGroupList().unregisterItem((unsigned int)_joint_group);
+        _world->getJointGroupList().unregisterItem((long unsigned int)_joint_group);
         dJointGroupDestroy(_joint_group); 
 }
 

src/OgreOdeSpace.cpp

@@ -62 +62 @@
 //------------------------------------------------------------------------------------------------
 Geometry* Space::getGeometry(int index)
 {
-        return (Geometry*) _world->getGeometryList().findItem((unsigned int)dSpaceGetGeom(_space,index)); 
+        return (Geometry*) _world->getGeometryList().findItem((long unsigned int)dSpaceGetGeom(_space,index)); 
 }
 //------------------------------------------------------------------------------------------------
 void Space::registerSpace()