From c5116dea1acd12dbcb9c8538dc19c9119f264dba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustaf=20Alh=C3=A4ll?= Date: Sun, 27 Jul 2025 20:06:19 +0200 Subject: [PATCH] Add support for OpenBSD --- src/dedicated/i_system.c | 6 +++++- src/sdl/CMakeLists.txt | 4 ++++ src/sdl/i_system.cpp | 10 +++++++++- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/dedicated/i_system.c b/src/dedicated/i_system.c index 70e7ea86c..ec469620b 100644 --- a/src/dedicated/i_system.c +++ b/src/dedicated/i_system.c @@ -968,14 +968,18 @@ void I_Sleep(UINT32 ms) void I_SleepDuration(precise_t duration) { -#if defined(__linux__) || defined(__FreeBSD__) || defined(__HAIKU__) +#if defined(__linux__) || defined(__FreeBSD__) || defined(__HAIKU__) || defined(__OpenBSD__) UINT64 precision = I_GetPrecisePrecision(); struct timespec ts = { .tv_sec = duration / precision, .tv_nsec = duration * 1000000000 / precision % 1000000000, }; int status; +#ifdef __OpenBSD__ + do status = nanosleep(&ts, &ts); +#else do status = clock_nanosleep(CLOCK_MONOTONIC, 0, &ts, &ts); +#endif while (status == EINTR); #elif defined (MIN_SLEEP_DURATION_MS) UINT64 precision = I_GetPrecisePrecision(); diff --git a/src/sdl/CMakeLists.txt b/src/sdl/CMakeLists.txt index 13b41323e..664010072 100644 --- a/src/sdl/CMakeLists.txt +++ b/src/sdl/CMakeLists.txt @@ -177,6 +177,10 @@ if(${SDL2_FOUND}) ) endif() + if("${CMAKE_SYSTEM_NAME}" MATCHES "OpenBSD") + target_link_libraries(SRB2SDL2 PRIVATE pthread execinfo) + endif() + if(${CMAKE_SYSTEM} MATCHES Windows AND ${CMAKE_C_COMPILER_ID} MATCHES "GNU" AND ${SRB2_SYSTEM_BITS} EQUAL 32) target_link_libraries(SRB2SDL2 PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../../libs/drmingw/lib/win32/libexchndl.a" diff --git a/src/sdl/i_system.cpp b/src/sdl/i_system.cpp index 7be401f40..6f7478f81 100644 --- a/src/sdl/i_system.cpp +++ b/src/sdl/i_system.cpp @@ -1398,10 +1398,14 @@ void I_Sleep(UINT32 ms) void I_SleepDuration(precise_t duration) { -#if defined(__linux__) || defined(__FreeBSD__) || defined(__HAIKU__) +#if defined(__linux__) || defined(__FreeBSD__) || defined(__HAIKU__) || defined(__OpenBSD__) UINT64 precision = I_GetPrecisePrecision(); precise_t dest = I_GetPreciseTime() + duration; +#ifdef __OpenBSD__ + precise_t slack = (precision / 50); // 20 ms slack +#else precise_t slack = (precision / 5000); // 0.2 ms slack +#endif if (duration > slack) { duration -= slack; @@ -1414,7 +1418,11 @@ void I_SleepDuration(precise_t duration) #endif }; int status; +#ifdef __OpenBSD__ + do status = nanosleep(&ts, &ts); +#else do status = clock_nanosleep(CLOCK_MONOTONIC, 0, &ts, &ts); +#endif while (status == EINTR); }