From 53372fc512e6b91c06b28fd47248f269b9b5b010 Mon Sep 17 00:00:00 2001 From: Mitch Foley Date: Fri, 7 Oct 2022 16:58:42 -0400 Subject: [PATCH 1/2] emscripten no longer provides sys/timex.h, but does provide sys/time.h --- encoder/basisu_enc.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/encoder/basisu_enc.cpp b/encoder/basisu_enc.cpp index 7e21d365..1ea699b8 100644 --- a/encoder/basisu_enc.cpp +++ b/encoder/basisu_enc.cpp @@ -229,7 +229,7 @@ namespace basisu { QueryPerformanceFrequency(reinterpret_cast(pTicks)); } -#elif defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) +#elif defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__wasm__) #include inline void query_counter(timer_ticks* pTicks) { From 18b4868d2cbe3a4db996e18253d22ec69758abde Mon Sep 17 00:00:00 2001 From: walkingeyerobot Date: Fri, 7 Oct 2022 18:38:59 -0400 Subject: [PATCH 2/2] Update encoder/basisu_enc.cpp Co-authored-by: Derek Schuff --- encoder/basisu_enc.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/encoder/basisu_enc.cpp b/encoder/basisu_enc.cpp index 1ea699b8..c431ceaf 100644 --- a/encoder/basisu_enc.cpp +++ b/encoder/basisu_enc.cpp @@ -229,7 +229,7 @@ namespace basisu { QueryPerformanceFrequency(reinterpret_cast(pTicks)); } -#elif defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__wasm__) +#elif defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__EMSCRIPTEN__) #include inline void query_counter(timer_ticks* pTicks) {