diff --git a/Aegisub.sln b/Aegisub.sln
index a5730fb74..7a20fabea 100644
--- a/Aegisub.sln
+++ b/Aegisub.sln
@@ -68,6 +68,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libass", "aegisub\build\lib
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PortableInstaller", "aegisub\build\PortableInstaller\PortableInstaller.vcxproj", "{5B0E9978-E76F-4BBC-8194-228323F59B53}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boost", "aegisub\build\boost\boost.vcxproj", "{A649D828-A399-4D81-ADEF-94CFDBA7847F}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -284,6 +286,14 @@ Global
{5B0E9978-E76F-4BBC-8194-228323F59B53}.Debug-MinDep|x64.ActiveCfg = Debug|x64
{5B0E9978-E76F-4BBC-8194-228323F59B53}.Release|Win32.ActiveCfg = Release|Win32
{5B0E9978-E76F-4BBC-8194-228323F59B53}.Release|x64.ActiveCfg = Release|x64
+ {A649D828-A399-4D81-ADEF-94CFDBA7847F}.Debug|Win32.ActiveCfg = Debug|Win32
+ {A649D828-A399-4D81-ADEF-94CFDBA7847F}.Debug|Win32.Build.0 = Debug|Win32
+ {A649D828-A399-4D81-ADEF-94CFDBA7847F}.Debug|x64.ActiveCfg = Debug|Win32
+ {A649D828-A399-4D81-ADEF-94CFDBA7847F}.Debug-MinDep|Win32.ActiveCfg = Debug|Win32
+ {A649D828-A399-4D81-ADEF-94CFDBA7847F}.Debug-MinDep|x64.ActiveCfg = Debug|Win32
+ {A649D828-A399-4D81-ADEF-94CFDBA7847F}.Release|Win32.ActiveCfg = Release|Win32
+ {A649D828-A399-4D81-ADEF-94CFDBA7847F}.Release|Win32.Build.0 = Release|Win32
+ {A649D828-A399-4D81-ADEF-94CFDBA7847F}.Release|x64.ActiveCfg = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/aegisub/Makefile.inc.in b/aegisub/Makefile.inc.in
index 86958b4c5..68b5fa254 100644
--- a/aegisub/Makefile.inc.in
+++ b/aegisub/Makefile.inc.in
@@ -76,6 +76,7 @@ CPPFLAGS_WX = @WX_CPPFLAGS@
LIBS_WX = @WX_LIBS@ -lz
CPPFLAGS_BOOST = @BOOST_CPPFLAGS@
+LIBS_BOOST = @BOOST_FILESYSTEM_LDFLAGS@ @BOOST_FILESYSTEM_LIBS@ @BOOST_REGEX_LDFLAGS@ @BOOST_REGEX_LIBS@ @BOOST_SYSTEM_LDFLAGS@ @BOOST_SYSTEM_LIBS@
CFLAGS_FFMS2 = @FFMS2_CFLAGS@
CFLAGS_FFTW3 = @FFTW3_CFLAGS@
diff --git a/aegisub/build/Aegisub/Aegisub.vcxproj b/aegisub/build/Aegisub/Aegisub.vcxproj
index 77582ab91..3c80048e3 100644
--- a/aegisub/build/Aegisub/Aegisub.vcxproj
+++ b/aegisub/build/Aegisub/Aegisub.vcxproj
@@ -5,6 +5,7 @@
{9DDDB9E5-E4A1-423D-A224-F6D4E5AAC06A}
Aegisub
+
exe
@@ -13,6 +14,7 @@
+
aegisub$(AegisubPlatformSuffix)
@@ -25,6 +27,7 @@
/Zm150 %(AdditionalOptions)
+
+
+
+ {a649d828-a399-4d81-adef-94cfdba7847f}
+
{c832eaf3-860d-4373-a02c-933626b47a5e}
@@ -75,6 +82,7 @@
{7b56955d-5162-4698-aa5b-47484edc8783}
+
diff --git a/aegisub/build/boost/boost.vcxproj b/aegisub/build/boost/boost.vcxproj
new file mode 100644
index 000000000..cb9766c7a
--- /dev/null
+++ b/aegisub/build/boost/boost.vcxproj
@@ -0,0 +1,48 @@
+
+
+
+ {A649D828-A399-4D81-ADEF-94CFDBA7847F}
+ boost
+
+
+
+
+ lib
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/aegisub/build/boost/boost.vcxproj.filters b/aegisub/build/boost/boost.vcxproj.filters
new file mode 100644
index 000000000..3b0994005
--- /dev/null
+++ b/aegisub/build/boost/boost.vcxproj.filters
@@ -0,0 +1,99 @@
+
+
+
+
+ {e091980d-4374-41b8-aa61-1b07695e1b17}
+
+
+ {be9f03e9-74a3-4705-97ee-105a404d8a10}
+
+
+ {98abe5b9-aca6-4145-ab6d-e472e24eb522}
+
+
+
+
+ regex
+
+
+ regex
+
+
+ regex
+
+
+ regex
+
+
+ regex
+
+
+ regex
+
+
+ regex
+
+
+ regex
+
+
+ regex
+
+
+ regex
+
+
+ regex
+
+
+ regex
+
+
+ regex
+
+
+ regex
+
+
+ regex
+
+
+ system
+
+
+ filesystem
+
+
+ filesystem
+
+
+ filesystem
+
+
+ filesystem
+
+
+ filesystem
+
+
+ filesystem
+
+
+ filesystem
+
+
+ filesystem
+
+
+
+
+ regex
+
+
+ system
+
+
+ filesystem
+
+
+
diff --git a/aegisub/build/libaegisub/libaegisub.vcxproj b/aegisub/build/libaegisub/libaegisub.vcxproj
index b3320eb66..837691411 100644
--- a/aegisub/build/libaegisub/libaegisub.vcxproj
+++ b/aegisub/build/libaegisub/libaegisub.vcxproj
@@ -4,6 +4,7 @@
{BB3FED86-DB7A-4DC7-964A-260FB86CDE61}
libaegisub
+
lib
@@ -12,6 +13,7 @@
+
@@ -22,6 +24,7 @@
lagi_pre.h
+
diff --git a/aegisub/build/standard-settings.props b/aegisub/build/standard-settings.props
index a34349686..5998f4617 100644
--- a/aegisub/build/standard-settings.props
+++ b/aegisub/build/standard-settings.props
@@ -16,7 +16,11 @@
true
false
Level3
- WIN32;_WINDOWS;%(PreprocessorDefinitions)
+
+ BOOST_ALL_NO_LIB;
+ WIN32;
+ _WINDOWS;
+ %(PreprocessorDefinitions)
$(AegisubSourceBase)src\msvc;
$(AegisubSourceBase)\include;
diff --git a/aegisub/configure.ac b/aegisub/configure.ac
index 36f0f5089..1ee33c2c1 100644
--- a/aegisub/configure.ac
+++ b/aegisub/configure.ac
@@ -245,7 +245,10 @@ PKG_CHECK_MODULES(FONTCONFIG, fontconfig >= fontconfig_required_version,
[AC_DEFINE(WITH_FONTCONFIG, 1, [Enable FontConfig support.])],
[AC_MSG_FAILURE([Aegisub requires fontconfig >= fontconfig_required_version])])
+libext=a
BOOST_REQUIRE([boost_required_version])
+BOOST_FILESYSTEM
+BOOST_REGEX
########
## iconv
diff --git a/aegisub/libaegisub/Makefile b/aegisub/libaegisub/Makefile
index 9e46d425b..20d6e8ae9 100644
--- a/aegisub/libaegisub/Makefile
+++ b/aegisub/libaegisub/Makefile
@@ -3,6 +3,7 @@ include ../Makefile.inc
LIB = libaegisub.a
CXXFLAGS += -Iinclude -I../src -I.. -DLAGI -fPIC -Wno-variadic-macros
+CPPFLAGS += $(CPPFLAGS_BOOST)
PRECOMPILED_HEADER_NAME = lagi_pre.h
lagi_pre.h.gch: CXXFLAGS := $(CXXFLAGS)
diff --git a/aegisub/m4macros/boost.m4 b/aegisub/m4macros/boost.m4
index 3d4e47ceb..e077acb12 100644
--- a/aegisub/m4macros/boost.m4
+++ b/aegisub/m4macros/boost.m4
@@ -403,7 +403,7 @@ dnl generated only once above (before we start the for loops).
LDFLAGS=$boost_save_LDFLAGS
LIBS=$boost_save_LIBS
if test x"$Boost_lib" = xyes; then
- Boost_lib_LDFLAGS="-L$boost_ldpath -Wl,-R$boost_ldpath"
+ Boost_lib_LDFLAGS="-L$boost_ldpath"
Boost_lib_LDPATH="$boost_ldpath"
break 6
else
diff --git a/aegisub/src/Makefile b/aegisub/src/Makefile
index 362ba9cf9..ad9f0d5ac 100644
--- a/aegisub/src/Makefile
+++ b/aegisub/src/Makefile
@@ -14,7 +14,7 @@ LIBS := -L../libaegisub -laegisub $(LIBS)
LIBS += $(LIBS_CCMALLOC) $(LIBS_EFENCE) $(LIBS_GL)
LIBS += $(LIBS_PTHREAD) $(LIBS_WX) $(LIBS_FREETYPE)
LIBS += $(LIBS_FONTCONFIG) $(LIBS_FFTW3)
-LIBS += $(LIBS_UCHARDET)
+LIBS += $(LIBS_UCHARDET) $(LIBS_BOOST)
LDFLAGS += $(LDFLAGS_CCMALLOC)