From 956f657c8dc4bbbcecacaf3779b2be94fa947d99 Mon Sep 17 00:00:00 2001
From: Karl Blomster <kalle.blomster@gmail.com>
Date: Fri, 12 Jun 2009 17:10:45 +0000
Subject: [PATCH] - Moved lib/ffms2.lib to FFmpegSource2/ffms2.lib. - Deleted
 the lib folder since nothing uses it anymore. - Modifed the #include of
 ffms.h in ffmpegsource_common.h to make it easier to use an external ffms2
 instead of the one in the repository. - Updated vs2008 project file to
 reflect these changes. - Easily claims build breaker's hat.

Originally committed to SVN as r3052.
---
 aegisub/{lib => FFmpegSource2}/ffms2.lib         | Bin
 .../build/aegisub_vs2008/aegisub_vs2008.vcproj   |   8 ++++----
 .../aegisub_vs2008/ffms2_lib_include_dir.vsprops |  15 +++++++++++++++
 .../aegisub_vs2008/shipped_stub_libs_dir.vsprops |  11 -----------
 aegisub/lib/aegisub-auto3.lib                    | Bin 2848 -> 0 bytes
 aegisub/src/ffmpegsource_common.h                |   2 +-
 6 files changed, 20 insertions(+), 16 deletions(-)
 rename aegisub/{lib => FFmpegSource2}/ffms2.lib (100%)
 create mode 100644 aegisub/build/aegisub_vs2008/ffms2_lib_include_dir.vsprops
 delete mode 100644 aegisub/build/aegisub_vs2008/shipped_stub_libs_dir.vsprops
 delete mode 100644 aegisub/lib/aegisub-auto3.lib

diff --git a/aegisub/lib/ffms2.lib b/aegisub/FFmpegSource2/ffms2.lib
similarity index 100%
rename from aegisub/lib/ffms2.lib
rename to aegisub/FFmpegSource2/ffms2.lib
diff --git a/aegisub/build/aegisub_vs2008/aegisub_vs2008.vcproj b/aegisub/build/aegisub_vs2008/aegisub_vs2008.vcproj
index 05f946796..c3da48189 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;.\libraries_outdirs.vsprops;.\contrib_includedirs.vsprops;.\aegisub_exe_filename.vsprops;.\shipped_stub_libs_dir.vsprops;.\compiler_options.vsprops;.\compiler_options_debug.vsprops;.\svn_rev_header_update.vsprops;.\delayload_ffms2_32.vsprops;.\delayload_perl_32.vsprops;.\delayload_portaudio_32.vsprops;.\delayload_openal_32.vsprops;.\delayload_libauto3.vsprops"
+			InheritedPropertySheets=".\suffix_debug32.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_perl_32.vsprops;.\delayload_portaudio_32.vsprops;.\delayload_openal_32.vsprops;.\delayload_libauto3.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
@@ -88,7 +88,7 @@
 		<Configuration
 			Name="Debug|x64"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\suffix_debug64.vsprops;.\libraries_outdirs.vsprops;.\contrib_includedirs.vsprops;.\aegisub_exe_filename.vsprops;.\shipped_stub_libs_dir.vsprops;.\compiler_options.vsprops;.\compiler_options_debug.vsprops;.\svn_rev_header_update.vsprops;.\delayload_libauto3.vsprops"
+			InheritedPropertySheets=".\suffix_debug64.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_libauto3.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
@@ -154,7 +154,7 @@
 		<Configuration
 			Name="Release|Win32"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\suffix_release32.vsprops;.\libraries_outdirs.vsprops;.\contrib_includedirs.vsprops;.\aegisub_exe_filename.vsprops;.\shipped_stub_libs_dir.vsprops;.\compiler_options.vsprops;.\svn_rev_header_update.vsprops;.\delayload_ffms2_32.vsprops;.\delayload_perl_32.vsprops;.\delayload_portaudio_32.vsprops;.\delayload_openal_32.vsprops;.\delayload_libauto3.vsprops"
+			InheritedPropertySheets=".\suffix_release32.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_perl_32.vsprops;.\delayload_portaudio_32.vsprops;.\delayload_openal_32.vsprops;.\delayload_libauto3.vsprops"
 			CharacterSet="1"
 			WholeProgramOptimization="1"
 			>
@@ -223,7 +223,7 @@
 		<Configuration
 			Name="Release|x64"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\suffix_release64.vsprops;.\libraries_outdirs.vsprops;.\contrib_includedirs.vsprops;.\aegisub_exe_filename.vsprops;.\shipped_stub_libs_dir.vsprops;.\compiler_options.vsprops;.\svn_rev_header_update.vsprops;.\delayload_libauto3.vsprops"
+			InheritedPropertySheets=".\suffix_release64.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_libauto3.vsprops"
 			CharacterSet="1"
 			WholeProgramOptimization="1"
 			>
diff --git a/aegisub/build/aegisub_vs2008/ffms2_lib_include_dir.vsprops b/aegisub/build/aegisub_vs2008/ffms2_lib_include_dir.vsprops
new file mode 100644
index 000000000..dd69e64af
--- /dev/null
+++ b/aegisub/build/aegisub_vs2008/ffms2_lib_include_dir.vsprops
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="ffms2_lib_include_dir"
+	>
+	<Tool
+		Name="VCLinkerTool"
+		AdditionalLibraryDirectories="$(ProjectDir)../../FFmpegSource2/"
+	/>
+	<Tool
+		Name="VCCLCompilerTool"
+		AdditionalIncludeDirectories="&quot;$(ProjectDir)../../FFmpegSource2/&quot;;"
+	/>
+</VisualStudioPropertySheet>
diff --git a/aegisub/build/aegisub_vs2008/shipped_stub_libs_dir.vsprops b/aegisub/build/aegisub_vs2008/shipped_stub_libs_dir.vsprops
deleted file mode 100644
index 50b9bac52..000000000
--- a/aegisub/build/aegisub_vs2008/shipped_stub_libs_dir.vsprops
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="shipped_stub_libs_dir"
-	>
-	<Tool
-		Name="VCLinkerTool"
-		AdditionalLibraryDirectories="$(ProjectDir)../../lib/"
-	/>
-</VisualStudioPropertySheet>
diff --git a/aegisub/lib/aegisub-auto3.lib b/aegisub/lib/aegisub-auto3.lib
deleted file mode 100644
index 614aeb2bb0120ed82db10065af7444a6ec0bfa87..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2848
zcmcIm-A)rh6#llQw%w3O&|72GYVbnnuatyn5hN1IPqy_^m!(~yNwLkcjq%DC@DY3l
z;v*2kg%>`6*E|Hbc+SpD+3l{DDoipz=V#}fIp;ew`(V*>n)@&GxlFL-^OZs&zfjEO
zf_z05=SxzsqXW1N#7}|5Igrc(`jO}<7vP>YL{FU&O<k{uo<1S|iD|BFY;PG2bLDk?
z*;w0dY#F9y@3jy6yU(n?+bzO0H{aH3VKsaS=n1XHo41?m=E_oI38vBixWqfun@+pu
z(mw5jo*CkLDyxodD+M1zeC|4}elH-cOO_|!usWS?Gay&275mV2x}U{10WYE?%Z_ci
zc7$?RFm}c&ml;b_%1-0Jc>>5Lfg{SHn*t0HoY7n%`h?b$RwR(bEu@jc1T@3~bR4GV
ztB7476ygjrNMY~IsMCkC_0PDFiS{`sG9Pf!$5Po8tO$37Aj)YW8FGCDF6V}lH>%q5
z6;*{hdI0gWtxgAXswkz>sNKrB!k~6*S{&KMPpc`7DwDEJO`C1myZyavU66zZT6|T6
zoU536HQR1ku9Yn)(Op{5C4gU&K>$M)xnrsKT(U7u3%V!<dd#mPa~z{NMM&eO<z{ea
zil7PJg<BFj5|h&#?WWT`?0#@FGse?QZEbU1h=;~WqWMeS0fby$P0>hzr&TzH)n@mg
zM~)^Y-{ImyS>^Azv1c);^Hu@R*L}tDPR7>aic?}8Vql<CzT`0f2@kUI?!Ze)@f5>*
z8gK4i92YT#Qr?G{n1`6}o}cV(G-6tw=yLEOrl`1#m~V=ZGb83Yk#LpF-Xq(8d}H*n
zqcvalMN8DzPqHBL938E{)K^&rh|zee2s!)etE5D%_d^jrz5k8sRU-L_?2Wkm#*Sxc
zL54HK{~BDKHI45q&KlnszBedb*kfBOE2s}yyHB>Xfi?NO->|*dz@B`duEXAZbTl8+
v`QmIZ{Q6yoRo@Hd&mrG~6Kpl&X$_klw-U?hmuD!K56NnRtqwigVT->3DFIDs

diff --git a/aegisub/src/ffmpegsource_common.h b/aegisub/src/ffmpegsource_common.h
index a2db3725f..80d4f9fcf 100644
--- a/aegisub/src/ffmpegsource_common.h
+++ b/aegisub/src/ffmpegsource_common.h
@@ -41,7 +41,7 @@
 #include <wx/wxprec.h>
 #include <wx/thread.h>
 #include "include/aegisub/aegisub.h"
-#include "../FFmpegSource2/ffms.h"
+#include <ffms.h>
 #include "dialog_progress.h"