From 2f0653824e09ab5e89dd4fb8be16022a12c2a833 Mon Sep 17 00:00:00 2001 From: Rafael Kitover Date: Mon, 24 Feb 2020 20:49:01 +0000 Subject: [PATCH] Enable XAudio2 for Windows vcpkg build. Add necessary headers to the dependencies submodule and default the cmake option to on. Signed-off-by: Rafael Kitover --- dependencies | 2 +- po/wxvbam/wxvbam.pot | 18 +++++++++++++++++- src/wx/CMakeLists.txt | 6 +----- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/dependencies b/dependencies index fa2265a8..605765f5 160000 --- a/dependencies +++ b/dependencies @@ -1 +1 @@ -Subproject commit fa2265a8bedfbdc6169d9891c79320c76b7b0dd1 +Subproject commit 605765f55dccc515a9b3b934a7718321f14e3d56 diff --git a/po/wxvbam/wxvbam.pot b/po/wxvbam/wxvbam.pot index bab38978..95dcd0e6 100644 --- a/po/wxvbam/wxvbam.pot +++ b/po/wxvbam/wxvbam.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-17 08:32+0000\n" +"POT-Creation-Date: 2020-02-24 20:36+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1126,6 +1126,22 @@ msgstr "" msgid "Disconnected game controller %d" msgstr "" +#: xaudio2.cpp:35 +msgid "XAudio2: Enumerating devices failed!" +msgstr "" + +#: xaudio2.cpp:69 xaudio2.cpp:353 +msgid "The XAudio2 interface failed to initialize!" +msgstr "" + +#: xaudio2.cpp:384 +msgid "XAudio2: Creating mastering voice failed!" +msgstr "" + +#: xaudio2.cpp:393 +msgid "XAudio2: Creating source voice failed!" +msgstr "" + #: dsound.cpp:90 dsound.cpp:104 #, c-format msgid "Cannot create DirectSound %08x" diff --git a/src/wx/CMakeLists.txt b/src/wx/CMakeLists.txt index 880bbfa0..9b87594a 100644 --- a/src/wx/CMakeLists.txt +++ b/src/wx/CMakeLists.txt @@ -26,11 +26,7 @@ if(WIN32) # not yet implemented option(ENABLE_DIRECT3D "Enable Direct3D rendering for the wxWidgets port" OFF) - if(NOT CMAKE_TOOLCHAIN_FILE MATCHES vcpkg) - option(ENABLE_XAUDIO2 "Enable xaudio2 sound output for the wxWidgets port" ON) - else() - option(ENABLE_XAUDIO2 "Enable xaudio2 sound output for the wxWidgets port" OFF) - endif() + option(ENABLE_XAUDIO2 "Enable xaudio2 sound output for the wxWidgets port" ON) endif() option(ENABLE_FAUDIO "Enable FAudio sound output for the wxWidgets port" OFF)