diff --git a/build/ffms2/ffms2.vcxproj b/build/ffms2/ffms2.vcxproj
index 7b3759d88..df3c2c514 100644
--- a/build/ffms2/ffms2.vcxproj
+++ b/build/ffms2/ffms2.vcxproj
@@ -56,7 +56,9 @@
+
+
@@ -66,13 +68,15 @@
+
-
+
+
@@ -85,15 +89,19 @@
+
+
+
-
+
+
diff --git a/build/ffms2/ffms2.vcxproj.filters b/build/ffms2/ffms2.vcxproj.filters
index fc32f56df..82b4bd274 100644
--- a/build/ffms2/ffms2.vcxproj.filters
+++ b/build/ffms2/ffms2.vcxproj.filters
@@ -75,9 +75,6 @@
Utils
-
- Utils
-
Utils
@@ -108,6 +105,21 @@
VapourSynth
+
+ Utils
+
+
+ Utils
+
+
+ Utils
+
+
+ Utils
+
+
+ Indexing
+
@@ -140,9 +152,6 @@
Utils
-
- Utils
-
Utils
@@ -173,5 +182,20 @@
VapourSynth
+
+ Utils
+
+
+ Utils
+
+
+ Utils
+
+
+ Utils
+
+
+ Indexing
+
-
+
\ No newline at end of file
diff --git a/build/fontconfig/fontconfig.vcxproj b/build/fontconfig/fontconfig.vcxproj
index 1afc3cd04..4a8b4a77f 100644
--- a/build/fontconfig/fontconfig.vcxproj
+++ b/build/fontconfig/fontconfig.vcxproj
@@ -36,37 +36,49 @@
-
+
-
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/build/fontconfig/fontconfig.vcxproj.filters b/build/fontconfig/fontconfig.vcxproj.filters
index e65bdc6e4..64034691c 100644
--- a/build/fontconfig/fontconfig.vcxproj.filters
+++ b/build/fontconfig/fontconfig.vcxproj.filters
@@ -38,9 +38,6 @@
Source Files
-
- Source Files
-
Source Files
@@ -83,14 +80,23 @@
Source Files
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
-
- Header Files
-
-
- Header Files
-
Header Files
@@ -103,5 +109,38 @@
Header Files
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
-
\ No newline at end of file
+
diff --git a/build/freetype2/freetype.vcxproj b/build/freetype2/freetype.vcxproj
index 08e5a27b5..262bf2568 100644
--- a/build/freetype2/freetype.vcxproj
+++ b/build/freetype2/freetype.vcxproj
@@ -30,22 +30,18 @@
-
-
- freetype\
+
+
+ config\
-
- freetype\config\
+
+ internal\
-
- freetype\internal\
-
-
- freetype\internal\services\
+
+ internal\services\
-
diff --git a/build/freetype2/freetype.vcxproj.filters b/build/freetype2/freetype.vcxproj.filters
index 74967e6a0..011706d51 100644
--- a/build/freetype2/freetype.vcxproj.filters
+++ b/build/freetype2/freetype.vcxproj.filters
@@ -14,9 +14,6 @@
-
- Source Files
-
Source Files
diff --git a/build/wx/setup-installed.h b/build/wx/setup-installed.h
index 76f6d4070..8738df286 100644
--- a/build/wx/setup-installed.h
+++ b/build/wx/setup-installed.h
@@ -30,20 +30,13 @@
#pragma comment(lib, wxWX_LIB_NAME("base", ""))
#pragma comment(lib, wxBASE_LIB_NAME("net"))
#pragma comment(lib, wxBASE_LIB_NAME("xml"))
-#pragma comment(lib, wx3RD_PARTY_LIB_NAME_U("regex"))
#pragma comment(lib, wx3RD_PARTY_LIB_NAME("expat"))
-#pragma comment(lib, wx3RD_PARTY_LIB_NAME("jpeg"))
#pragma comment(lib, wx3RD_PARTY_LIB_NAME("png"))
-#pragma comment(lib, wx3RD_PARTY_LIB_NAME("tiff"))
#pragma comment(lib, wx3RD_PARTY_LIB_NAME("zlib"))
#pragma comment(lib, wxMSW_LIB_NAME("core"))
#pragma comment(lib, wxMSW_LIB_NAME("adv"))
-#pragma comment(lib, wxMSW_LIB_NAME("html"))
#pragma comment(lib, wxMSW_LIB_NAME("gl"))
#pragma comment(lib, wxMSW_LIB_NAME("qa"))
-#pragma comment(lib, wxMSW_LIB_NAME("propgrid"))
-#pragma comment(lib, wxMSW_LIB_NAME("ribbon"))
-#pragma comment(lib, wxMSW_LIB_NAME("richtext"))
#pragma comment(lib, wxMSW_LIB_NAME("stc"))
#pragma comment(lib, wx3RD_PARTY_LIB_NAME("scintilla"))
#pragma comment(lib, "kernel32")
diff --git a/build/wx/wxWidgets.vcxproj b/build/wx/wxWidgets.vcxproj
index de17c9d02..5fd8eb575 100644
--- a/build/wx/wxWidgets.vcxproj
+++ b/build/wx/wxWidgets.vcxproj
@@ -16,7 +16,7 @@
X64
debug
release
- LIBDIRNAME=$(AegisubLibraryDir) OBJS=$(AegisubObjectDir) SHARED=0 UNICODE=0 USE_OPENGL=1 VENDOR=aegisub TARGET_CPU=$(WxTargetCpu) BUILD=$(WxBuild)
+ LIBDIRNAME=$(AegisubLibraryDir) OBJS=$(AegisubObjectDir) SHARED=0 UNICODE=0 USE_OPENGL=1 USE_WEBVIEW=0 USE_HTML=0 USE_MEDIA=0 USE_XRC=0 USE_AUI=0 USE_RIBBON=0 USE_PROPGRID=0 USE_RICHTEXT=0 USE_CAIRO=0 VENDOR=aegisub TARGET_CPU=$(WxTargetCpu) BUILD=$(WxBuild)
d
diff --git a/vendor/boost b/vendor/boost
index f866ff6fe..614aac8fe 160000
--- a/vendor/boost
+++ b/vendor/boost
@@ -1 +1 @@
-Subproject commit f866ff6fea187a5c9ad80895f078dec577cdc304
+Subproject commit 614aac8fef2a0551610f72e5c4a61085c8c06e35
diff --git a/vendor/ffmpeg b/vendor/ffmpeg
index f29cdbe1b..05d7059ac 160000
--- a/vendor/ffmpeg
+++ b/vendor/ffmpeg
@@ -1 +1 @@
-Subproject commit f29cdbe1b59a0d997733b507041e15ec68cef00c
+Subproject commit 05d7059ac6b640796001bf347d309a40a4fd4a12
diff --git a/vendor/ffms2 b/vendor/ffms2
index 57ae96282..1a7fc3f60 160000
--- a/vendor/ffms2
+++ b/vendor/ffms2
@@ -1 +1 @@
-Subproject commit 57ae96282eafec99153037423c33ebd29b40171a
+Subproject commit 1a7fc3f6083286da59dfaf8915e4bf543aa4bd37
diff --git a/vendor/fontconfig b/vendor/fontconfig
index b16b9f0b5..6c22e896d 160000
--- a/vendor/fontconfig
+++ b/vendor/fontconfig
@@ -1 +1 @@
-Subproject commit b16b9f0b51fcb3a96dbf81898cc5b0fa98937f7f
+Subproject commit 6c22e896d4593e6f28ab2ab7f3c6b8f0b0df7857
diff --git a/vendor/freetype2 b/vendor/freetype2
index 52381c14e..ed372b712 160000
--- a/vendor/freetype2
+++ b/vendor/freetype2
@@ -1 +1 @@
-Subproject commit 52381c14e3a30a5597060894d9f049420a2f3ac0
+Subproject commit ed372b712fa698da24c21746135f2c2c8d738c6e
diff --git a/vendor/fribidi b/vendor/fribidi
index c1d48ee98..77f7f6c0b 160000
--- a/vendor/fribidi
+++ b/vendor/fribidi
@@ -1 +1 @@
-Subproject commit c1d48ee98b3d254a6b943851665b83cdd76f6150
+Subproject commit 77f7f6c0bb16b89eac1e3b3d264f49b2ee02de3e
diff --git a/vendor/googletest b/vendor/googletest
index b3d0b4ea4..cc0116f14 160000
--- a/vendor/googletest
+++ b/vendor/googletest
@@ -1 +1 @@
-Subproject commit b3d0b4ea4ab877a355e79dd0de704577811fff0f
+Subproject commit cc0116f14aa8ad9ab76226d082a96b1005221816
diff --git a/vendor/libass b/vendor/libass
index de3f0e757..d8fc873c0 160000
--- a/vendor/libass
+++ b/vendor/libass
@@ -1 +1 @@
-Subproject commit de3f0e7572fb927d10857d4177ef58be2c9b3dbc
+Subproject commit d8fc873c07eed4666ceb04febf1e84cab8a4ac63
diff --git a/vendor/wxWidgets b/vendor/wxWidgets
index f2bbf083c..37dd8f5b7 160000
--- a/vendor/wxWidgets
+++ b/vendor/wxWidgets
@@ -1 +1 @@
-Subproject commit f2bbf083c63bd10e08f35ffd21cfa2864028fae8
+Subproject commit 37dd8f5b7b9bbc34f892f3579779c27509988c4e