From 3974dfd1f24354d8606a773dacfc22e680693d97 Mon Sep 17 00:00:00 2001
From: Niels Martin Hansen <nielsm@aegisub.org>
Date: Tue, 11 Jan 2011 18:15:31 +0000
Subject: [PATCH] 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               | 15 +++++++++++++++
 aegisub/build/msbuild/hunspell/hunspell.vcxproj   |  6 +-----
 .../build/msbuild/libaegisub/libaegisub.vcxproj   |  5 +----
 aegisub/build/msbuild/libiconv/libiconv.vcxproj   |  5 +----
 aegisub/build/msbuild/lua51/lua51.vcxproj         |  6 +-----
 aegisub/build/msbuild/paths.props                 |  2 +-
 aegisub/build/msbuild/standard-outdirs.props      |  2 +-
 aegisub/build/msbuild/standard-settings.props     |  2 +-
 8 files changed, 22 insertions(+), 21 deletions(-)
 create mode 100644 aegisub/build/msbuild/aegisub.props

diff --git a/aegisub/build/msbuild/aegisub.props b/aegisub/build/msbuild/aegisub.props
new file mode 100644
index 000000000..5a2d21250
--- /dev/null
+++ b/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>
\ No newline at end of file
diff --git a/aegisub/build/msbuild/hunspell/hunspell.vcxproj b/aegisub/build/msbuild/hunspell/hunspell.vcxproj
index 6aede5172..c06b53aa2 100644
--- a/aegisub/build/msbuild/hunspell/hunspell.vcxproj
+++ b/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)..\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" />
+    <Import Project="$(MSBuildThisFileDirectory)..\aegisub.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros">
     <SrcDir>..\..\..\..\contrib\hunspell\src\</SrcDir>
diff --git a/aegisub/build/msbuild/libaegisub/libaegisub.vcxproj b/aegisub/build/msbuild/libaegisub/libaegisub.vcxproj
index de1a485eb..fde5b121b 100644
--- a/aegisub/build/msbuild/libaegisub/libaegisub.vcxproj
+++ b/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)..\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" />
+    <Import Project="$(MSBuildThisFileDirectory)..\aegisub.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros">
     <SrcDir>..\..\..\libaegisub\</SrcDir>
diff --git a/aegisub/build/msbuild/libiconv/libiconv.vcxproj b/aegisub/build/msbuild/libiconv/libiconv.vcxproj
index 89f5056c7..4cad10daf 100644
--- a/aegisub/build/msbuild/libiconv/libiconv.vcxproj
+++ b/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)..\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" />
+    <Import Project="$(MSBuildThisFileDirectory)..\aegisub.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros">
     <SrcDir>..\..\..\..\contrib\iconv\</SrcDir>
diff --git a/aegisub/build/msbuild/lua51/lua51.vcxproj b/aegisub/build/msbuild/lua51/lua51.vcxproj
index 6b9dee91e..30f9e9af2 100644
--- a/aegisub/build/msbuild/lua51/lua51.vcxproj
+++ b/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)..\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" />
+    <Import Project="$(MSBuildThisFileDirectory)..\aegisub.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros">
 	<SrcDir>..\..\..\..\contrib\lua51\src\</SrcDir>
diff --git a/aegisub/build/msbuild/paths.props b/aegisub/build/msbuild/paths.props
index 3558268f5..5287827fe 100644
--- a/aegisub/build/msbuild/paths.props
+++ b/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>
diff --git a/aegisub/build/msbuild/standard-outdirs.props b/aegisub/build/msbuild/standard-outdirs.props
index a42b73e6c..2998227d8 100644
--- a/aegisub/build/msbuild/standard-outdirs.props
+++ b/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>
diff --git a/aegisub/build/msbuild/standard-settings.props b/aegisub/build/msbuild/standard-settings.props
index 73c2bb0e5..89556ff85 100644
--- a/aegisub/build/msbuild/standard-settings.props
+++ b/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'">