cmake hookup is done, there are some issues that I'll be trying to fix within faudio.cpp before it's ready for mainstream

This commit is contained in:
ZachBacon 2018-12-18 10:24:39 -05:00
parent eab039cd78
commit 99795b270d
2 changed files with 2 additions and 2 deletions

View File

@ -605,6 +605,7 @@ TARGET_LINK_LIBRARIES (
${DIRECTX_LIBRARIES} ${DIRECTX_LIBRARIES}
${GTK_LIBRARIES} ${GTK_LIBRARIES}
${OPENAL_LIBRARY} ${OPENAL_LIBRARY}
faudio
) )
if(ENABLE_FFMPEG) if(ENABLE_FFMPEG)

View File

@ -10,7 +10,6 @@
// Faudio // Faudio
#include <faudio.h> #include <faudio.h>
#endif
// MMDevice API // MMDevice API
#include <mmdeviceapi.h> #include <mmdeviceapi.h>
@ -60,7 +59,7 @@ bool GetFA2Devices(wxArrayString& names, wxArrayString& ids)
#ifdef _DEBUG #ifdef _DEBUG
flags = FAUDIO_DEBUG_ENGINE; flags = FAUDIO_DEBUG_ENGINE;
#endif #endif
hr = FAudioreate(&xa, flags); hr = FAudioreate(&fa, flags);
if (hr != S_OK) { if (hr != S_OK) {
wxLogError(_("The FAudio interface failed to initialize!")); wxLogError(_("The FAudio interface failed to initialize!"));