From f8e6033ae6d769b48a13aab9e50c2690d8eb8517 Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Sat, 26 Jun 2021 00:19:49 +0300 Subject: [PATCH] engine: move TIMER_LINUX to TIMER_POSIX, enabling dedicated builds for FreeBSD and other *nix platforms --- common/backends.h | 2 +- common/defaults.h | 2 +- engine/platform/linux/sys_linux.c | 16 ---------------- engine/platform/posix/sys_posix.c | 16 ++++++++++++++++ 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/common/backends.h b/common/backends.h index 34c0f097..84156534 100644 --- a/common/backends.h +++ b/common/backends.h @@ -44,7 +44,7 @@ GNU General Public License for more details. // timer (XASH_TIMER) #define TIMER_NULL 0 // not used #define TIMER_SDL 1 -#define TIMER_LINUX 2 +#define TIMER_POSIX 2 #define TIMER_WIN32 3 #define TIMER_DOS 4 diff --git a/common/defaults.h b/common/defaults.h index ff33d79c..a717f743 100644 --- a/common/defaults.h +++ b/common/defaults.h @@ -128,7 +128,7 @@ SETUP BACKENDS DEFINITIONS #if XASH_WIN32 #define XASH_TIMER TIMER_WIN32 #else // !XASH_WIN32 - #define XASH_TIMER TIMER_LINUX + #define XASH_TIMER TIMER_POSIX #endif // !XASH_WIN32 #endif diff --git a/engine/platform/linux/sys_linux.c b/engine/platform/linux/sys_linux.c index 2b1b71cb..23d0aa13 100644 --- a/engine/platform/linux/sys_linux.c +++ b/engine/platform/linux/sys_linux.c @@ -18,22 +18,6 @@ GNU General Public License for more details. #include #include "platform/platform.h" -#if XASH_TIMER == TIMER_LINUX -double Platform_DoubleTime( void ) -{ - struct timespec ts; - - clock_gettime(CLOCK_MONOTONIC, &ts); - - return (double) ts.tv_sec + (double) ts.tv_nsec/1000000000.0; -} - -void Platform_Sleep( int msec ) -{ - usleep( msec * 1000 ); -} -#endif // XASH_TIMER == TIMER_LINUX - qboolean Sys_DebuggerPresent( void ) { char buf[4096]; diff --git a/engine/platform/posix/sys_posix.c b/engine/platform/posix/sys_posix.c index dd448726..328d11db 100644 --- a/engine/platform/posix/sys_posix.c +++ b/engine/platform/posix/sys_posix.c @@ -153,3 +153,19 @@ void Platform_Init( void ) } void Platform_Shutdown( void ) {} #endif + +#if XASH_TIMER == TIMER_POSIX +double Platform_DoubleTime( void ) +{ + struct timespec ts; + + clock_gettime(CLOCK_MONOTONIC, &ts); + + return (double) ts.tv_sec + (double) ts.tv_nsec/1000000000.0; +} + +void Platform_Sleep( int msec ) +{ + usleep( msec * 1000 ); +} +#endif // XASH_TIMER == TIMER_POSIX