finish connecting new faudio driver

Add cmake code to find and link faudio if enabled.

Fix typo for get devices faudio method in wxvbam.h

Selecting the faudio driver now works, but the driver not does
unfortunately.

src/wx/CMakeLists.txt

@@ -44,6 +44,10 @@ else(ENABLE_OPENAL)
     ADD_DEFINITIONS (-DNO_OAL)
 endif(ENABLE_OPENAL)
 
+if(ENABLE_FAUDIO)
+    find_package(FAudio REQUIRED)
+endif()
+
 IF(CMAKE_BUILD_TYPE STREQUAL "Debug")
     SET(wxWidgets_USE_DEBUG ON) # noop if wx is compiled with --disable-debug, like in Mac Homebrew atm
 ENDIF()
@@ -605,6 +609,7 @@ TARGET_LINK_LIBRARIES (
     ${DIRECTX_LIBRARIES}
     ${GTK_LIBRARIES}
     ${OPENAL_LIBRARY}
+    FAudio
 )
 
 if(ENABLE_FFMPEG)

src/wx/wxvbam.h

@@ -711,10 +711,16 @@ extern bool GetOALDevices(wxArrayString& names, wxArrayString& ids);
 #ifdef __WXMSW__
 extern SoundDriver* newDirectSound();
 extern bool GetDSDevices(wxArrayString& names, wxArrayString& ids);
+
+#ifndef NO_XAUDIO2
 extern SoundDriver* newXAudio2_Output();
 extern bool GetXA2Devices(wxArrayString& names, wxArrayString& ids);
+#endif
+
+#ifndef NO_FAUDIO
 extern SoundDriver* newFAudio_Output();
-extern bool GetFSDevices(wxArrayString& names, wxArrayString& ids);
+extern bool GetFADevices(wxArrayString& names, wxArrayString& ids);
+#endif
 #endif
 
 extern bool debugger;