Windows Timer fixes
This commit is contained in:
parent
fc9ff9c877
commit
7b48a1f455
|
@ -1,13 +1,14 @@
|
||||||
|
|
||||||
#include "Timer.h"
|
#include "Timer.h"
|
||||||
|
|
||||||
#ifdef WIN32
|
#ifdef _WIN32
|
||||||
|
#include <windows.h>
|
||||||
#include <mmsystem.h>
|
#include <mmsystem.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
|
||||||
Timer::Timer(void) : time_elapsed(0), system_milliseconds(0), start_time(0), end_time(0), last_update(0), num_updates(0), paused_time(0), offset(0), paused_state(false), lock_state(0), lock_rate(0)
|
Timer::Timer(void) : time_elapsed(0), system_milliseconds(0), start_time(0), end_time(0), last_update(0), num_updates(0), paused_time(0), offset(0), paused_state(false), lock_state(false), lock_rate(0)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -77,8 +78,10 @@ void Timer::update(void)
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
#ifdef WIN32
|
#ifdef _WIN32
|
||||||
|
|
||||||
system_milliseconds = timeGetTime ();
|
system_milliseconds = timeGetTime ();
|
||||||
|
|
||||||
#else
|
#else
|
||||||
gettimeofday(&time_val,&time_zone);
|
gettimeofday(&time_val,&time_zone);
|
||||||
|
|
||||||
|
|
|
@ -24,7 +24,7 @@ private:
|
||||||
unsigned long paused_time;
|
unsigned long paused_time;
|
||||||
unsigned long offset;
|
unsigned long offset;
|
||||||
|
|
||||||
#ifndef WIN32
|
#ifndef _WIN32
|
||||||
struct timeval time_val;
|
struct timeval time_val;
|
||||||
struct timezone time_zone;
|
struct timezone time_zone;
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue