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.
This commit is contained in:
Niels Martin Hansen 2011-01-11 18:15:31 +00:00
parent 75b732bf60
commit 3974dfd1f2
8 changed files with 22 additions and 21 deletions

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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'">