From 93444935584362916a5a99877643a655994d6824 Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Sat, 17 Nov 2012 08:50:55 -0800
Subject: [PATCH] Add boost path to configuration UI

---
 aegisub/build/Aegisub/Aegisub.xml        | 8 ++++++++
 aegisub/build/DefaultConfiguration.props | 1 +
 aegisub/build/standard-settings.props    | 7 ++++++-
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/aegisub/build/Aegisub/Aegisub.xml b/aegisub/build/Aegisub/Aegisub.xml
index 4de04a79f..00019ad05 100644
--- a/aegisub/build/Aegisub/Aegisub.xml
+++ b/aegisub/build/Aegisub/Aegisub.xml
@@ -148,6 +148,14 @@
     Description="Root directory of a copy of msys with git installed. Only required if it is not on your PATH."
     />
 
+  <StringProperty
+    Subtype="folder"
+    Name="BoostPath"
+    Category="Paths"
+    DisplayName="Boost root path"
+    Description="Location of a copy of boost."
+    />
+
   <StringProperty
     Subtype="folder"
     Name="CsriLibraryPath"
diff --git a/aegisub/build/DefaultConfiguration.props b/aegisub/build/DefaultConfiguration.props
index e73f20ae6..5ae9c14db 100644
--- a/aegisub/build/DefaultConfiguration.props
+++ b/aegisub/build/DefaultConfiguration.props
@@ -52,6 +52,7 @@
     <UpdateCheckerServer>updates.aegisub.org</UpdateCheckerServer>
     <UpdateCheckerURL>/trunk</UpdateCheckerURL>
 
+    <BoostPath>..\..\..\deps\boost</BoostPath>
     <FfmsSrcDir>..\..\..\deps\ffms2</FfmsSrcDir>
     <FfmpegSrcDir>..\..\..\deps\ffmpeg</FfmpegSrcDir>
     <FftwSrcDir>..\..\..\deps\fftw</FftwSrcDir>
diff --git a/aegisub/build/standard-settings.props b/aegisub/build/standard-settings.props
index 04e7ef728..f642461d8 100644
--- a/aegisub/build/standard-settings.props
+++ b/aegisub/build/standard-settings.props
@@ -17,7 +17,12 @@
 			<MinimalRebuild>false</MinimalRebuild>
 			<WarningLevel>Level3</WarningLevel>
 			<PreprocessorDefinitions>WIN32;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-			<AdditionalIncludeDirectories>$(AegisubSourceBase)src\msvc;$(AegisubSourceBase)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<AdditionalIncludeDirectories>
+				$(AegisubSourceBase)src\msvc;
+				$(AegisubSourceBase)\include;
+				$(BoostPath);
+				%(AdditionalIncludeDirectories)
+			</AdditionalIncludeDirectories>
 		</ClCompile>
 		<ResourceCompile>
 			<AdditionalIncludeDirectories>$(AegisubSourceBase)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>