From 1bd9d6f97d57b94678b37a3f00b609f48415830b Mon Sep 17 00:00:00 2001
From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com>
Date: Wed, 23 Mar 2022 23:54:13 +0100
Subject: [PATCH] Fix compile order for ClientSDK

---
 r5dev/rtech/rui/rui.h                 |  2 +-
 r5dev/vproj/clientsdk.vcxproj         |  6 ++++--
 r5dev/vproj/clientsdk.vcxproj.filters | 24 ++++++++++++++++++------
 r5sdk.sln                             |  6 ++++++
 4 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/r5dev/rtech/rui/rui.h b/r5dev/rtech/rui/rui.h
index d76ba1aa..3edc55b7 100644
--- a/r5dev/rtech/rui/rui.h
+++ b/r5dev/rtech/rui/rui.h
@@ -17,7 +17,7 @@ class HRui : public IDetour
 {
 	virtual void debugp()
 	{
-		std::cout << "| FUN: RuiDraw                    : 0x" << std::hex << std::uppercase << p_RuiDraw.GetPtr() << std::setw(npad) << " |" << std::endl;
+		std::cout << "| FUN: RuiDraw                              : 0x" << std::hex << std::uppercase << p_RuiDraw.GetPtr() << std::setw(npad) << " |" << std::endl;
 		std::cout << "+----------------------------------------------------------------+" << std::endl;
 	}
 };
diff --git a/r5dev/vproj/clientsdk.vcxproj b/r5dev/vproj/clientsdk.vcxproj
index e7ad5b18..28a8dcf0 100644
--- a/r5dev/vproj/clientsdk.vcxproj
+++ b/r5dev/vproj/clientsdk.vcxproj
@@ -67,7 +67,8 @@
     <ClCompile Include="..\public\utility.cpp" />
     <ClCompile Include="..\rtech\rtech_utils.cpp" />
     <ClCompile Include="..\rtech\rtech_game.cpp" />
-    <ClCompile Include="..\rtech\stryder.cpp" />
+    <ClCompile Include="..\rtech\rui\rui.cpp" />
+    <ClCompile Include="..\rtech\stryder\stryder.cpp" />
     <ClCompile Include="..\squirrel\sqapi.cpp" />
     <ClCompile Include="..\squirrel\sqinit.cpp" />
     <ClCompile Include="..\squirrel\sqvm.cpp" />
@@ -170,7 +171,8 @@
     <ClInclude Include="..\core\resource.h" />
     <ClInclude Include="..\rtech\rtech_utils.h" />
     <ClInclude Include="..\rtech\rtech_game.h" />
-    <ClInclude Include="..\rtech\stryder.h" />
+    <ClInclude Include="..\rtech\rui\rui.h" />
+    <ClInclude Include="..\rtech\stryder\stryder.h" />
     <ClInclude Include="..\squirrel\sqapi.h" />
     <ClInclude Include="..\squirrel\sqinit.h" />
     <ClInclude Include="..\squirrel\sqvm.h" />
diff --git a/r5dev/vproj/clientsdk.vcxproj.filters b/r5dev/vproj/clientsdk.vcxproj.filters
index 3a9464d3..fb859b9b 100644
--- a/r5dev/vproj/clientsdk.vcxproj.filters
+++ b/r5dev/vproj/clientsdk.vcxproj.filters
@@ -151,6 +151,12 @@
     <Filter Include="thirdparty\lzham\lzhamdecomp\include">
       <UniqueIdentifier>{3446634c-a632-4281-a500-459a56668a6b}</UniqueIdentifier>
     </Filter>
+    <Filter Include="sdk\rtech\rui">
+      <UniqueIdentifier>{b22b8726-d9bb-4a92-9825-4a97b93d43dc}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="sdk\rtech\stryder">
+      <UniqueIdentifier>{cbbed3bf-8879-4269-a518-c526199d95af}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\client\client.cpp">
@@ -201,9 +207,6 @@
     <ClCompile Include="..\rtech\rtech_utils.cpp">
       <Filter>sdk\rtech</Filter>
     </ClCompile>
-    <ClCompile Include="..\rtech\stryder.cpp">
-      <Filter>sdk\rtech</Filter>
-    </ClCompile>
     <ClCompile Include="..\inputsystem\inputsystem.cpp">
       <Filter>sdk\inputsystem</Filter>
     </ClCompile>
@@ -381,6 +384,12 @@
     <ClCompile Include="..\tier0\fasttimer.cpp">
       <Filter>sdk\tier0</Filter>
     </ClCompile>
+    <ClCompile Include="..\rtech\rui\rui.cpp">
+      <Filter>sdk\rtech\stryder</Filter>
+    </ClCompile>
+    <ClCompile Include="..\rtech\stryder\stryder.cpp">
+      <Filter>sdk\rtech\rui</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\client\cdll_engine_int.h">
@@ -443,9 +452,6 @@
     <ClInclude Include="..\rtech\rtech_utils.h">
       <Filter>sdk\rtech</Filter>
     </ClInclude>
-    <ClInclude Include="..\rtech\stryder.h">
-      <Filter>sdk\rtech</Filter>
-    </ClInclude>
     <ClInclude Include="..\inputsystem\inputsystem.h">
       <Filter>sdk\inputsystem</Filter>
     </ClInclude>
@@ -1109,6 +1115,12 @@
     <ClInclude Include="..\tier0\cpu.h">
       <Filter>sdk\tier0</Filter>
     </ClInclude>
+    <ClInclude Include="..\rtech\rui\rui.h">
+      <Filter>sdk\rtech\stryder</Filter>
+    </ClInclude>
+    <ClInclude Include="..\rtech\stryder\stryder.h">
+      <Filter>sdk\rtech\rui</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Image Include="..\shared\resource\lockedserver.png">
diff --git a/r5sdk.sln b/r5sdk.sln
index e0c51d8d..1281d144 100644
--- a/r5sdk.sln
+++ b/r5sdk.sln
@@ -68,6 +68,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "naveditor", "r5dev\vproj\na
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "clientsdk", "r5dev\vproj\clientsdk.vcxproj", "{8FC77C68-CE93-45CE-B753-68ABE36BCDDB}"
+	ProjectSection(ProjectDependencies) = postProject
+		{1CC6BF42-D20F-4599-8619-290AF5FB4034} = {1CC6BF42-D20F-4599-8619-290AF5FB4034}
+		{B273A875-6618-49FE-8CA4-0B693BA264D5} = {B273A875-6618-49FE-8CA4-0B693BA264D5}
+		{6DC4E2AF-1740-480B-A9E4-BA766BC6B58D} = {6DC4E2AF-1740-480B-A9E4-BA766BC6B58D}
+		{AD7B43E9-2416-4B39-829E-D9D2071479B1} = {AD7B43E9-2416-4B39-829E-D9D2071479B1}
+	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{3363D141-5FD1-4569-B1B0-EC59ABBA5FAC}"
 EndProject