From 52b687dc55002b9963d22cf790ab63b5f8aa8ea7 Mon Sep 17 00:00:00 2001
From: GovanifY <gauvain@govanify.com>
Date: Sun, 4 Oct 2020 02:44:06 +0200
Subject: [PATCH] DEV9: integrate lean and mean and rebase with spu2

---
 pcsx2/DEV9/Win32/{Config.cpp => DEV9WinConfig.cpp} | 0
 pcsx2/SPU2/Windows/Config.cpp                      | 1 +
 pcsx2/SPU2/Windows/SndOut_XAudio2.cpp              | 1 +
 pcsx2/windows/VCprojects/pcsx2.vcxproj             | 2 +-
 pcsx2/windows/VCprojects/pcsx2.vcxproj.filters     | 6 +++---
 5 files changed, 6 insertions(+), 4 deletions(-)
 rename pcsx2/DEV9/Win32/{Config.cpp => DEV9WinConfig.cpp} (100%)

diff --git a/pcsx2/DEV9/Win32/Config.cpp b/pcsx2/DEV9/Win32/DEV9WinConfig.cpp
similarity index 100%
rename from pcsx2/DEV9/Win32/Config.cpp
rename to pcsx2/DEV9/Win32/DEV9WinConfig.cpp
diff --git a/pcsx2/SPU2/Windows/Config.cpp b/pcsx2/SPU2/Windows/Config.cpp
index 7621a01e75..29a5f3258f 100644
--- a/pcsx2/SPU2/Windows/Config.cpp
+++ b/pcsx2/SPU2/Windows/Config.cpp
@@ -16,6 +16,7 @@
 #include "PrecompiledHeader.h"
 #include "../Global.h"
 #include "Dialogs.h"
+#include "Config.h"
 #include <math.h>
 
 #ifdef PCSX2_DEVBUILD
diff --git a/pcsx2/SPU2/Windows/SndOut_XAudio2.cpp b/pcsx2/SPU2/Windows/SndOut_XAudio2.cpp
index fcae4b3b4b..79761b94ee 100644
--- a/pcsx2/SPU2/Windows/SndOut_XAudio2.cpp
+++ b/pcsx2/SPU2/Windows/SndOut_XAudio2.cpp
@@ -20,6 +20,7 @@
 #undef _WIN32_WINNT
 #define _WIN32_WINNT 0x0602
 #include <xaudio2.h>
+#include <cguid.h>
 #include <atlcomcli.h>
 #include <memory>
 #include <sstream>
diff --git a/pcsx2/windows/VCprojects/pcsx2.vcxproj b/pcsx2/windows/VCprojects/pcsx2.vcxproj
index 27449a1af6..6107185699 100644
--- a/pcsx2/windows/VCprojects/pcsx2.vcxproj
+++ b/pcsx2/windows/VCprojects/pcsx2.vcxproj
@@ -266,7 +266,7 @@
     <ClCompile Include="..\..\DEV9\flash.cpp" />
     <ClCompile Include="..\..\DEV9\pcap_io.cpp" />
     <ClCompile Include="..\..\DEV9\smap.cpp" />
-    <ClCompile Include="..\..\DEV9\Win32\Config.cpp" />
+    <ClCompile Include="..\..\DEV9\Win32\DEV9WinConfig.cpp" />
     <ClCompile Include="..\..\DEV9\Win32\net.cpp" />
     <ClCompile Include="..\..\DEV9\Win32\tap-win32.cpp" />
     <ClCompile Include="..\..\DEV9\Win32\Win32.cpp" />
diff --git a/pcsx2/windows/VCprojects/pcsx2.vcxproj.filters b/pcsx2/windows/VCprojects/pcsx2.vcxproj.filters
index a8e1cd3a33..6d489db303 100644
--- a/pcsx2/windows/VCprojects/pcsx2.vcxproj.filters
+++ b/pcsx2/windows/VCprojects/pcsx2.vcxproj.filters
@@ -1018,9 +1018,6 @@
     <ClCompile Include="..\..\DEV9\smap.cpp">
       <Filter>System\DEV9</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\DEV9\Win32\Config.cpp">
-      <Filter>System\DEV9</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\DEV9\Win32\net.cpp">
       <Filter>System\DEV9</Filter>
     </ClCompile>
@@ -1030,6 +1027,9 @@
     <ClCompile Include="..\..\DEV9\Win32\Win32.cpp">
       <Filter>System\DEV9</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\DEV9\Win32\DEV9WinConfig.cpp">
+      <Filter>System\DEV9</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\Patch.h">