From e0144394f5223254711ada988cd6495c2583cc85 Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Fri, 16 Nov 2012 15:35:45 -0800
Subject: [PATCH] Add the directory with inttypes.h to the include path for
 Makefile projects

---
 aegisub/build/Aegisub/Aegisub.targets | 1 -
 aegisub/build/standard-settings.props | 2 +-
 aegisub/build/tasks.props             | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/aegisub/build/Aegisub/Aegisub.targets b/aegisub/build/Aegisub/Aegisub.targets
index d857fb4c1..e5bc7194f 100644
--- a/aegisub/build/Aegisub/Aegisub.targets
+++ b/aegisub/build/Aegisub/Aegisub.targets
@@ -169,7 +169,6 @@
       </PreprocessorDefinitions>
       <AdditionalIncludeDirectories>
         $(SrcDir)include\;
-        $(SrcDir)msvc\;
         $(AegisubContribBase)iconv\include;
         $(AegisubSourceBase)libaegisub\include;
         $(AegisubSourceBase)build;
diff --git a/aegisub/build/standard-settings.props b/aegisub/build/standard-settings.props
index 2071ddfb8..3ecb76c29 100644
--- a/aegisub/build/standard-settings.props
+++ b/aegisub/build/standard-settings.props
@@ -17,7 +17,7 @@
 			<MinimalRebuild>false</MinimalRebuild>
 			<WarningLevel>Level3</WarningLevel>
 			<PreprocessorDefinitions>WIN32;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-			<AdditionalIncludeDirectories>$(AegisubSourceBase)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<AdditionalIncludeDirectories>$(AegisubSourceBase)src\msvc;$(AegisubSourceBase)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 		</ClCompile>
 		<Link>
 			<SubSystem>Windows</SubSystem>
diff --git a/aegisub/build/tasks.props b/aegisub/build/tasks.props
index eb63665d7..0925644ce 100644
--- a/aegisub/build/tasks.props
+++ b/aegisub/build/tasks.props
@@ -10,7 +10,7 @@
       <CPP>cl -E</CPP>
       <CFLAGS>-nologo</CFLAGS>
       <PATH>$(MsysBasePath)\bin;$(NativeExecutablePath)</PATH>
-      <INCLUDE>$(MSBuildProjectDirectory);$(AegisubSourceBase)\include;$(IncludePath)</INCLUDE>
+      <INCLUDE>$(MSBuildProjectDirectory);$(AegisubSourceBase)\src\msvc;$(AegisubSourceBase)\include;$(IncludePath)</INCLUDE>
       <LIB>$(AegisubLibraryDir);$(LibraryPath)</LIB>
       <Configuration>$(Configuration)</Configuration>
       <Platform>$(Platform)</Platform>