From 8c08cb78a06b15c0ba1225df61c9129ff80e0552 Mon Sep 17 00:00:00 2001
From: Niels Martin Hansen <nielsm@aegisub.org>
Date: Mon, 3 Aug 2009 21:32:39 +0000
Subject: [PATCH] Make ffms2.dll not delayload, it's a required component and
 having it delayload only makes tracing loader errors harder.

Originally committed to SVN as r3355.
---
 aegisub/build/aegisub_vs2008/aegisub_vs2008.vcproj    |  4 ++--
 .../build/aegisub_vs2008/delayload_ffms2_32.vsprops   | 11 -----------
 2 files changed, 2 insertions(+), 13 deletions(-)
 delete mode 100644 aegisub/build/aegisub_vs2008/delayload_ffms2_32.vsprops

diff --git a/aegisub/build/aegisub_vs2008/aegisub_vs2008.vcproj b/aegisub/build/aegisub_vs2008/aegisub_vs2008.vcproj
index 5dd88f611..4e8780b51 100644
--- a/aegisub/build/aegisub_vs2008/aegisub_vs2008.vcproj
+++ b/aegisub/build/aegisub_vs2008/aegisub_vs2008.vcproj
@@ -22,7 +22,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\suffix_debug32.vsprops;.\wxlib_include.vsprops;.\wxlib_lib32.vsprops;.\libraries_outdirs.vsprops;.\contrib_includedirs.vsprops;.\aegisub_exe_filename.vsprops;.\ffms2_lib_include_dir.vsprops;.\compiler_options.vsprops;.\compiler_options_debug.vsprops;.\svn_rev_header_update.vsprops;.\delayload_ffms2_32.vsprops;.\delayload_portaudio_32.vsprops;.\delayload_openal_32.vsprops"
+			InheritedPropertySheets=".\suffix_debug32.vsprops;.\wxlib_include.vsprops;.\wxlib_lib32.vsprops;.\libraries_outdirs.vsprops;.\contrib_includedirs.vsprops;.\aegisub_exe_filename.vsprops;.\ffms2_lib_include_dir.vsprops;.\compiler_options.vsprops;.\compiler_options_debug.vsprops;.\svn_rev_header_update.vsprops;.\delayload_portaudio_32.vsprops;.\delayload_openal_32.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
@@ -154,7 +154,7 @@
 		<Configuration
 			Name="Release|Win32"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\suffix_release32.vsprops;.\wxlib_include.vsprops;.\wxlib_lib32.vsprops;.\libraries_outdirs.vsprops;.\contrib_includedirs.vsprops;.\aegisub_exe_filename.vsprops;.\ffms2_lib_include_dir.vsprops;.\compiler_options.vsprops;.\svn_rev_header_update.vsprops;.\delayload_ffms2_32.vsprops;.\delayload_portaudio_32.vsprops;.\delayload_openal_32.vsprops"
+			InheritedPropertySheets=".\suffix_release32.vsprops;.\wxlib_include.vsprops;.\wxlib_lib32.vsprops;.\libraries_outdirs.vsprops;.\contrib_includedirs.vsprops;.\aegisub_exe_filename.vsprops;.\ffms2_lib_include_dir.vsprops;.\compiler_options.vsprops;.\svn_rev_header_update.vsprops;.\delayload_portaudio_32.vsprops;.\delayload_openal_32.vsprops"
 			CharacterSet="1"
 			WholeProgramOptimization="1"
 			>
diff --git a/aegisub/build/aegisub_vs2008/delayload_ffms2_32.vsprops b/aegisub/build/aegisub_vs2008/delayload_ffms2_32.vsprops
deleted file mode 100644
index 0297308f0..000000000
--- a/aegisub/build/aegisub_vs2008/delayload_ffms2_32.vsprops
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="delayload_ffms2_32"
-	>
-	<Tool
-		Name="VCLinkerTool"
-		DelayLoadDLLs="ffms2.dll"
-	/>
-</VisualStudioPropertySheet>