From 99156c61e47284d4f4b68b05db865102a234055a Mon Sep 17 00:00:00 2001
From: Danila Malyutin <flashmozzg@gmail.com>
Date: Thu, 13 Aug 2015 00:34:54 +0300
Subject: [PATCH] Fix wrong XAudio lib being linked

---
 appveyor.yml                            | 4 ++++
 rpcs3/CMakeLists.txt                    | 7 +++++--
 rpcs3/Emu/Audio/XAudio2/XAudio2Thread.h | 3 ++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index a305da93bf..691436ecfa 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -8,6 +8,10 @@ clone_folder: c:\rpcs3
 clone_depth: 1
 test: off
 
+matrix:
+ allow_failures:
+  - configuration: ReleaseLLVM
+
 branches:
  except:
    - ppu_recompiler
diff --git a/rpcs3/CMakeLists.txt b/rpcs3/CMakeLists.txt
index 2f9c389394..0ee59a52f2 100644
--- a/rpcs3/CMakeLists.txt
+++ b/rpcs3/CMakeLists.txt
@@ -97,6 +97,9 @@ ${LLVM_INCLUDE_DIRS}
 "${RPCS3_SRC_DIR}/.."
 "${RPCS3_SRC_DIR}/../asmjit/src/asmjit"
 )
+if(WIN32)
+	include_directories(BEFORE "${RPCS3_SRC_DIR}/../minidx9/Include")
+endif()
 
 if(LLVM_FOUND)
 	add_definitions(${LLVM_DEFINITIONS})
@@ -145,9 +148,9 @@ endif()
 if(WIN32) # I'm not sure we need all of these libs, but we link them in vs
 	target_link_libraries(rpcs3  odbc32.lib odbccp32.lib comctl32.lib ws2_32.lib shlwapi.lib winmm.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib)
 	if(LLVM_FOUND)
-		target_link_libraries(rpcs3  asmjit.lib xaudio2.lib ${wxWidgets_LIBRARIES} ${OPENAL_LIBRARY} avformat.lib avcodec.lib avutil.lib swresample.lib swscale.lib ${LLVM_LIBS} ${ADDITIONAL_LIBS})
+		target_link_libraries(rpcs3  asmjit.lib ${wxWidgets_LIBRARIES} ${OPENAL_LIBRARY} avformat.lib avcodec.lib avutil.lib swresample.lib swscale.lib ${LLVM_LIBS} ${ADDITIONAL_LIBS})
 	else()
-		target_link_libraries(rpcs3  asmjit.lib xaudio2.lib ${wxWidgets_LIBRARIES} ${OPENAL_LIBRARY} avformat.lib avcodec.lib avutil.lib swresample.lib swscale.lib ${ADDITIONAL_LIBS})
+		target_link_libraries(rpcs3  asmjit.lib ${wxWidgets_LIBRARIES} ${OPENAL_LIBRARY} avformat.lib avcodec.lib avutil.lib swresample.lib swscale.lib ${ADDITIONAL_LIBS})
 	endif()
 else()
 	if(LLVM_FOUND)
diff --git a/rpcs3/Emu/Audio/XAudio2/XAudio2Thread.h b/rpcs3/Emu/Audio/XAudio2/XAudio2Thread.h
index 17eda37f13..b9bdfd2ba7 100644
--- a/rpcs3/Emu/Audio/XAudio2/XAudio2Thread.h
+++ b/rpcs3/Emu/Audio/XAudio2/XAudio2Thread.h
@@ -2,8 +2,9 @@
 
 #include "Emu/Audio/AudioThread.h"
 #if defined (_WIN32)
-
+#define _WIN32_WINNT 0x0601 // This is to be sure that correct (2.7) header is included
 #include "XAudio2.h" // XAudio2 2.8 available only on Win8+, used XAudio2 2.7 from dxsdk
+#undef _WIN32_WINNT
 
 class XAudio2Thread : public AudioThread
 {