From 5f1f84ec32bcef9979517a991587446e7a9b9295 Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Thu, 1 Nov 2012 14:12:20 -0700
Subject: [PATCH] Include default config before aegisub.props so that it
 actually works

---
 aegisub/build/Aegisub/Aegisub.targets | 3 +--
 aegisub/build/Aegisub/Aegisub.vcxproj | 6 ++++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/aegisub/build/Aegisub/Aegisub.targets b/aegisub/build/Aegisub/Aegisub.targets
index 9e59bd151..70a943990 100644
--- a/aegisub/build/Aegisub/Aegisub.targets
+++ b/aegisub/build/Aegisub/Aegisub.targets
@@ -31,8 +31,7 @@
 -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-  <!-- Default configuration -->
-  <Import Project="$(MSBuildThisFileDirectory)Aegisub.DefaultConfiguration.props" />
+
 
   <!-- Build credit text -->
   <PropertyGroup Condition="'$(AegisubBuildCredit)'==''">
diff --git a/aegisub/build/Aegisub/Aegisub.vcxproj b/aegisub/build/Aegisub/Aegisub.vcxproj
index 43f61d13e..295c1dc41 100644
--- a/aegisub/build/Aegisub/Aegisub.vcxproj
+++ b/aegisub/build/Aegisub/Aegisub.vcxproj
@@ -31,10 +31,12 @@
   <PropertyGroup Label="AegisubConfiguration">
     <AegisubProjectType>exe</AegisubProjectType>
     <AegisubUseWxWidgets>true</AegisubUseWxWidgets>
-    <AegisubUseFreetype>true</AegisubUseFreetype>
-    <AegisubUseDSound>true</AegisubUseDSound>
     <SrcDir>..\..\src\</SrcDir>
   </PropertyGroup>
+
+  <!-- Default configuration -->
+  <Import Project="$(MSBuildThisFileDirectory)Aegisub.DefaultConfiguration.props" />
+
   <ImportGroup Label="PropertySheets">
     <Import Project="$(MSBuildThisFileDirectory)..\aegisub.props" />
   </ImportGroup>