switch to submoduling (slighly modified) detours, to allow vs2010 building. also fixes messed up paths in v10.vcproj

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "detours"]
+	path = detours
+	url = https://github.com/elijahr2411/Detours.git

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

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'">

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>

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

detours

@@ -0,0 +1 @@
+Subproject commit 4b8c659f549b0ab21cf649377c7a84eb708f5e68

vcpkg.json

@@ -1,5 +0,0 @@
-{
-  "dependencies": [
-    "detours"
-  ]
-}