diff --git a/build/CompilerAndLinker.cmake b/build/CompilerAndLinker.cmake
index 35f9c75..4b970c7 100644
--- a/build/CompilerAndLinker.cmake
+++ b/build/CompilerAndLinker.cmake
@@ -30,11 +30,11 @@ elseif(CMAKE_VS_PLATFORM_NAME_DEFAULT MATCHES "^[Aa][Rr][Mm]64$")
     set(DIRECTX_ARCH arm64)
 elseif(CMAKE_VS_PLATFORM_NAME_DEFAULT MATCHES "^[Aa][Rr][Mm]64EC$")
     set(DIRECTX_ARCH arm64ec)
-elseif((NOT (DEFINED DIRECTX_ARCH)) AND (CMAKE_SYSTEM_NAME STREQUAL "Linux"))
-    if (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-        set(DIRECTX_ARCH x64)
-    elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
+elseif(NOT (DEFINED DIRECTX_ARCH))
+    if(CMAKE_SYSTEM_PROCESSOR MATCHES "[Aa][Rr][Mm]64|aarch64|arm64")
         set(DIRECTX_ARCH arm64)
+    else()
+        set(DIRECTX_ARCH x64)
     endif()
 endif()
 
@@ -104,6 +104,7 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang|IntelLLVM")
     if(MSVC AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 16.0))
       list(APPEND COMPILER_SWITCHES /ZH:SHA_256)
     endif()
+
     if(WINDOWS_STORE)
       list(APPEND COMPILER_DEFINES _SILENCE_CLANG_COROUTINE_MESSAGE)
     endif()