From f2f8a088bfbc8b7311f2efb402963eb3b0802a46 Mon Sep 17 00:00:00 2001
From: Amos <48657826+Mauler125@users.noreply.github.com>
Date: Fri, 14 Jan 2022 20:51:32 +0100
Subject: [PATCH] Fix compiler error caused merge from separate branch

---
 r5dev/dedicated.vcxproj         | 1 +
 r5dev/dedicated.vcxproj.filters | 3 +++
 r5dev/r5dev.vcxproj             | 1 +
 r5dev/r5dev.vcxproj.filters     | 3 +++
 4 files changed, 8 insertions(+)

diff --git a/r5dev/dedicated.vcxproj b/r5dev/dedicated.vcxproj
index a16d295c..5e4f4103 100644
--- a/r5dev/dedicated.vcxproj
+++ b/r5dev/dedicated.vcxproj
@@ -362,6 +362,7 @@
     <ClCompile Include="common\opcodes.cpp" />
     <ClCompile Include="core\dllmain.cpp" />
     <ClCompile Include="core\init.cpp" />
+    <ClCompile Include="core\logdef.cpp" />
     <ClCompile Include="core\stdafx.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
diff --git a/r5dev/dedicated.vcxproj.filters b/r5dev/dedicated.vcxproj.filters
index 0fd1d77a..dad27839 100644
--- a/r5dev/dedicated.vcxproj.filters
+++ b/r5dev/dedicated.vcxproj.filters
@@ -872,6 +872,9 @@
     <ClCompile Include="tier0\commandline.cpp">
       <Filter>sdk\tier0</Filter>
     </ClCompile>
+    <ClCompile Include="core\logdef.cpp">
+      <Filter>core</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="r5dev.def" />
diff --git a/r5dev/r5dev.vcxproj b/r5dev/r5dev.vcxproj
index c1cd4a2f..f0d7fe4f 100644
--- a/r5dev/r5dev.vcxproj
+++ b/r5dev/r5dev.vcxproj
@@ -26,6 +26,7 @@
     <ClCompile Include="common\opcodes.cpp" />
     <ClCompile Include="core\dllmain.cpp" />
     <ClCompile Include="core\init.cpp" />
+    <ClCompile Include="core\logdef.cpp" />
     <ClCompile Include="core\stdafx.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
diff --git a/r5dev/r5dev.vcxproj.filters b/r5dev/r5dev.vcxproj.filters
index 0cd6a3cc..c26cd15c 100644
--- a/r5dev/r5dev.vcxproj.filters
+++ b/r5dev/r5dev.vcxproj.filters
@@ -402,6 +402,9 @@
     <ClCompile Include="tier0\commandline.cpp">
       <Filter>sdk\tier0</Filter>
     </ClCompile>
+    <ClCompile Include="core\logdef.cpp">
+      <Filter>core</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="client\cdll_engine_int.h">