From eee549f92b34188b6011a5a253e22f8af1d084f2 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Tue, 18 Feb 2014 13:21:12 -0500
Subject: [PATCH] Scope the Windows include directory to only point to
 Source/Core/.

Also fix the Windows build with this change.
---
 Source/Core/Core/Core.cpp |  2 +-
 Source/VSProps/Base.props | 12 +-----------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/Source/Core/Core/Core.cpp b/Source/Core/Core/Core.cpp
index a40ca02545..4c2eb66b23 100644
--- a/Source/Core/Core/Core.cpp
+++ b/Source/Core/Core/Core.cpp
@@ -4,7 +4,7 @@
 
 #ifdef _WIN32
 #include <windows.h>
-#include "EmuWindow.h"
+#include "VideoCommon/EmuWindow.h"
 #endif
 
 #include "AudioCommon/AudioCommon.h"
diff --git a/Source/VSProps/Base.props b/Source/VSProps/Base.props
index 2ffcafa8f7..36fe12a6ea 100644
--- a/Source/VSProps/Base.props
+++ b/Source/VSProps/Base.props
@@ -22,7 +22,6 @@
     <IntDir>$(BuildRootDir)$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
     <OutDir>$(IntDir)bin\</OutDir>
     <TargetName Condition="'$(ConfigurationType)'=='Application'">$(ProjectName)$(TargetSuffix)</TargetName>
-    <IncludePath>$(SolutionDir)Core;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <!--ClCompile Base-->
@@ -32,16 +31,7 @@
       Order matters! (first hit, first use).
         Note: Directory containing source file being compiled is always searched first.
       -->
-      <AdditionalIncludeDirectories>$(CoreDir)AudioCommon;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories>$(CoreDir)Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories>$(CoreDir)Core;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories>$(CoreDir)DiscIO;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories>$(CoreDir)DolphinWX;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories>$(CoreDir)InputCommon;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories>$(CoreDir)VideoBackends\D3D;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories>$(CoreDir)VideoBackends\OGL;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories>$(CoreDir)VideoBackends\Software;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories>$(CoreDir)VideoCommon;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(CoreDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories>$(ExternalsDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories>$(ExternalsDir)Bochs_disasm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories>$(ExternalsDir)GL;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>