XAudio2Redist doesn't support arm

microsoft · Aug 23, 2024 · 2de3b9a · 2de3b9a
1 parent 93b6666
commit 2de3b9a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -191,7 +191,11 @@ set(SHADER_SOURCES ${SHADER_SOURCES}
     Src/Shaders/Utilities.fxh)
 
 if(MINGW)
-   set(BUILD_XAUDIO_WIN10 OFF)
+  set(BUILD_XAUDIO_WIN10 OFF)
+endif()
+
+if(${DIRECTX_ARCH} MATCHES "^arm")
+  set(BUILD_XAUDIO_REDIST OFF)
 endif()
 
 if(WINDOWS_STORE

diff --git a/build/CompilerAndLinker.cmake b/build/CompilerAndLinker.cmake
@@ -136,7 +136,8 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
       list(APPEND COMPILER_SWITCHES /Zc:lambda)
     endif()
 
-    if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.29)
+    if((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.29)
+       AND (NOT VCPKG_TOOLCHAIN))
       list(APPEND COMPILER_SWITCHES /external:W4)
     endif()