Significantly restructure the msbuild projects to make them actually work

aegisub/build/Aegisub/Aegisub.targets

@@ -88,12 +88,7 @@
   <ItemDefinitionGroup Condition="'$(AegisubUseLibass)'=='true'">
     <ClCompile>
       <PreprocessorDefinitions>WITH_LIBASS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(LibassIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
-    <Link>
-      <AdditionalLibraryDirectories>$(LibassIncludePath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>$(LibassLibraryName);%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
   </ItemDefinitionGroup>
 
   <!-- Freetype 2 support -->
@@ -114,12 +109,7 @@
   <ItemDefinitionGroup Condition="'$(AegisubUseFfms)'=='true'">
     <ClCompile>
       <PreprocessorDefinitions>WITH_FFMS2;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(FFmpegSourceIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
-    <Link>
-      <AdditionalLibraryDirectories>$(FFmpegSourceLibraryPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>$(FFmpegSourceLibraryName);%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
   </ItemDefinitionGroup>
 
   <!-- Avisynth support -->

aegisub/build/Aegisub/Aegisub.vcxproj

@@ -23,9 +23,6 @@
     <ProjectGuid>{9DDDB9E5-E4A1-423D-A224-F6D4E5AAC06A}</ProjectGuid>
     <RootNamespace>Aegisub</RootNamespace>
   </PropertyGroup>
-  <PropertyGroup Label="Configuration">
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
 
   <!-- Aegisub project configuration -->
   <PropertyGroup Label="AegisubConfiguration">
@@ -34,15 +31,11 @@
     <SrcDir>..\..\src\</SrcDir>
   </PropertyGroup>
 
-  <!-- Default configuration -->
-  <Import Project="$(MSBuildThisFileDirectory)Aegisub.DefaultConfiguration.props" />
-
   <ImportGroup Label="PropertySheets">
     <Import Project="$(MSBuildThisFileDirectory)..\aegisub.props" />
   </ImportGroup>
 
   <!-- Project specific configuration -->
-  <Import Project="$(MSBuildThisFileDirectory)Aegisub.targets" />
   <PropertyGroup>
     <TargetName>aegisub$(AegisubPlatformSuffix)</TargetName>
   </PropertyGroup>
@@ -55,11 +48,6 @@
     </ClCompile>
   </ItemDefinitionGroup>
 
-  <!-- External user files to check which are enabled -->
-  <Import Project="..\fftw\fftw.vcxproj.user" />
-  <Import Project="..\freetype2\freetype.vcxproj.user" />
-  <Import Project="..\fontconfig\fontconfig.vcxproj.user" />
-
   <!-- Project References -->
   <ItemGroup>
     <ProjectReference Include="..\csrihelper\csrihelper.vcxproj">
@@ -463,4 +451,8 @@
   <ItemGroup>
     <ResourceCompile Include="$(SrcDir)res.rc" />
   </ItemGroup>
+
+  <ImportGroup Label="ExtensionTargets">
+    <Import Project="$(MSBuildThisFileDirectory)Aegisub.targets" />
+  </ImportGroup>
 </Project>

aegisub/build/Aegisub/Aegisub.xml

@@ -45,151 +45,7 @@
     <Category Name="Paths" DisplayName="Library paths" Description="Configure third-party library paths" />
   </Rule.Categories>
 
-  <StringProperty
+  <!-- Config -->
-    Subtype="folder"
-    Name="WxBasePath"
-    Category="Paths"
-    DisplayName="wxWidgets root"
-    Description="Root directory of the wxWidgets installation to use"
-    />
-  <StringProperty
-    Subtype="folder"
-    Name="WxLibraryPath"
-    Category="Paths"
-    DisplayName="wxWidgets library path"
-    Description="Location of compiled wxWidgets library files"
-    />
-  <StringProperty
-    Subtype="folder"
-    Name="WxIncludePath"
-    Category="Paths"
-    DisplayName="wxWidgets include path"
-    Description="Location of wxWidgets header files"
-    />
-
-  <BoolProperty
-    Name="AegisubUseDSound"
-    Category="Features"
-    DisplayName="Use DirectSound"
-    Description="Specify whether to use the DirectSound-based audio player. This requires the DirectX SDK installed."
-    />
-  <StringProperty
-    Subtype="folder"
-    Name="DirectXSDKPath"
-    Category="Paths"
-    DisplayName="DirectX SDK root path"
-    Description="Location of DirectX SDK installation for DirectSound support, this is usually auto-detected."
-    />
-
-  <BoolProperty
-    Name="AegisubUseAvisynth"
-    Category="Features"
-    DisplayName="Use Avisynth"
-    Description="Specify whether to support Avisynth for video and audio providers. This is experimental on x64."
-    />
-
-  <BoolProperty
-    Name="AegisubUseFfms"
-    Category="Features"
-    DisplayName="Use FFmpegSource2"
-    Description="Specify whether to support FFmpegSource2 for video and audio providers. You may need to configure the location of the library on the Library paths page."
-    />
-  <StringProperty
-    Subtype="folder"
-    Name="FFmpegSourceIncludePath"
-    Category="Paths"
-    DisplayName="FFmpegSource2 include path"
-    Description="Location of FFmpegSource2 include files"
-    />
-  <StringProperty
-    Subtype="folder"
-    Name="FFmpegSourceLibraryPath"
-    Category="Paths"
-    DisplayName="FFmpegSource2 library path"
-    Description="Location of FFmpegSource2 library files"
-    />
-  <StringProperty
-    Subtype="file"
-    Name="FFmpegSourceLibraryName"
-    Category="Paths"
-    DisplayName="FFmpegSource2 library name"
-    Description="Name of FFmpegSource2 library"
-    />
-
-  <BoolProperty
-    Name="AegisubUseFreetype2"
-    Category="Features"
-    DisplayName="Use Freetype 2"
-    Description="Specify whether to use Freetype 2 for font enumeration in the Font Collector. You will need to configure the location of the Freetype 2 library on the Library paths page."
-    />
-
-  <BoolProperty
-    Name="AegisubUseFftw"
-    Category="Features"
-    DisplayName="Use FFTW"
-    Description="Specify whether to use the FFTW fourier transformation library to speed up audio spectrum rendering. You will need to configure the location of the FFTW library on the Library paths page."
-    />
-
-  <BoolProperty
-    Name="AegisubUseFontconfig"
-    Category="Features"
-    DisplayName="Use Fontconfig"
-    Description="Specify whether to use Fontconfig for font enumeration in the Font Collector. You will need to configure the location of the Fontconfig library on the Library paths page."
-    />
-
-  <BoolProperty
-    Name="AegisubUseLibass"
-    Category="Features"
-    DisplayName="Use libass"
-    Description="Specify whether to include support for the libass subtitle rendering library. You will need to configure the location of libass on the Library paths page."
-    />
-  <StringProperty
-    Subtype="folder"
-    Name="LibassIncludePath"
-    Category="Paths"
-    DisplayName="libass include path"
-    Description="Location of libass include files"
-    />
-  <StringProperty
-    Subtype="folder"
-    Name="LibassLibraryPath"
-    Category="Paths"
-    DisplayName="libass library path"
-    Description="Location of libass library files"
-    />
-  <StringProperty
-    Subtype="file"
-    Name="LibassLibraryName"
-    Category="Paths"
-    DisplayName="libass library name"
-    Description="Name of libass library"
-    />
-
-  <EnumProperty
-    Name="AegisubUseCsri"
-    DisplayName="Use CSRI subtitle renderer"
-    Description="Specify whether to include support for CSRI subtitle rendering. The included helper library dynamically loads CSRI renderers, while linking another library allows you to e.g. link VSFilter.dll directly."
-    Category="Features"
-    >
-    <EnumValue Name="HelperLibrary" DisplayName="Use included helper library" Description="Use the included helper library to dynamically load CSRI renderers." />
-    <EnumValue Name="External" DisplayName="Link other library" Description="Use another CSRI renderer" />
-    <EnumValue Name="false" DisplayName="No CSRI support" Description="Do not use CSRI" />
-  </EnumProperty>
-  <StringProperty
-    Subtype="folder"
-    Name="CsriLibraryPath"
-    Category="Paths"
-    DisplayName="External CSRI library path"
-    Description="Location of external CSRI library files, for when not using the CSRI helper library."
-    />
-  <StringProperty
-    Subtype="file"
-    Name="CsriLibraryName"
-    Category="Paths"
-    DisplayName="External CSRI library name"
-    Description="Name of external CSRI library, for when not using the CSRI helper library"
-    />
-
   <BoolProperty
     Name="StartupLog"
     DisplayName="Start-up logging"
@@ -223,4 +79,159 @@
      Description="URL to get for updates."
      />
 
+   <!-- External Libraries -->
+  <BoolProperty
+    Name="AegisubUseAvisynth"
+    Category="Features"
+    DisplayName="Avisynth"
+    Description="Enable the Avisynth audio and video providers. This is experimental on x64. This has no external build dependencies."
+    />
+
+  <EnumProperty
+    Name="AegisubUseCsri"
+    DisplayName="Use CSRI subtitle renderer"
+    Description="Specify whether to include support for CSRI subtitle rendering. The included helper library dynamically loads CSRI renderers, while linking another library allows you to e.g. link VSFilter.dll directly."
+    Category="Features"
+    >
+    <EnumValue Name="HelperLibrary" DisplayName="Use included helper library" Description="Use the included helper library to dynamically load CSRI renderers." />
+    <EnumValue Name="External" DisplayName="Link other library" Description="Use another CSRI renderer" />
+    <EnumValue Name="false" DisplayName="No CSRI support" Description="Do not use CSRI" />
+  </EnumProperty>
+
+  <BoolProperty
+    Name="AegisubUseDSound"
+    Category="Features"
+    DisplayName="DirectSound"
+    Description="Enable the DirectSound-based audio player. This requires the DirectX SDK."
+    />
+
+  <BoolProperty
+    Name="AegisubUseFfms"
+    Category="Features"
+    DisplayName="FFMS2"
+    Description="Enable the FFMS2 audio and video providers. Requires copies of the FFMS2 and FFmpeg/libav source"
+    />
+
+  <BoolProperty
+    Name="AegisubUseFftw"
+    Category="Features"
+    DisplayName="FFTW"
+    Description="A high-speed fourier transformation library which improves the spectograph speed and quality. Requires a copy of the FFTW 3.2 source."
+    />
+
+  <BoolProperty
+    Name="AegisubUseFontconfig"
+    Category="Features"
+    DisplayName="Fontconfig"
+    Description="Required for the font collector and libass. Requires Freetype 2 and a copy of the Fontconfig source."
+    />
+
+  <BoolProperty
+    Name="AegisubUseLibass"
+    Category="Features"
+    DisplayName="libass"
+    Description="An alternative subtitle renderer which is often faster than VSFilter. Requires Fontconfig, Freetype 2, Fribidi, and a copy of the libass source."
+    />
+
+   <!-- Library Paths -->
+  <StringProperty
+    Subtype="folder"
+    Name="WxBasePath"
+    Category="Paths"
+    DisplayName="wxWidgets root"
+    Description="Root directory of the wxWidgets installation to use"
+    />
+  <StringProperty
+    Subtype="folder"
+    Name="WxLibraryPath"
+    Category="Paths"
+    DisplayName="wxWidgets library path"
+    Description="Location of compiled wxWidgets library files. Defaults to $(WxBasePath)\lib32 or $(WxBasePath)\lib64."
+    />
+  <StringProperty
+    Subtype="folder"
+    Name="WxIncludePath"
+    Category="Paths"
+    DisplayName="wxWidgets include path"
+    Description="Location of wxWidgets header files. Defaults to $(WxBasePath)\include"
+    />
+
+  <StringProperty
+    Subtype="folder"
+    Name="CsriLibraryPath"
+    Category="Paths"
+    DisplayName="External CSRI library path"
+    Description="Location of external CSRI library files, for when not using the CSRI helper library."
+    />
+  <StringProperty
+    Subtype="file"
+    Name="CsriLibraryName"
+    Category="Paths"
+    DisplayName="External CSRI library name"
+    Description="Name of external CSRI library, for when not using the CSRI helper library"
+    />
+
+  <StringProperty
+    Subtype="folder"
+    Name="DirectXSDKPath"
+    Category="Paths"
+    DisplayName="DirectX SDK root path"
+    Description="Location of DirectX SDK installation for DirectSound support. This is usually auto-detected."
+    />
+
+  <StringProperty
+    Subtype="folder"
+    Name="FfmsSrcDir"
+    Category="Paths"
+    DisplayName="FFMS2 source path"
+    Description="Location of FFMS2 source code."
+    />
+
+  <StringProperty
+    Subtype="folder"
+    Name="FfmpegSrcDir"
+    Category="Paths"
+    DisplayName="FFmpeg/libav source path"
+    Description="Location of FFmpeg or libav source code. Required for FFMS2."
+    />
+
+  <StringProperty
+    Subtype="folder"
+    Name="FftwSrcDir"
+    Category="Paths"
+    DisplayName="FFTW 3 source path"
+    Description="Location of FFTW 3 source code."
+    />
+
+  <StringProperty
+    Subtype="folder"
+    Name="Freetype2SrcDir"
+    Category="Paths"
+    DisplayName="Freetype 2 source path"
+    Description="Location of Freetype 2 source code. Required for libass and fontconfig."
+    />
+
+  <StringProperty
+    Subtype="folder"
+    Name="FribidiSrcDir"
+    Category="Paths"
+    DisplayName="Fribidi source path"
+    Description="Location of Fribidi source code. Required for libass."
+    />
+
+  <StringProperty
+    Subtype="folder"
+    Name="FontconfigSrcDir"
+    Category="Paths"
+    DisplayName="Fontconfig source path"
+    Description="Location of Fontconfig source code."
+    />
+
+  <StringProperty
+    Subtype="folder"
+    Name="LibassSrcDir"
+    Category="Paths"
+    DisplayName="libass source path"
+    Description="Location of libass source code."
+    />
 </Rule>

aegisub/build/DefaultConfiguration.props

@@ -35,29 +35,22 @@
 
   <!-- Default settings for build-time options -->
   <PropertyGroup>
-    <AegisubUseDSound>true</AegisubUseDSound>
+    <AegisubBuildCredit>Anonymous</AegisubBuildCredit>
-    <DirectXSDKPath>$(DXSDK_DIR)</DirectXSDKPath>
     <AegisubUseAvisynth Condition="'$(AegisubUseAvisynth)|$(Platform)'=='|Win32'">true</AegisubUseAvisynth>
     <AegisubUseAvisynth Condition="'$(AegisubUseAvisynth)|$(Platform)'=='|x64'">false</AegisubUseAvisynth>
-    <AegisubUseFfms>true</AegisubUseFfms>
-    <FFmpegSourceIncludePath>$(AegisubSourceBase)libffms\include\</FFmpegSourceIncludePath>
-    <FFmpegSourceLibraryPath>$(AegisubSourceBase)libffms\lib\</FFmpegSourceLibraryPath>
-    <FFmpegSourceLibraryName>ffms2.lib</FFmpegSourceLibraryName>
-    <AegisubUseFreetype2>true</AegisubUseFreetype2>
-    <AegisubUseFontconfig>true</AegisubUseFontconfig>
-    <AegisubUseFftw>false</AegisubUseFftw>
-    <AegisubUseLibass>false</AegisubUseLibass>
     <AegisubUseCsri>HelperLibrary</AegisubUseCsri>
-    <CsriLibraryName>vsfilter.lib</CsriLibraryName>
+    <AegisubUseDSound>true</AegisubUseDSound>
-    <StartupLog>false</StartupLog>
+    <AegisubUseFfms>true</AegisubUseFfms>
-    <AegisubBuildCredit>Anonymous</AegisubBuildCredit>
+    <AegisubUseFftw>false</AegisubUseFftw>
+    <AegisubUseFontconfig>true</AegisubUseFontconfig>
+    <AegisubUseFreetype2>true</AegisubUseFreetype2>
+    <AegisubUseLibass>false</AegisubUseLibass>
     <AegisubUseUpdateChecker>true</AegisubUseUpdateChecker>
+    <CsriLibraryName>vsfilter.lib</CsriLibraryName>
+    <DirectXSDKPath>$(DXSDK_DIR)</DirectXSDKPath>
+    <StartupLog>false</StartupLog>
     <UpdateCheckerServer>updates.aegisub.org</UpdateCheckerServer>
     <UpdateCheckerURL>/trunk</UpdateCheckerURL>
     <WxBasePath>$(AegisubSourceBase)wxlib</WxBasePath>
-    <WxLibraryPath Condition="'$(Platform)'=='Win32'">$(WxBasePath)\lib32</WxLibraryPath>
-    <WxLibraryPath Condition="'$(Platform)'=='x64'">$(WxBasePath)\lib64</WxLibraryPath>
-    <WxIncludePath>$(WxBasePath)\include</WxIncludePath>
   </PropertyGroup>
-
 </Project>

aegisub/build/aegisub.props

@@ -1,32 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-	<PropertyGroup>
+  <PropertyGroup>
-		<_PropertySheetDisplayName>Aegisub project</_PropertySheetDisplayName>
+    <_PropertySheetDisplayName>Aegisub project</_PropertySheetDisplayName>
-	</PropertyGroup>
+  </PropertyGroup>
 
-	<!-- Base configuration for VC projects -->
+  <!-- Base configuration for VC projects -->
-	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-	<PropertyGroup Label="Configuration">
+  <PropertyGroup Label="Configuration">
-		<ConfigurationType        Condition="'$(AegisubProjectType)'=='lib'">StaticLibrary</ConfigurationType>
+    <ConfigurationType        Condition="'$(AegisubProjectType)'=='lib'">StaticLibrary</ConfigurationType>
-		<ConfigurationType        Condition="'$(AegisubProjectType)'=='dll'">DynamicLibrary</ConfigurationType>
+    <ConfigurationType        Condition="'$(AegisubProjectType)'=='dll'">DynamicLibrary</ConfigurationType>
-		<ConfigurationType        Condition="'$(AegisubProjectType)'=='exe'">Application</ConfigurationType>
+    <ConfigurationType        Condition="'$(AegisubProjectType)'=='exe'">Application</ConfigurationType>
-		<UseDebugLibraries        Condition="'$(Configuration)'=='Debug'"   >true</UseDebugLibraries>
+    <UseDebugLibraries        Condition="'$(Configuration)'=='Debug'"   >true</UseDebugLibraries>
-		<UseDebugLibraries        Condition="'$(Configuration)'=='Release'" >false</UseDebugLibraries>
+    <UseDebugLibraries        Condition="'$(Configuration)'=='Release'" >false</UseDebugLibraries>
-		<WholeProgramOptimization Condition="'$(Configuration)'=='Release'" >true</WholeProgramOptimization>
+    <WholeProgramOptimization Condition="'$(Configuration)'=='Release'" >true</WholeProgramOptimization>
-		<CharacterSet                                                       >Unicode</CharacterSet>
+    <CharacterSet                                                       >Unicode</CharacterSet>
-	</PropertyGroup>
+    <PlatformToolset                                                    >v110</PlatformToolset>
-	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  </PropertyGroup>
-	
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-	<ImportGroup Label="PropertySheets">
-		<Import Project="$(MSBuildThisFileDirectory)userconfig\*.props" />
-		<Import Project="$(MSBuildThisFileDirectory)paths.props" />
-		<Import Project="$(MSBuildThisFileDirectory)Aegisub\standard-libraries.props" />
-		<Import Project="$(MSBuildThisFileDirectory)standard-settings.props" />
-		<Import Project="$(MSBuildThisFileDirectory)standard-outdirs.props" />
-		<Import Project="$(MSBuildThisFileDirectory)wx.props" Condition="'$(AegisubUseWxWidgets)' == 'true'" />
-	</ImportGroup>
 
-	<!-- The standard targets need to go last for all paths to be proper -->
+  <!-- Default configuration -->
-	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionSettings">
-	<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Label="LocalAppDataPlatform" />
+    <Import Project="$(MSBuildThisFileDirectory)\DefaultConfiguration.props" />
+    <!-- Import the Aegisub user config file for non-Aegisub projects since
+         there doesn't seem to be any sort of solution-wide config file -->
+    <Import Project="$(MSBuildThisFileDirectory)\Aegisub\Aegisub.vcxproj.user"
+            Condition="'$(MSBuildProjectName)'!='Aegisub'" />
+  </ImportGroup>
+
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(MSBuildThisFileDirectory)userconfig\*.props" />
+    <Import Project="$(MSBuildThisFileDirectory)paths.props" />
+    <Import Project="$(MSBuildThisFileDirectory)Aegisub\standard-libraries.props" />
+    <Import Project="$(MSBuildThisFileDirectory)standard-settings.props" />
+    <Import Project="$(MSBuildThisFileDirectory)standard-outdirs.props" />
+  </ImportGroup>
+
+  <!-- The standard targets need to go last for all paths to be proper -->
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Label="LocalAppDataPlatform" />
+
+    <!-- If this comes before the Microsoft.Cpp.targets include the
+         AdditionalLibraryDirectories value gets cleared (but nothing else).
+         I'm not sure why. -->
+    <Import Project="$(MSBuildThisFileDirectory)wx.props" Condition="'$(AegisubUseWxWidgets)' == 'true'" />
 </Project>

aegisub/build/csrihelper/csrihelper.vcxproj

@@ -23,18 +23,6 @@
     <ProjectGuid>{C832EAF3-860D-4373-A02C-933626B47A5E}</ProjectGuid>
     <RootNamespace>csrihelper</RootNamespace>
   </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
   <!-- Aegisub project configuration -->
   <PropertyGroup Label="AegisubConfiguration">
     <AegisubProjectType>lib</AegisubProjectType>

aegisub/build/fftw/config.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Rule Name="ExternalSourceLocation"
-    DisplayName="Source Location"
-    Order="1"
-    PageTemplate="tool"
-    xmlns="http://schemas.microsoft.com/build/2009/properties">
-
-  <Rule.DataSource>
-    <DataSource Persistence="UserFile" ItemType="" HasConfigurationCondition="false" />
-  </Rule.DataSource>
-
-  <StringProperty
-    Subtype="folder"
-    Name="FftwSrcDir"
-    DisplayName="Source Location"
-    Description="A directory containing a copy of FFTW3, or empty to disable FFTW3. Changes to this property do not take effect until the project is reloaded."
-    />
-</Rule>

aegisub/build/fftw/fftw.vcxproj

@@ -22,15 +22,9 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{EA3DCC95-2423-4EA0-A508-7A427B4C0594}</ProjectGuid>
     <RootNamespace>fftw</RootNamespace>
-    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
 
   <!-- Aegisub project configuration -->
-  <ItemGroup>
-    <PropertyPageSchema Include="$(MSBuildThisFileDirectory)config.xml" />
-    <ProjectTools Include="ExternalSourceLocation" />
-  </ItemGroup>
-
   <PropertyGroup Label="AegisubConfiguration">
     <AegisubProjectType>lib</AegisubProjectType>
   </PropertyGroup>

aegisub/build/fontconfig/config.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Rule Name="ExternalSourceLocation"
-    DisplayName="Source Location"
-    Order="1"
-    PageTemplate="tool"
-    xmlns="http://schemas.microsoft.com/build/2009/properties">
-
-  <Rule.DataSource>
-    <DataSource Persistence="UserFile" ItemType="" HasConfigurationCondition="false" />
-  </Rule.DataSource>
-
-  <StringProperty
-    Subtype="folder"
-    Name="FontconfigSrcDir"
-    DisplayName="Source Location"
-    Description="A directory containing a copy of Fontconfig, or empty to disable Fontconfig. Changes to this property do not take effect until the project is reloaded."
-    />
-</Rule>

aegisub/build/fontconfig/fontconfig.vcxproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <!-- VC boilerplate -->
   <ItemGroup Label="ProjectConfigurations">
@@ -22,15 +22,9 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{AD56899E-961B-47B7-BD0F-14D0DA50D141}</ProjectGuid>
     <RootNamespace>fontconfig</RootNamespace>
-    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
 
   <!-- Project configuration -->
-  <ItemGroup>
-    <PropertyPageSchema Include="$(MSBuildThisFileDirectory)config.xml" />
-    <ProjectTools Include="ExternalSourceLocation" />
-  </ItemGroup>
-
   <PropertyGroup Label="AegisubConfiguration">
     <AegisubProjectType>lib</AegisubProjectType>
   </PropertyGroup>
@@ -45,7 +39,6 @@
       <AdditionalIncludeDirectories>
         $(FontconfigSrcDir);
         $(FontconfigSrcDir)\win32\include;
-        $(AegisubSourceBase)\include;
         %(AdditionalIncludeDirectories)
       </AdditionalIncludeDirectories>
       <PreprocessorDefinitions>

aegisub/build/freetype2/config.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Rule Name="ExternalSourceLocation"
-    DisplayName="Source Location"
-    Order="1"
-    PageTemplate="tool"
-    xmlns="http://schemas.microsoft.com/build/2009/properties">
-
-  <Rule.DataSource>
-    <DataSource Persistence="UserFile" ItemType="" HasConfigurationCondition="false" />
-  </Rule.DataSource>
-
-  <StringProperty
-    Subtype="folder"
-    Name="Freetype2SrcDir"
-    DisplayName="Source Location"
-    Description="A directory containing a copy of FreeType2, or empty to disable FreeType2. Changes to this property do not take effect until the project is reloaded."
-    />
-</Rule>

aegisub/build/freetype2/freetype.vcxproj

@@ -22,15 +22,9 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}</ProjectGuid>
     <RootNamespace>freetype</RootNamespace>
-    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
 
   <!-- Project configuration -->
-  <ItemGroup>
-    <PropertyPageSchema Include="$(MSBuildThisFileDirectory)config.xml" />
-    <ProjectTools Include="ExternalSourceLocation" />
-  </ItemGroup>
-
   <PropertyGroup Label="AegisubConfiguration">
     <AegisubProjectType>lib</AegisubProjectType>
   </PropertyGroup>

aegisub/build/hunspell/hunspell.vcxproj

@@ -23,18 +23,6 @@
     <ProjectGuid>{CC791693-6B28-40AC-879D-64A6C16468E3}</ProjectGuid>
     <RootNamespace>hunspell</RootNamespace>
   </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
   <!-- Aegisub project configuration -->
   <PropertyGroup Label="AegisubConfiguration">
     <AegisubProjectType>lib</AegisubProjectType>
@@ -96,4 +84,4 @@
     <ClCompile Include="..\..\..\contrib\hunspell\src\hunspell\hunzip.cxx" />
     <ClCompile Include="..\..\..\contrib\hunspell\src\hunspell\replist.cxx" />
   </ItemGroup>
-</Project>
+</Project>

aegisub/build/libaegisub/libaegisub.vcxproj

@@ -23,18 +23,6 @@
     <ProjectGuid>{BB3FED86-DB7A-4DC7-964A-260FB86CDE61}</ProjectGuid>
     <RootNamespace>libaegisub</RootNamespace>
   </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
   <!-- Aegisub project configuration -->
   <PropertyGroup Label="AegisubConfiguration">
     <AegisubProjectType>lib</AegisubProjectType>
@@ -130,4 +118,4 @@
   <ItemGroup>
     <None Include="$(SrcDir)include\libaegisub\charsets.def" />
   </ItemGroup>
-</Project>
+</Project>

aegisub/build/libiconv/libiconv.vcxproj

@@ -23,18 +23,6 @@
     <ProjectGuid>{965054D2-44F2-4EB2-9879-051CC3D7EF08}</ProjectGuid>
     <RootNamespace>libiconv</RootNamespace>
   </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
   <!-- Aegisub project configuration -->
   <PropertyGroup Label="AegisubConfiguration">
     <AegisubProjectType>lib</AegisubProjectType>

aegisub/build/libresrc/libresrc.vcxproj

@@ -22,7 +22,6 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{BD00D65F-24DA-4784-8860-3B972EA125FC}</ProjectGuid>
     <RootNamespace>libresrc</RootNamespace>
-    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
 
   <!-- Aegisub project configuration -->
@@ -31,8 +30,6 @@
     <AegisubUseWxWidgets>true</AegisubUseWxWidgets>
     <SrcDir>..\..\src\libresrc\</SrcDir>
   </PropertyGroup>
-  <Import Project="$(MSBuildThisFileDirectory)..\Aegisub\Aegisub.DefaultConfiguration.props" />
-  <Import Project="$(MSBuildThisFileDirectory)..\Aegisub\Aegisub.vcxproj.user" />
   <ImportGroup Label="PropertySheets">
     <Import Project="$(MSBuildThisFileDirectory)..\aegisub.props" />
   </ImportGroup>

aegisub/build/lua51/lua51.vcxproj

@@ -23,18 +23,6 @@
     <ProjectGuid>{5391A8B1-9C70-4DC4-92AD-D3E34C6B803F}</ProjectGuid>
     <RootNamespace>lua51</RootNamespace>
   </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
   <!-- Aegisub project configuration -->
   <PropertyGroup Label="AegisubConfiguration">
     <AegisubProjectType>lib</AegisubProjectType>

aegisub/build/respack/respack.vcxproj

@@ -28,7 +28,6 @@
   <PropertyGroup>
     <OutDir>$(ProjectDir)</OutDir>
     <TargetName>respack$(AegisubPlatformSuffix)</TargetName>
-    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>

aegisub/build/standard-settings.props

@@ -17,6 +17,7 @@
 			<MinimalRebuild>false</MinimalRebuild>
 			<WarningLevel>Level3</WarningLevel>
 			<PreprocessorDefinitions>WIN32;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<AdditionalIncludeDirectories>$(AegisubSourceBase)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 		</ClCompile>
 		<Link>
 			<SubSystem>Windows</SubSystem>
@@ -48,4 +49,4 @@
 		</Link>
 	</ItemDefinitionGroup>
 
-</Project>
+</Project>

aegisub/build/universalchardet/universalchardet.vcxproj

@@ -23,18 +23,6 @@
     <ProjectGuid>{7B56955D-5162-4698-AA5B-47484EDC8783}</ProjectGuid>
     <RootNamespace>universalchardet</RootNamespace>
   </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
   <!-- Aegisub project configuration -->
   <PropertyGroup Label="AegisubConfiguration">
     <AegisubProjectType>lib</AegisubProjectType>

aegisub/build/wx.props

@@ -4,10 +4,18 @@
     <_PropertySheetDisplayName>wxWidgets support</_PropertySheetDisplayName>
   </PropertyGroup>
 
-  <!-- Some helper affixes -->
   <PropertyGroup>
+    <!-- Some helper affixes -->
     <WxLibDbgSuffix Condition="'$(Configuration)'=='Debug'">d</WxLibDbgSuffix>
     <WxLibDbgSuffix Condition="'$(Configuration)'=='Release'"></WxLibDbgSuffix>
+
+    <!-- The derived paths are set here rather than the defaults as otherwise
+         the base path is expanded before it's overridden by the user value -->
+    <WxIncludePath Condition="'$(WxIncludePath)'==''">$(WxBasePath)\include</WxIncludePath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(WxLibraryPath)'==''">
+    <WxLibraryPath Condition="'$(Platform)'=='Win32'">$(WxBasePath)\lib32</WxLibraryPath>
+    <WxLibraryPath Condition="'$(Platform)'=='x64'">$(WxBasePath)\lib64</WxLibraryPath>
   </PropertyGroup>
 
   <ItemDefinitionGroup>