diff --git a/src/wx/faudio.cpp b/src/wx/faudio.cpp
index bc4b92e5..268d3d4a 100644
--- a/src/wx/faudio.cpp
+++ b/src/wx/faudio.cpp
@@ -25,6 +25,9 @@ int GetFADevices(FAudio* fa, wxArrayString* names, wxArrayString* ids,
{
HRESULT hr;
UINT32 dev_count = 0;
+
+ wxLogDebug("IN FAUDIO INIT");
+
hr = FAudio_GetDeviceCount(fa, &dev_count);
if (hr != S_OK) {
diff --git a/src/wx/opts.cpp b/src/wx/opts.cpp
index 079b18fb..20f59c17 100644
--- a/src/wx/opts.cpp
+++ b/src/wx/opts.cpp
@@ -255,29 +255,7 @@ opt_desc opts[] = {
/// Sound
-#define OAL_SOUND "openal|"
-
-#ifdef NO_OAL
-# define OAL_SOUND ""
-#endif
-
-#define XAUDIO2_SOUND "xaudio2|"
-
-#ifdef NO_XAUDIO2
-# define XAUDIO2_SOUND ""
-#endif
-
-#define FAUDIO_SOUND "faudio|"
-
-#ifdef NO_FAUDIO
-# define FAUDIO_SOUND ""
-#endif
-
-#ifdef __WXMSW__
- ENUMOPT("Sound/AudioAPI", "", wxTRANSLATE("Sound API; if unsupported, default API will be used"), gopts.audio_api, wxTRANSLATE("sdl|" OAL_SOUND "directsound|" FAUDIO_SOUND "xaudio2")),
-#else
- ENUMOPT("Sound/AudioAPI", "", wxTRANSLATE("Sound API; if unsupported, default API will be used"), gopts.audio_api, wxTRANSLATE("sdl|" OAL_SOUND FAUDIO_SOUND)),
-#endif
+ ENUMOPT("Sound/AudioAPI", "", wxTRANSLATE("Sound API; if unsupported, default API will be used"), gopts.audio_api, wxTRANSLATE("sdl|openal|directsound|xaudio2|faudio")),
INTOPT("Sound/Buffers", "", wxTRANSLATE("Number of sound buffers"), gopts.audio_buffers, 2, 10),
INTOPT("Sound/Enable", "", wxTRANSLATE("Bit mask of sound channels to enable"), gopts.sound_en, 0, 0x30f),
INTOPT("Sound/GBAFiltering", "", wxTRANSLATE("GBA sound filtering (%)"), gopts.gba_sound_filter, 0, 100),
diff --git a/src/wx/xrc/SoundConfig.xrc b/src/wx/xrc/SoundConfig.xrc
index 3f1feca2..77c220a2 100644
--- a/src/wx/xrc/SoundConfig.xrc
+++ b/src/wx/xrc/SoundConfig.xrc
@@ -109,20 +109,7 @@
-
-
wxEXPAND