diff --git a/audio/audio.h b/audio/audio.h index d84d54a1..613c62c7 100644 --- a/audio/audio.h +++ b/audio/audio.h @@ -9,7 +9,7 @@ http://mozilla.org/MPL/2.0/. #pragma once -#ifdef __APPLE__ +#if defined(__APPLE__) && !__has_include() #include #include #else diff --git a/stdafx.h b/stdafx.h index fec02883..c3ba0716 100644 --- a/stdafx.h +++ b/stdafx.h @@ -89,7 +89,11 @@ #define glfwFocusWindow(w) #endif +#if defined(__aarch64__) || defined(__arm64__) +#define GLM_FORCE_NEON +#else #define GLM_FORCE_AVX2 +#endif #define GLM_FORCE_SWIZZLE #define GLM_ENABLE_EXPERIMENTAL #define GLM_FORCE_CTOR_INIT diff --git a/utilities/utilities.cpp b/utilities/utilities.cpp index fc1d7a53..81386c2c 100644 --- a/utilities/utilities.cpp +++ b/utilities/utilities.cpp @@ -39,9 +39,18 @@ bool DebugTractionFlag = false; std::string Now() { +#if defined(__APPLE__) + auto t = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now()); + std::tm tm{}; + localtime_r(&t, &tm); + char buf[64]; + std::strftime(buf, sizeof(buf), "%c", &tm); + return std::string(buf); +#else auto now = std::chrono::system_clock::now(); auto local = std::chrono::current_zone()->to_local(now); return std::format("{:%c}", local); +#endif } // zwraca różnicę czasu