From c739f8ef9043a35ab1ebbd3a60ee0bdf45828144 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20H=C3=B6glinger-Stelzer?= <nefarius@dhmx.at>
Date: Sat, 22 Sep 2018 14:21:04 +0200
Subject: [PATCH] Refactored include directory structure to comply with
 cmake/vcpkg

---
 include/{ViGEmClient.h => ViGEm/Client.h}       |  2 +-
 include/{ViGEmCommon.h => ViGEm/Common.h}       |  0
 include/{ViGEmUtil.h => ViGEm/Util.h}           |  0
 .../ViGEmBusShared.h => ViGEm/km/BusShared.h}   |  2 +-
 src/ViGEmClient.cpp                             |  4 ++--
 src/ViGEmClient.vcxproj                         |  8 ++++----
 src/ViGEmClient.vcxproj.filters                 | 17 ++++++++++-------
 7 files changed, 18 insertions(+), 15 deletions(-)
 rename include/{ViGEmClient.h => ViGEm/Client.h} (99%)
 rename include/{ViGEmCommon.h => ViGEm/Common.h} (100%)
 rename include/{ViGEmUtil.h => ViGEm/Util.h} (100%)
 rename include/{km/ViGEmBusShared.h => ViGEm/km/BusShared.h} (99%)

diff --git a/include/ViGEmClient.h b/include/ViGEm/Client.h
similarity index 99%
rename from include/ViGEmClient.h
rename to include/ViGEm/Client.h
index a0f9647..c490c95 100644
--- a/include/ViGEmClient.h
+++ b/include/ViGEm/Client.h
@@ -30,7 +30,7 @@ SOFTWARE.
 extern "C" {
 #endif
 
-#include "ViGEmCommon.h"
+#include "ViGEm/Common.h"
 
 #ifdef VIGEM_DYNAMIC
 #ifdef VIGEM_EXPORTS
diff --git a/include/ViGEmCommon.h b/include/ViGEm/Common.h
similarity index 100%
rename from include/ViGEmCommon.h
rename to include/ViGEm/Common.h
diff --git a/include/ViGEmUtil.h b/include/ViGEm/Util.h
similarity index 100%
rename from include/ViGEmUtil.h
rename to include/ViGEm/Util.h
diff --git a/include/km/ViGEmBusShared.h b/include/ViGEm/km/BusShared.h
similarity index 99%
rename from include/km/ViGEmBusShared.h
rename to include/ViGEm/km/BusShared.h
index 941da48..7fb9663 100644
--- a/include/km/ViGEmBusShared.h
+++ b/include/ViGEm/km/BusShared.h
@@ -30,7 +30,7 @@ DEFINE_GUID(GUID_DEVINTERFACE_BUSENUM_VIGEM,
 
 #pragma once
 
-#include "ViGEmCommon.h"
+#include "ViGEm/Common.h"
 
 //
 // Common version for user-mode library and driver compatibility
diff --git a/src/ViGEmClient.cpp b/src/ViGEmClient.cpp
index 24fed98..28373a4 100644
--- a/src/ViGEmClient.cpp
+++ b/src/ViGEmClient.cpp
@@ -29,8 +29,8 @@ SOFTWARE.
 #include <SetupAPI.h>
 #include <initguid.h>
 
-#include "km/ViGEmBusShared.h"
-#include "ViGEmClient.h"
+#include "ViGEm/km/BusShared.h"
+#include "ViGEm/Client.h"
 #include <winioctl.h>
 #include <climits>
 #include <mutex>
diff --git a/src/ViGEmClient.vcxproj b/src/ViGEmClient.vcxproj
index 517d690..5b16b05 100644
--- a/src/ViGEmClient.vcxproj
+++ b/src/ViGEmClient.vcxproj
@@ -295,10 +295,10 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="$(SolutionDir)\Include\ViGEmBusShared.h" />
-    <ClInclude Include="$(SolutionDir)\Include\ViGEmClient.h" />
-    <ClInclude Include="$(SolutionDir)\Include\ViGEmCommon.h" />
-    <ClInclude Include="$(SolutionDir)\Include\ViGEmUtil.h" />
+    <ClInclude Include="$(SolutionDir)\include\ViGEm\BusShared.h" />
+    <ClInclude Include="$(SolutionDir)\include\ViGEm\Client.h" />
+    <ClInclude Include="$(SolutionDir)\include\ViGEm\Common.h" />
+    <ClInclude Include="$(SolutionDir)\include\ViGEm\Util.h" />
     <ClInclude Include="resource.h" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/ViGEmClient.vcxproj.filters b/src/ViGEmClient.vcxproj.filters
index b783fc4..e4d4823 100644
--- a/src/ViGEmClient.vcxproj.filters
+++ b/src/ViGEmClient.vcxproj.filters
@@ -13,22 +13,25 @@
       <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
     </Filter>
+    <Filter Include="Header Files\ViGEm">
+      <UniqueIdentifier>{3355fb06-3745-4161-8c61-b8bca15ff8fa}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="resource.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\Include\ViGEmBusShared.h">
+    <ClInclude Include="$(SolutionDir)\include\ViGEm\BusShared.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\Include\ViGEmClient.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="$(SolutionDir)\include\ViGEm\Util.h">
+      <Filter>Header Files\ViGEm</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\Include\ViGEmCommon.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="$(SolutionDir)\include\ViGEm\Common.h">
+      <Filter>Header Files\ViGEm</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\Include\ViGEmUtil.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="$(SolutionDir)\include\ViGEm\Client.h">
+      <Filter>Header Files\ViGEm</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>