Changeset 7909 in orxonox.OLD

Timestamp:

May 27, 2006, 4:23:59 PM (18 years ago)

Author:

bensch

Message:

gui: also works on windows

Location:

branches/gui

Files:

• configure.ac (modified) (1 diff)
• src/lib/graphics/importer/material.h (modified) (1 diff)
• src/lib/util/timer.cc (modified) (2 diffs)
• src/story_entities/game_world.cc (modified) (1 diff)

branches/gui/configure.ac

@@ -306 +306 @@
     if test x$FOUND_mingw32 = xyes; then
         LIBS="$LIBS -lmingw32"
+    fi
+
+    AC_CHECK_LIB([winmm], [main], [FOUND_winmm=yes])
+    if test x${FOUND_winmm} = xyes ; then
+        LIBS="$LIBS -lwinmm"
     fi
 

branches/gui/src/lib/graphics/importer/material.h

@@ -16 +16 @@
 
 #include <vector>
-#include "SDL_image.h"
-
 #include "texture.h"
 

branches/gui/src/lib/util/timer.cc

@@ -12 +12 @@
 #include <sys/time.h>
 
+#ifdef __WIN32__
+#include <windows.h>
+int gettimeofday
+      (struct timeval* tp, void* tzp) {
+    DWORD t;
+    t = timeGetTime();
+    tp->tv_sec = t / 1000;
+    tp->tv_usec = 1000 * (t % 1000 );
+    /* 0 indicates success. */
+    return 0;
+}
+#endif
+
 /**
  * @returns the current time in Second exact to the micro-second
@@ -18 +31 @@
 
 #if HAVE_CLOCK_GETTIME
+
    // use the POSIX realtime clock to get the current time
     struct timespec tp;

branches/gui/src/story_entities/game_world.cc

@@ -367 +367 @@
     this->frameTimes[frameTimesIndex] = currentFrame - this->lastFrame;
     this->lastFrame = currentFrame;
+    printf("%f\n", currentFrame);
     ++this->cycle;
     this->dtS = 0.0;