Reorganise the property sheet includes to use a master include, and use properties to control inclusion of wxWidgets and Freetype, and any further deps.

Originally committed to SVN as r5174.

aegisub/build/msbuild/aegisub.props

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+	<PropertyGroup>
+		<_PropertySheetDisplayName>Aegisub project</_PropertySheetDisplayName>
+	</PropertyGroup>
+	
+	<ImportGroup Label="PropertySheets">
+		<Import Project="$(MSBuildThisFileDirectory)userconfig\*.props" />
+		<Import Project="$(MSBuildThisFileDirectory)paths.props" />
+		<Import Project="$(MSBuildThisFileDirectory)standard-settings.props" />
+		<Import Project="$(MSBuildThisFileDirectory)standard-outdirs.props" />
+		<Import Project="$(MSBuildThisFileDirectory)ft2.props" Condition="'$(AegisubUseFreetype)' == 'true'" />
+		<Import Project="$(MSBuildThisFileDirectory)wx.props" Condition="'$(AegisubUseWxWidgets)' == 'true'" />
+	</ImportGroup>
+</Project>

aegisub/build/msbuild/hunspell/hunspell.vcxproj

@@ -38,12 +38,8 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <!-- External property sheets -->
   <ImportGroup Label="PropertySheets">
-    <Import Project="$(MSBuildThisFileDirectory)..\userconfig\*.props" Label="User configuration" />
+    <Import Project="$(MSBuildThisFileDirectory)..\aegisub.props" />
-    <Import Project="$(MSBuildThisFileDirectory)..\paths.props" Label="Standard paths" />
-    <Import Project="$(MSBuildThisFileDirectory)..\standard-settings.props" Label="Standard compiler settings" />
-    <Import Project="$(MSBuildThisFileDirectory)..\standard-outdirs.props" Label="Standard output directories" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros">
     <SrcDir>..\..\..\..\contrib\hunspell\src\</SrcDir>

aegisub/build/msbuild/libaegisub/libaegisub.vcxproj

@@ -38,10 +38,7 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="PropertySheets">
-    <Import Project="$(MSBuildThisFileDirectory)..\userconfig\*.props" Label="User configuration" />
+    <Import Project="$(MSBuildThisFileDirectory)..\aegisub.props" />
-    <Import Project="$(MSBuildThisFileDirectory)..\paths.props" Label="Standard paths" />
-    <Import Project="$(MSBuildThisFileDirectory)..\standard-settings.props" Label="Standard compiler settings" />
-    <Import Project="$(MSBuildThisFileDirectory)..\standard-outdirs.props" Label="Standard output directories" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros">
     <SrcDir>..\..\..\libaegisub\</SrcDir>

aegisub/build/msbuild/libiconv/libiconv.vcxproj

@@ -38,10 +38,7 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="PropertySheets">
-    <Import Project="$(MSBuildThisFileDirectory)..\userconfig\*.props" Label="User configuration" />
+    <Import Project="$(MSBuildThisFileDirectory)..\aegisub.props" />
-    <Import Project="$(MSBuildThisFileDirectory)..\paths.props" Label="Standard paths" />
-    <Import Project="$(MSBuildThisFileDirectory)..\standard-settings.props" Label="Standard compiler settings" />
-    <Import Project="$(MSBuildThisFileDirectory)..\standard-outdirs.props" Label="Standard output directories" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros">
     <SrcDir>..\..\..\..\contrib\iconv\</SrcDir>

aegisub/build/msbuild/lua51/lua51.vcxproj

@@ -38,12 +38,8 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <!-- External property sheets -->
   <ImportGroup Label="PropertySheets">
-    <Import Project="$(MSBuildThisFileDirectory)..\userconfig\*.props" Label="User configuration" />
+    <Import Project="$(MSBuildThisFileDirectory)..\aegisub.props" />
-    <Import Project="$(MSBuildThisFileDirectory)..\paths.props" Label="Standard paths" />
-    <Import Project="$(MSBuildThisFileDirectory)..\standard-settings.props" Label="Standard compiler settings" />
-    <Import Project="$(MSBuildThisFileDirectory)..\standard-outdirs.props" Label="Standard output directories" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros">
 	<SrcDir>..\..\..\..\contrib\lua51\src\</SrcDir>

aegisub/build/msbuild/paths.props

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<PropertyGroup>
-		<_PropertySheetDisplayName>Aegisub build path definitions</_PropertySheetDisplayName>
+		<_PropertySheetDisplayName>Path definitions</_PropertySheetDisplayName>
 	</PropertyGroup>
 	
 	<PropertyGroup>

aegisub/build/msbuild/standard-outdirs.props

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<PropertyGroup>
-		<_PropertySheetDisplayName>Aegisub build output directories</_PropertySheetDisplayName>
+		<_PropertySheetDisplayName>Output directories</_PropertySheetDisplayName>
 	</PropertyGroup>
 
 	<PropertyGroup>

aegisub/build/msbuild/standard-settings.props

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<PropertyGroup>
-		<_PropertySheetDisplayName>Aegisub build compiler settings</_PropertySheetDisplayName>
+		<_PropertySheetDisplayName>Compiler settings</_PropertySheetDisplayName>
 	</PropertyGroup>
 
 	<PropertyGroup Condition="'$(Configuration)'=='Debug'">