eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-22 18:39:18 +02:00
Code Issues 123 Wiki Activity

Merge pull request #110 from xwizard/macos-arm64-build

Browse Source 
Add macOS ARM64 build support
This commit is contained in:
Hirek
2026-06-16 11:15:46 +02:00
committed by GitHub
parent c0abea1473 dd412894bb
commit 306ed64f38
3 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
audio/audio.h
View File

@@ -9,7 +9,7 @@ http://mozilla.org/MPL/2.0/.
#pragma once #pragma once
#ifdef __APPLE__ #if defined(__APPLE__) && !__has_include(<AL/al.h>)
#include <OpenAL/al.h> #include <OpenAL/al.h>
#include <OpenAL/alc.h> #include <OpenAL/alc.h>
#else #else

4
stdafx.h
View File

@@ -89,7 +89,11 @@
#define glfwFocusWindow(w) #define glfwFocusWindow(w)
#endif #endif
#if defined(__aarch64__) || defined(__arm64__)
#define GLM_FORCE_NEON
#else
#define GLM_FORCE_AVX2 #define GLM_FORCE_AVX2
#endif
#define GLM_FORCE_SWIZZLE #define GLM_FORCE_SWIZZLE
#define GLM_ENABLE_EXPERIMENTAL #define GLM_ENABLE_EXPERIMENTAL
#define GLM_FORCE_CTOR_INIT #define GLM_FORCE_CTOR_INIT

9
utilities/utilities.cpp
View File

@@ -41,9 +41,18 @@ bool DebugTractionFlag = false;
std::string Now() 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 now = std::chrono::system_clock::now();
auto local = std::chrono::current_zone()->to_local(now); auto local = std::chrono::current_zone()->to_local(now);
return std::format("{:%c}", local); return std::format("{:%c}", local);
#endif
} }
// zwraca różnicę czasu // zwraca różnicę czasu