From 64f3990e939df27f60f0835292718b512c4b1737 Mon Sep 17 00:00:00 2001 From: Artem Borovik Date: Fri, 30 Aug 2024 20:40:07 +0300 Subject: [PATCH] reset webrogue-specific changes to upstream --- cmake/LibraryConfigurations.cmake | 6 +----- src/rcore.c | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/cmake/LibraryConfigurations.cmake b/cmake/LibraryConfigurations.cmake index 9fda38bb7..6d2250c71 100644 --- a/cmake/LibraryConfigurations.cmake +++ b/cmake/LibraryConfigurations.cmake @@ -44,11 +44,7 @@ if (${PLATFORM} MATCHES "Desktop") set(OPENGL_LIBRARIES "GL") endif () - if (NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "WASI") - set(LIBS_PRIVATE m atomic) - endif () - - set(LIBS_PRIVATE ${LIBS_PRIVATE} pthread ${OPENGL_LIBRARIES} ${OSS_LIBRARY}) + set(LIBS_PRIVATE m atomic pthread ${OPENGL_LIBRARIES} ${OSS_LIBRARY}) if ("${CMAKE_SYSTEM_NAME}" MATCHES "(Net|Open)BSD") find_library(OSS_LIBRARY ossaudio) diff --git a/src/rcore.c b/src/rcore.c index d8ff89b2f..972d58600 100644 --- a/src/rcore.c +++ b/src/rcore.c @@ -1696,7 +1696,7 @@ void WaitTime(double seconds) #if defined(_WIN32) Sleep((unsigned long)(sleepSeconds*1000.0)); #endif - #if defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__EMSCRIPTEN__) || defined(__wasi__) + #if defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__EMSCRIPTEN__) struct timespec req = { 0 }; time_t sec = sleepSeconds; long nsec = (sleepSeconds - sec)*1000000000L;