From 16f6219957e3a0f4efa354ce75db6712c5abbc7f Mon Sep 17 00:00:00 2001 From: rude Date: Sun, 22 Nov 2009 14:36:00 +0100 Subject: [PATCH] Moved #ifdef LOVE_WINDOWS to Timer.cpp. --- src/modules/timer/sdl/Timer.cpp | 18 +++++++++++++++--- src/modules/timer/sdl/Timer.h | 6 ------ 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/src/modules/timer/sdl/Timer.cpp b/src/modules/timer/sdl/Timer.cpp index 07ebf30dc..ef8437a04 100644 --- a/src/modules/timer/sdl/Timer.cpp +++ b/src/modules/timer/sdl/Timer.cpp @@ -18,6 +18,15 @@ * 3. This notice may not be removed or altered from any source distribution. **/ +#include + +#ifdef LOVE_WINDOWS +# include +# include +#else +# include +#endif + #include "Timer.h" namespace love @@ -92,18 +101,21 @@ namespace sdl float Timer::getMicroTime() const { - #ifdef LOVE_WINDOWS +#ifdef LOVE_WINDOWS + /* long ticks, freq; QueryPeformanceCounter(&ticks); QueryPeformanceFrequency(&freq); long secs = ticks/freq; long usecs = (ticks%freq)/(freq/1000000.0f); return secs%86400 + usecs/1000000.0f; - #else + */ + return 0; +#else timeval t; gettimeofday(&t, NULL); return t.tv_sec%86400 + t.tv_usec/1000000.0f; - #endif +#endif } } // sdl diff --git a/src/modules/timer/sdl/Timer.h b/src/modules/timer/sdl/Timer.h index 4a1b3833a..c5a78ec62 100644 --- a/src/modules/timer/sdl/Timer.h +++ b/src/modules/timer/sdl/Timer.h @@ -24,12 +24,6 @@ // SDL #include -#ifdef LOVE_WINDOWS - #include -#else - #include -#endif - // LOVE #include