diff --git a/aegisub/build/Aegisub/Aegisub.targets b/aegisub/build/Aegisub/Aegisub.targets
index 817b69abe..16b5a556a 100644
--- a/aegisub/build/Aegisub/Aegisub.targets
+++ b/aegisub/build/Aegisub/Aegisub.targets
@@ -88,12 +88,7 @@
WITH_LIBASS;%(PreprocessorDefinitions)
- $(LibassIncludePath);%(AdditionalIncludeDirectories)
-
- $(LibassIncludePath);%(AdditionalLibraryDirectories)
- $(LibassLibraryName);%(AdditionalDependencies)
-
@@ -114,12 +109,7 @@
WITH_FFMS2;%(PreprocessorDefinitions)
- $(FFmpegSourceIncludePath);%(AdditionalIncludeDirectories)
-
- $(FFmpegSourceLibraryPath);%(AdditionalLibraryDirectories)
- $(FFmpegSourceLibraryName);%(AdditionalDependencies)
-
diff --git a/aegisub/build/Aegisub/Aegisub.vcxproj b/aegisub/build/Aegisub/Aegisub.vcxproj
index ddd51c2d3..2c72d80a8 100644
--- a/aegisub/build/Aegisub/Aegisub.vcxproj
+++ b/aegisub/build/Aegisub/Aegisub.vcxproj
@@ -23,9 +23,6 @@
{9DDDB9E5-E4A1-423D-A224-F6D4E5AAC06A}
Aegisub
-
- v110
-
@@ -34,15 +31,11 @@
..\..\src\
-
-
-
-
aegisub$(AegisubPlatformSuffix)
@@ -55,11 +48,6 @@
-
-
-
-
-
@@ -463,4 +451,8 @@
+
+
+
+
diff --git a/aegisub/build/Aegisub/Aegisub.xml b/aegisub/build/Aegisub/Aegisub.xml
index 04fb8b0f9..bef7232cd 100644
--- a/aegisub/build/Aegisub/Aegisub.xml
+++ b/aegisub/build/Aegisub/Aegisub.xml
@@ -45,151 +45,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/aegisub/build/Aegisub/Aegisub.DefaultConfiguration.props b/aegisub/build/DefaultConfiguration.props
similarity index 85%
rename from aegisub/build/Aegisub/Aegisub.DefaultConfiguration.props
rename to aegisub/build/DefaultConfiguration.props
index a0ee6d63d..5ff3979fe 100644
--- a/aegisub/build/Aegisub/Aegisub.DefaultConfiguration.props
+++ b/aegisub/build/DefaultConfiguration.props
@@ -35,29 +35,22 @@
- true
- $(DXSDK_DIR)
+ Anonymous
true
false
- true
- $(AegisubSourceBase)libffms\include\
- $(AegisubSourceBase)libffms\lib\
- ffms2.lib
- true
- true
- false
- false
HelperLibrary
- vsfilter.lib
- false
- Anonymous
+ true
+ true
+ false
+ true
+ true
+ false
true
+ vsfilter.lib
+ $(DXSDK_DIR)
+ false
updates.aegisub.org
/trunk
$(AegisubSourceBase)wxlib
- $(WxBasePath)\lib32
- $(WxBasePath)\lib64
- $(WxBasePath)\include
-
diff --git a/aegisub/build/aegisub.props b/aegisub/build/aegisub.props
index 2f0714481..754c0f503 100644
--- a/aegisub/build/aegisub.props
+++ b/aegisub/build/aegisub.props
@@ -1,32 +1,46 @@
-
- <_PropertySheetDisplayName>Aegisub project
-
+
+ <_PropertySheetDisplayName>Aegisub project
+
-
-
-
- StaticLibrary
- DynamicLibrary
- Application
- true
- false
- true
- Unicode
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ StaticLibrary
+ DynamicLibrary
+ Application
+ true
+ false
+ true
+ Unicode
+ v110
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/aegisub/build/csrihelper/csrihelper.vcxproj b/aegisub/build/csrihelper/csrihelper.vcxproj
index 147b7fa14..bbede837e 100644
--- a/aegisub/build/csrihelper/csrihelper.vcxproj
+++ b/aegisub/build/csrihelper/csrihelper.vcxproj
@@ -23,18 +23,6 @@
{C832EAF3-860D-4373-A02C-933626B47A5E}
csrihelper
-
- v110
-
-
- v110
-
-
- v110
-
-
- v110
-
lib
diff --git a/aegisub/build/fftw/config.xml b/aegisub/build/fftw/config.xml
deleted file mode 100644
index 0f253af86..000000000
--- a/aegisub/build/fftw/config.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/aegisub/build/fftw/fftw.vcxproj b/aegisub/build/fftw/fftw.vcxproj
index bbb6261d5..9a903fa02 100644
--- a/aegisub/build/fftw/fftw.vcxproj
+++ b/aegisub/build/fftw/fftw.vcxproj
@@ -22,15 +22,9 @@
{EA3DCC95-2423-4EA0-A508-7A427B4C0594}
fftw
- v110
-
-
-
-
-
lib
diff --git a/aegisub/build/fontconfig/config.xml b/aegisub/build/fontconfig/config.xml
deleted file mode 100644
index 57de9d535..000000000
--- a/aegisub/build/fontconfig/config.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/aegisub/build/fontconfig/fontconfig.vcxproj b/aegisub/build/fontconfig/fontconfig.vcxproj
index 00a1a06f9..f9b416145 100644
--- a/aegisub/build/fontconfig/fontconfig.vcxproj
+++ b/aegisub/build/fontconfig/fontconfig.vcxproj
@@ -1,4 +1,4 @@
-
+
@@ -22,15 +22,9 @@
{AD56899E-961B-47B7-BD0F-14D0DA50D141}
fontconfig
- v110
-
-
-
-
-
lib
@@ -45,7 +39,6 @@
$(FontconfigSrcDir);
$(FontconfigSrcDir)\win32\include;
- $(AegisubSourceBase)\include;
%(AdditionalIncludeDirectories)
diff --git a/aegisub/build/freetype2/config.xml b/aegisub/build/freetype2/config.xml
deleted file mode 100644
index ecf86812c..000000000
--- a/aegisub/build/freetype2/config.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/aegisub/build/freetype2/freetype.vcxproj b/aegisub/build/freetype2/freetype.vcxproj
index 0032ea70e..8a18f0362 100644
--- a/aegisub/build/freetype2/freetype.vcxproj
+++ b/aegisub/build/freetype2/freetype.vcxproj
@@ -22,15 +22,9 @@
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}
freetype
- v110
-
-
-
-
-
lib
diff --git a/aegisub/build/hunspell/hunspell.vcxproj b/aegisub/build/hunspell/hunspell.vcxproj
index 1f5fc5fa8..b25850480 100644
--- a/aegisub/build/hunspell/hunspell.vcxproj
+++ b/aegisub/build/hunspell/hunspell.vcxproj
@@ -23,18 +23,6 @@
{CC791693-6B28-40AC-879D-64A6C16468E3}
hunspell
-
- v110
-
-
- v110
-
-
- v110
-
-
- v110
-
lib
@@ -96,4 +84,4 @@
-
\ No newline at end of file
+
diff --git a/aegisub/build/libaegisub/libaegisub.vcxproj b/aegisub/build/libaegisub/libaegisub.vcxproj
index 5600a1995..89bd68826 100644
--- a/aegisub/build/libaegisub/libaegisub.vcxproj
+++ b/aegisub/build/libaegisub/libaegisub.vcxproj
@@ -23,18 +23,6 @@
{BB3FED86-DB7A-4DC7-964A-260FB86CDE61}
libaegisub
-
- v110
-
-
- v110
-
-
- v110
-
-
- v110
-
lib
@@ -130,4 +118,4 @@
-
\ No newline at end of file
+
diff --git a/aegisub/build/libiconv/libiconv.vcxproj b/aegisub/build/libiconv/libiconv.vcxproj
index 93e68a9a9..0fe6d9076 100644
--- a/aegisub/build/libiconv/libiconv.vcxproj
+++ b/aegisub/build/libiconv/libiconv.vcxproj
@@ -23,18 +23,6 @@
{965054D2-44F2-4EB2-9879-051CC3D7EF08}
libiconv
-
- v110
-
-
- v110
-
-
- v110
-
-
- v110
-
lib
diff --git a/aegisub/build/libresrc/libresrc.vcxproj b/aegisub/build/libresrc/libresrc.vcxproj
index 5d4348226..f608f22d8 100644
--- a/aegisub/build/libresrc/libresrc.vcxproj
+++ b/aegisub/build/libresrc/libresrc.vcxproj
@@ -22,7 +22,6 @@
{BD00D65F-24DA-4784-8860-3B972EA125FC}
libresrc
- v110
@@ -31,8 +30,6 @@
true
..\..\src\libresrc\
-
-
diff --git a/aegisub/build/lua51/lua51.vcxproj b/aegisub/build/lua51/lua51.vcxproj
index e8ff6c0f2..6b1a0cd2e 100644
--- a/aegisub/build/lua51/lua51.vcxproj
+++ b/aegisub/build/lua51/lua51.vcxproj
@@ -23,18 +23,6 @@
{5391A8B1-9C70-4DC4-92AD-D3E34C6B803F}
lua51
-
- v110
-
-
- v110
-
-
- v110
-
-
- v110
-
lib
diff --git a/aegisub/build/respack/respack.vcxproj b/aegisub/build/respack/respack.vcxproj
index 9a57569cb..c1b8341df 100644
--- a/aegisub/build/respack/respack.vcxproj
+++ b/aegisub/build/respack/respack.vcxproj
@@ -28,7 +28,6 @@
$(ProjectDir)
respack$(AegisubPlatformSuffix)
- v110
diff --git a/aegisub/build/standard-settings.props b/aegisub/build/standard-settings.props
index 89556ff85..2071ddfb8 100644
--- a/aegisub/build/standard-settings.props
+++ b/aegisub/build/standard-settings.props
@@ -17,6 +17,7 @@
false
Level3
WIN32;_WINDOWS;%(PreprocessorDefinitions)
+ $(AegisubSourceBase)\include;%(AdditionalIncludeDirectories)
Windows
@@ -48,4 +49,4 @@
-
\ No newline at end of file
+
diff --git a/aegisub/build/universalchardet/universalchardet.vcxproj b/aegisub/build/universalchardet/universalchardet.vcxproj
index 797dcb28e..c12821bd5 100644
--- a/aegisub/build/universalchardet/universalchardet.vcxproj
+++ b/aegisub/build/universalchardet/universalchardet.vcxproj
@@ -23,18 +23,6 @@
{7B56955D-5162-4698-AA5B-47484EDC8783}
universalchardet
-
- v110
-
-
- v110
-
-
- v110
-
-
- v110
-
lib
diff --git a/aegisub/build/wx.props b/aegisub/build/wx.props
index dfade1373..b4ce01f5e 100644
--- a/aegisub/build/wx.props
+++ b/aegisub/build/wx.props
@@ -4,10 +4,18 @@
<_PropertySheetDisplayName>wxWidgets support
-
+
d
+
+
+ $(WxBasePath)\include
+
+
+ $(WxBasePath)\lib32
+ $(WxBasePath)\lib64