From 05f88ab74a5fd1b34bb05eda05655462300e2642 Mon Sep 17 00:00:00 2001
From: Elijah <elijah@computernewb.com>
Date: Tue, 28 May 2024 13:07:22 -0400
Subject: [PATCH] switch to submoduling (slighly modified) detours, to allow
 vs2010 building. also fixes messed up paths in v10.vcproj

---
 .gitmodules                            |  3 +++
 MSNRedirector.v10.sln                  |  7 +++----
 MSNRedirector/MSNRedirector.vcxproj    |  5 ++++-
 MSNRedirector/MSNRedirector.vs9.vcproj | 12 ++++++++++++
 MSNRedirector/pch.h                    |  2 +-
 detours                                |  1 +
 vcpkg.json                             |  5 -----
 7 files changed, 24 insertions(+), 11 deletions(-)
 create mode 100644 .gitmodules
 create mode 160000 detours
 delete mode 100644 vcpkg.json

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..151edc7
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "detours"]
+	path = detours
+	url = https://github.com/elijahr2411/Detours.git
diff --git a/MSNRedirector.v10.sln b/MSNRedirector.v10.sln
index f0602b7..3fa7d9f 100644
--- a/MSNRedirector.v10.sln
+++ b/MSNRedirector.v10.sln
@@ -9,10 +9,9 @@ Global
 		Release|Win32 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{15EB1C25-7CB3-43A0-9A6F-F2A0879A6BC2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{15EB1C25-7CB3-43A0-9A6F-F2A0879A6BC2}.Debug|Win32.Build.0 = Debug|Win32
-		{15EB1C25-7CB3-43A0-9A6F-F2A0879A6BC2}.Release|Win32.ActiveCfg = Release|Win32
-		{15EB1C25-7CB3-43A0-9A6F-F2A0879A6BC2}.Release|Win32.Build.0 = Release|Win32
+		{8C0E98F0-6138-4C11-A48F-79E42639392E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8C0E98F0-6138-4C11-A48F-79E42639392E}.Release|Win32.ActiveCfg = Release|Win32
+		{8C0E98F0-6138-4C11-A48F-79E42639392E}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/MSNRedirector/MSNRedirector.vcxproj b/MSNRedirector/MSNRedirector.vcxproj
index 1050c63..ffaf48c 100644
--- a/MSNRedirector/MSNRedirector.vcxproj
+++ b/MSNRedirector/MSNRedirector.vcxproj
@@ -83,7 +83,8 @@
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Label="Vcpkg">
-    <VcpkgEnableManifest>true</VcpkgEnableManifest>
+    <VcpkgEnableManifest>false</VcpkgEnableManifest>
+    <VcpkgEnabled>false</VcpkgEnabled>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -130,6 +131,7 @@
       <PreprocessorDefinitions>WIN32;NDEBUG;MSNREDIRECTOR_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>false</ConformanceMode>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <AdditionalIncludeDirectories>$(SolutionDir)detours\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -138,6 +140,7 @@
       <ModuleDefinitionFile>MSNRedirector.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableUAC>false</EnableUAC>
+      <AdditionalOptions>..\detours\lib.X86\detours.lib %(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/MSNRedirector/MSNRedirector.vs9.vcproj b/MSNRedirector/MSNRedirector.vs9.vcproj
index 5291eeb..ea8762c 100644
--- a/MSNRedirector/MSNRedirector.vs9.vcproj
+++ b/MSNRedirector/MSNRedirector.vs9.vcproj
@@ -44,6 +44,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)detours\include&quot;"
 				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_USRDLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -67,6 +68,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="..\detours\lib.X86\detours.lib"
 				LinkIncremental="2"
 				ModuleDefinitionFile="MSNRedirector.def"
 				GenerateDebugInformation="true"
@@ -125,6 +127,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)detours\include&quot;"
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -147,6 +150,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="..\detours\lib.X86\detours.lib"
 				LinkIncremental="1"
 				ModuleDefinitionFile="MSNRedirector.def"
 				GenerateDebugInformation="true"
@@ -205,6 +209,14 @@
 			RelativePath=".\MSNRedirector.def"
 			>
 		</File>
+		<File
+			RelativePath=".\pch.cpp"
+			>
+		</File>
+		<File
+			RelativePath=".\pch.h"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/MSNRedirector/pch.h b/MSNRedirector/pch.h
index 02f941f..67024fe 100644
--- a/MSNRedirector/pch.h
+++ b/MSNRedirector/pch.h
@@ -9,7 +9,7 @@
 
 // add headers that you want to pre-compile here
 #include "framework.h"
-#include <detours/detours.h>
+#include <detours.h>
 #include <atlstr.h>
 
 #endif //PCH_H
diff --git a/detours b/detours
new file mode 160000
index 0000000..4b8c659
--- /dev/null
+++ b/detours
@@ -0,0 +1 @@
+Subproject commit 4b8c659f549b0ab21cf649377c7a84eb708f5e68
diff --git a/vcpkg.json b/vcpkg.json
deleted file mode 100644
index ebb08f9..0000000
--- a/vcpkg.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "dependencies": [
-    "detours"
-  ]
-}