mirror of
https://github.com/raysan5/raylib.git
synced 2026-04-28 09:37:25 -04:00
Merge branch 'master' of https://github.com/raysan5/raylib
This commit is contained in:
@ -510,7 +510,7 @@ ifeq ($(TARGET_PLATFORM),PLATFORM_DESKTOP_WIN32)
|
|||||||
# Libraries for Windows desktop compilation
|
# Libraries for Windows desktop compilation
|
||||||
LDFLAGS += -L..\src
|
LDFLAGS += -L..\src
|
||||||
LDLIBS = -lraylib -lgdi32 -lwinmm -lshcore
|
LDLIBS = -lraylib -lgdi32 -lwinmm -lshcore
|
||||||
ifneq ($(GRAPHICS),GRAPHICS_API_OPENGL_11_SOFTWARE)
|
ifneq ($(GRAPHICS),GRAPHICS_API_OPENGL_SOFTWARE)
|
||||||
LDLIBS += -lopengl32
|
LDLIBS += -lopengl32
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|||||||
@ -1131,7 +1131,9 @@ void SwapScreenBuffer(void)
|
|||||||
// Get elapsed time measure in seconds since InitTimer()
|
// Get elapsed time measure in seconds since InitTimer()
|
||||||
double GetTime(void)
|
double GetTime(void)
|
||||||
{
|
{
|
||||||
double time = get_time_seconds() - CORE.Time.base;
|
// CORE.Time.base is nanoseconds as integer
|
||||||
|
double baseTime = (double)CORE.Time.base / 1e9;
|
||||||
|
double time = get_time_seconds() - baseTime;
|
||||||
|
|
||||||
return time;
|
return time;
|
||||||
}
|
}
|
||||||
@ -1654,7 +1656,6 @@ int InitPlatform(void)
|
|||||||
|
|
||||||
RGFW_setGlobalHints_OpenGL(hints);
|
RGFW_setGlobalHints_OpenGL(hints);
|
||||||
platform.window = RGFW_createWindow((CORE.Window.title != 0)? CORE.Window.title : " ", 0, 0, CORE.Window.screen.width, CORE.Window.screen.height, flags | RGFW_windowOpenGL);
|
platform.window = RGFW_createWindow((CORE.Window.title != 0)? CORE.Window.title : " ", 0, 0, CORE.Window.screen.width, CORE.Window.screen.height, flags | RGFW_windowOpenGL);
|
||||||
CORE.Time.base = get_time_seconds();
|
|
||||||
|
|
||||||
#ifndef PLATFORM_WEB_RGFW
|
#ifndef PLATFORM_WEB_RGFW
|
||||||
i32 screenSizeWidth;
|
i32 screenSizeWidth;
|
||||||
|
|||||||
Reference in New Issue
Block a user