mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2025-10-08 02:10:35 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into miami

Browse source 
# Conflicts:
#	premake5.lua
#	src/render/Coronas.cpp
#	src/render/Timecycle.cpp
#	src/render/Timecycle.h
This commit is contained in:
Sergeanur 2020-08-10 19:15:51 +03:00
commit 1c1fa25e6c
5 changed files with 44 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/skel/glfw/glfw.cpp
View file

@ -213,7 +213,11 @@ double
psTimer(void)
{
struct timespec start;
#ifdef __linux__
clock_gettime(CLOCK_MONOTONIC_RAW, &start);
#else
clock_gettime(CLOCK_MONOTONIC, &start);
#endif
return start.tv_sec * 1000.0 + start.tv_nsec/1000000.0;
}
#endif