From 07adb5c84e78605be2f7079fc3f14be42de11665 Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Fri, 1 Feb 2013 07:19:54 -0800
Subject: [PATCH] Build boost.regex with ICU support

---
 aegisub/build/Aegisub/standard-libraries.props | 18 ++++++++++++++++--
 aegisub/build/boost/boost.vcxproj              |  1 +
 aegisub/build/boost/boost.vcxproj.filters      |  3 +++
 aegisub/build/standard-settings.props          |  2 ++
 4 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/aegisub/build/Aegisub/standard-libraries.props b/aegisub/build/Aegisub/standard-libraries.props
index 475d22c47..3496179c9 100644
--- a/aegisub/build/Aegisub/standard-libraries.props
+++ b/aegisub/build/Aegisub/standard-libraries.props
@@ -7,8 +7,22 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <Link>
-      <AdditionalDependencies>Vfw32.lib;comctl32.lib;rpcrt4.lib;winmm.lib;advapi32.lib;wsock32.lib;opengl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>
+        Vfw32.lib;
+        comctl32.lib;
+        rpcrt4.lib;
+        winmm.lib;
+        advapi32.lib;
+        wsock32.lib;
+        opengl32.lib;
+        sicudtd.lib;
+        sicuind.lib;
+        sicutestd.lib;
+        sicutud.lib;
+        sicuucd.lib;
+        %(AdditionalDependencies)
+      </AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/aegisub/build/boost/boost.vcxproj b/aegisub/build/boost/boost.vcxproj
index cb9766c7a..b77bdfb82 100644
--- a/aegisub/build/boost/boost.vcxproj
+++ b/aegisub/build/boost/boost.vcxproj
@@ -39,6 +39,7 @@
     <ClCompile Include="$(BoostPath)\libs\filesystem\src\utf8_codecvt_facet.cpp" />
     <ClCompile Include="$(BoostPath)\libs\filesystem\src\windows_file_codecvt.cpp" />
     <ClCompile Include="$(BoostPath)\libs\system\src\error_code.cpp" />
+    <ClCompile Include="$(BoostPath)\libs\regex\src\icu.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="$(BoostPath)\libs\regex\src\internals.hpp" />
diff --git a/aegisub/build/boost/boost.vcxproj.filters b/aegisub/build/boost/boost.vcxproj.filters
index 3b0994005..aeee1e3bc 100644
--- a/aegisub/build/boost/boost.vcxproj.filters
+++ b/aegisub/build/boost/boost.vcxproj.filters
@@ -84,6 +84,9 @@
     <ClCompile Include="$(BoostPath)\libs\filesystem\src\windows_file_codecvt.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
+    <ClCompile Include="$(BoostPath)\libs\regex\src\icu.cpp">
+      <Filter>regex</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="$(BoostPath)\libs\regex\src\internals.hpp">
diff --git a/aegisub/build/standard-settings.props b/aegisub/build/standard-settings.props
index c82aa3079..290e24bd6 100644
--- a/aegisub/build/standard-settings.props
+++ b/aegisub/build/standard-settings.props
@@ -18,6 +18,8 @@
 			<WarningLevel>Level3</WarningLevel>
 			<PreprocessorDefinitions>
 				BOOST_ALL_NO_LIB;
+				BOOST_HAS_ICU;
+				U_STATIC_IMPLEMENTATION;
 				WIN32;
 				_WINDOWS;
 				%(PreprocessorDefinitions)</PreprocessorDefinitions>