Browse Source

Drop XAudio2 support. SDL uses WASAPI now.

Yao Wei Tjong 姚伟忠 6 years ago
parent
commit
b772b553f4
2 changed files with 3 additions and 4 deletions
  1. 2 3
      CMake/Modules/FindDirectX.cmake
  2. 1 1
      CMake/Modules/UrhoCommon.cmake

+ 2 - 3
CMake/Modules/FindDirectX.cmake

@@ -38,7 +38,6 @@
 #  DirectX_D3D11_FOUND
 #  DirectX_DInput_FOUND
 #  DirectX_DSound_FOUND
-#  DirectX_XAudio2_FOUND
 #  DirectX_XInput_FOUND
 #
 # When any of the Direct3D components is being searched for and found:
@@ -46,7 +45,7 @@
 #  DIRECT3D_DLL
 #
 
-set (DIRECTX_HEADERS audioclient.h d3dcompiler.h d3d9.h d3d11.h ddraw.h dsound.h dinput.h dxgi.h mmdeviceapi.h xaudio2.h xinput.h)
+set (DIRECTX_HEADERS d3dcompiler.h d3d9.h d3d11.h ddraw.h dsound.h dinput.h dxgi.h xinput.h)
 
 # When corresponding header listed above is found:
 #  HAVE_<UPCASE_NAME>_H
@@ -232,7 +231,7 @@ endforeach ()
 if (HAVE_D3D9_H)
     set (HAVE_D3D_H TRUE)
 endif ()
-foreach (COMPONENT DInput DSound XAudio2 XInput)
+foreach (COMPONENT DInput DSound XInput)
     string (TOUPPER ${COMPONENT} UPCASE_NAME)
     if (HAVE_${UPCASE_NAME}_H)
         set (DirectX_${COMPONENT}_FOUND TRUE)

+ 1 - 1
CMake/Modules/UrhoCommon.cmake

@@ -459,7 +459,7 @@ endforeach ()
 # TODO: The logic below is earmarked to be moved into SDL's CMakeLists.txt when refactoring the library dependency handling, until then ensure the DirectX package is not being searched again in external projects such as when building LuaJIT library
 if (WIN32 AND NOT CMAKE_PROJECT_NAME MATCHES ^Urho3D-ExternalProject-)
     set (DIRECTX_REQUIRED_COMPONENTS)
-    set (DIRECTX_OPTIONAL_COMPONENTS DInput DSound XAudio2 XInput)
+    set (DIRECTX_OPTIONAL_COMPONENTS DInput DSound XInput)
     if (NOT URHO3D_OPENGL)
         if (URHO3D_D3D11)
             list (APPEND DIRECTX_REQUIRED_COMPONENTS D3D11)