added WITHOUT_ODE testing to some sources to build without ODE support

git-svn-id: svn://anubis/dwscr/trunk@124 5bef9df8-b654-44bb-925b-0ff18baa8f8c

dwscr.cc

@@ -12,7 +12,9 @@
 #include <string>
 #include <SDL.h>
 #include <SDL_syswm.h>
+#ifndef WITHOUT_ODE
 #include <ode/ode.h>
+#endif
 #include "displayinfo.h"
 #include "ss/SSMain.h"
 using namespace std;
@@ -110,7 +112,9 @@ int main(int argc, char * argv[])
         SDL_ShowCursor(SDL_DISABLE);
     }
 
+#ifndef WITHOUT_ODE
     dInitODE();
+#endif
 
     /* after our window is created and SDL and OpenGL are initialized,
      * start the main screensaver functionality */
@@ -118,7 +122,9 @@ int main(int argc, char * argv[])
     SSMain ss(width, height, num_monitors, sdlSurface);
     ss.run();
 
+#ifndef WITHOUT_ODE
     dCloseODE();
+#endif
     SDL_Quit();
     return 0;
 }

ss/LogoBox.cpp

@@ -14,6 +14,7 @@
 #include "../wfobj/WFObj.h"
 #include "LogoBox.h"
 #include "../LoadFile/LoadFile.h"
+#include <string.h>                 /* memcpy() */
 
 #include <iostream>
 using namespace std;

ss/SSMode.cc

@@ -25,6 +25,7 @@ void SSMode::update()
     m_elapsed = ticks - m_startTick;
 }
 
+#ifndef WITHOUT_ODE
 /* push an OpenGL matrix onto the matrix stack for a given
  * ODE body position and rotation */
 void SSMode::pushTransform(const dReal pos[3], const dReal R[12])
@@ -49,3 +50,4 @@ void SSMode::pushTransform(const dReal pos[3], const dReal R[12])
     glPushMatrix();
     glMultMatrixf(matrix);
 }
+#endif

ss/SSMode.h

@@ -9,7 +9,9 @@
 
 #include <SDL.h>
 #include <GL/gl.h>
+#ifndef WITHOUT_ODE
 #include <ode/ode.h>
+#endif
 
 class SSMain;
 
@@ -21,7 +23,9 @@ public:
     SSMode(SSMain * _SSMain);
     virtual ~SSMode();
     virtual void update();
+#ifndef WITHOUT_ODE
     void pushTransform(const dReal pos[3], const dReal R[12]);
+#endif
 
 protected:
     SSMain * m_SSMain;