diff --git a/aegisub/build/msbuild/ft2.props b/aegisub/build/msbuild/ft2.props
index 07ee577d8..e381ced25 100644
--- a/aegisub/build/msbuild/ft2.props
+++ b/aegisub/build/msbuild/ft2.props
@@ -1,13 +1,17 @@
-
-
- $(Ft2IncludePath);$(IncludePath)
- $(Ft2LibraryPath);$(LibraryPath)
-
-
-
- $(Ft2LibraryName);%(AdditionalDependencies)
-
-
+
+ <_PropertySheetDisplayName>Freetype 2 support
+
+
+
+
+ $(Ft2IncludePath);$(IncludePath)
+ $(Ft2LibraryPath);$(LibraryPath)
+
+
+
+ $(Ft2LibraryName);%(AdditionalDependencies)
+
+
diff --git a/aegisub/build/msbuild/paths.props b/aegisub/build/msbuild/paths.props
index f449e0ea8..3558268f5 100644
--- a/aegisub/build/msbuild/paths.props
+++ b/aegisub/build/msbuild/paths.props
@@ -1,5 +1,9 @@
+
+ <_PropertySheetDisplayName>Aegisub build path definitions
+
+
$(MSBuildThisFileDirectory)..\..\
diff --git a/aegisub/build/msbuild/standard-outdirs.props b/aegisub/build/msbuild/standard-outdirs.props
index c2786297e..a42b73e6c 100644
--- a/aegisub/build/msbuild/standard-outdirs.props
+++ b/aegisub/build/msbuild/standard-outdirs.props
@@ -1,25 +1,29 @@
-
- $(AegisubBinaryDir)
- $(AegisubBinaryDir)
- $(AegisubLibraryDir)
- $(AegisubObjectDir)
- $(ProjectName)_$(AegisubPlatformSuffix)
- $(ProjectName)_$(AegisubPlatformSuffix)
- $(ProjectName)
-
-
-
- $(IntDir)
-
-
- $(AegisubBinaryDir)$(TargetName)$(TargetExt)
- $(AegisubBinaryDir)$(TargetName).pdb
- $(AegisubLibraryDir)$(ProjectName).lib
-
-
- $(AegisubLibraryDir)$(ProjectName).lib
-
-
+
+ <_PropertySheetDisplayName>Aegisub build output directories
+
+
+
+ $(AegisubBinaryDir)
+ $(AegisubBinaryDir)
+ $(AegisubLibraryDir)
+ $(AegisubObjectDir)
+ $(ProjectName)_$(AegisubPlatformSuffix)
+ $(ProjectName)_$(AegisubPlatformSuffix)
+ $(ProjectName)
+
+
+
+ $(IntDir)
+
+
+ $(AegisubBinaryDir)$(TargetName)$(TargetExt)
+ $(AegisubBinaryDir)$(TargetName).pdb
+ $(AegisubLibraryDir)$(ProjectName).lib
+
+
+ $(AegisubLibraryDir)$(ProjectName).lib
+
+
\ No newline at end of file
diff --git a/aegisub/build/msbuild/standard-settings.props b/aegisub/build/msbuild/standard-settings.props
index 7a0b68c04..73c2bb0e5 100644
--- a/aegisub/build/msbuild/standard-settings.props
+++ b/aegisub/build/msbuild/standard-settings.props
@@ -1,47 +1,51 @@
-
- true
-
-
- false
-
+
+ <_PropertySheetDisplayName>Aegisub build compiler settings
+
-
-
- true
- false
- Level3
- WIN32;_WINDOWS;%(PreprocessorDefinitions)
-
-
- Windows
- true
- true
- true
-
-
+
+ true
+
+
+ false
+
-
-
- MultiThreadedDebugDLL
- Disabled
- _DEBUG;%(PreprocessorDefinitions)
-
-
+
+
+ true
+ false
+ Level3
+ WIN32;_WINDOWS;%(PreprocessorDefinitions)
+
+
+ Windows
+ true
+ true
+ true
+
+
+
+
+
+ MultiThreadedDebugDLL
+ Disabled
+ _DEBUG;%(PreprocessorDefinitions)
+
+
+
+
+
+ MultiThreadedDLL
+ MaxSpeed
+ true
+ true
+ NDEBUG;%(PreprocessorDefinitions)
+
+
+ true
+ true
+
+
-
-
- MultiThreadedDLL
- MaxSpeed
- true
- true
- NDEBUG;%(PreprocessorDefinitions)
-
-
- true
- true
-
-
-
\ No newline at end of file
diff --git a/aegisub/build/msbuild/userconfig/ft2.props.sample b/aegisub/build/msbuild/userconfig/ft2.props.sample
new file mode 100644
index 000000000..d3cbf25c7
--- /dev/null
+++ b/aegisub/build/msbuild/userconfig/ft2.props.sample
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+ C:\Dev\freetype-2.4.3\include
+
+ C:\Dev\freetype-2.4.3\objs\win32\vc2010
+
+ freetype2.4.3_32d.lib
+ freetype2.4.3_32.lib
+ freetype2.4.3_64d.lib
+ freetype2.4.3_64.lib
+
+
\ No newline at end of file
diff --git a/aegisub/build/msbuild/userconfig/paths.props.sample b/aegisub/build/msbuild/userconfig/paths.props.sample
new file mode 100644
index 000000000..0ac248e12
--- /dev/null
+++ b/aegisub/build/msbuild/userconfig/paths.props.sample
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
+ C:\Dev\Aegisub\BuildFiles\
+
+ C:\Dev\Aegisub\BuiltBinaries\$(Platform)\
+
+
\ No newline at end of file
diff --git a/aegisub/build/msbuild/userconfig/readme.txt b/aegisub/build/msbuild/userconfig/readme.txt
index e9a7a80ac..58e634860 100644
--- a/aegisub/build/msbuild/userconfig/readme.txt
+++ b/aegisub/build/msbuild/userconfig/readme.txt
@@ -1,44 +1,12 @@
You can put MSBuild property files in this folder to override the default
build configuration for Aegisub's build system.
-There is one configuration you almost guaranteed will want to override,
-this is for the location of wxWidgets. Here is an example of a property
-file that specifies a wxWidgets location:
-
--------------- mywx.props --------------
-
-
-
-
- G:\Dev\wxWidgets-2.9\install-vc10
-
- $(WxBasePath)\lib32
- $(WxBasePath)\lib64
-
- $(WxBasePath)\include
-
-
-----------------------------------------
+A number of sample files are provided. These can be copied and used as
+templates for common configuration. Importantly, configuring the location
+of several library dependencies.
+The copied sample files should be renamed to *.props, otherwise they will
+not be found by the build system.
You should not check files placed in this folder into source control.
-Files must be named *.props to be used.
-
-
-Other properties of interest:
-
-Ft2IncludePath - Path to Freetype2 include files
-Ft2LibraryPath - Path to Freetype2 lib files
-Ft2LibraryName - Name of Freetype2 library to link
-
-
-These may be useful to override in some cases, but the defaults should be fine for most:
-
-AegisubOutputBase - Base directory for output files from compilation, defaults to solution file location
-AegisubBinaryDir - Where executables are placed, derived from AegisubOutputBase by default
-AegisubLibraryDir - Where lib files are placed, derived from AegisubOutputBase by default
-AegisubObjectDir - Where intermediary files are placed, derived from AegisubOutputBase by default
+Files must be named *.props to be found by the build system.
diff --git a/aegisub/build/msbuild/userconfig/wx.props.sample b/aegisub/build/msbuild/userconfig/wx.props.sample
new file mode 100644
index 000000000..780ad2e96
--- /dev/null
+++ b/aegisub/build/msbuild/userconfig/wx.props.sample
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+ C:\Dev\wxWidgets-2.9\install-vc10
+
+ $(WxBasePath)\lib32
+ $(WxBasePath)\lib64
+
+ $(WxBasePath)\include
+
+
\ No newline at end of file
diff --git a/aegisub/build/msbuild/wx.props b/aegisub/build/msbuild/wx.props
index 33790dfb9..76dc5a9b6 100644
--- a/aegisub/build/msbuild/wx.props
+++ b/aegisub/build/msbuild/wx.props
@@ -1,37 +1,39 @@
-
-
- d
-
- wxbase29u$(WxLibDbgSuffix)
- wxmsw29u$(WxLibDbgSuffix)
-
-
-
-
- $(WxLibraryPath)\mswu$(WxLibDbgSuffix)\;$(WxIncludePath);$(IncludePath)
- $(WxLibraryPath);$(LibraryPath)
-
-
-
-
-
-
- $(WxLibBase).lib;
- $(WxLibBase)_net.lib;
- $(WxLibBase)_xml.lib;
- $(WxLibMsw)_core.lib;
- $(WxLibMsw)_adv.lib;
- $(WxLibMsw)_gl.lib;
- $(WxLibMsw)_stc.lib;
- wxscintilla$(WxLibDbgSuffix).lib;
- wxzlib$(WxLibDbgSuffix).lib;
- wxexpat$(WxLibDbgSuffix).lib;
- wxregexu$(WxLibDbgSuffix).lib;
- wxpng$(WxLibDbgSuffix).lib;
- %(AdditionalDependencies)
-
-
-
+
+ <_PropertySheetDisplayName>wxWidgets support
+
+
+
+
+ d
+
+
+
+
+
+ $(WxLibraryPath)\mswu$(WxLibDbgSuffix)\;$(WxIncludePath);$(IncludePath)
+ $(WxLibraryPath);$(LibraryPath)
+
+
+
+
+
+
+ wxbase29u$(WxLibDbgSuffix).lib;
+ wxbase29u$(WxLibDbgSuffix)_net.lib;
+ wxbase29u$(WxLibDbgSuffix)_xml.lib;
+ wxmsw29u$(WxLibDbgSuffix)_core.lib;
+ wxmsw29u$(WxLibDbgSuffix)_adv.lib;
+ wxmsw29u$(WxLibDbgSuffix)_gl.lib;
+ wxmsw29u$(WxLibDbgSuffix)_stc.lib;
+ wxscintilla$(WxLibDbgSuffix).lib;
+ wxzlib$(WxLibDbgSuffix).lib;
+ wxexpat$(WxLibDbgSuffix).lib;
+ wxregexu$(WxLibDbgSuffix).lib;
+ wxpng$(WxLibDbgSuffix).lib;
+ %(AdditionalDependencies)
+
+
+