Recommit of media project files due to a mistake in media_unittest.vcproj

that worked in Visual Studio but broke on IncrediBuild.  Also updated to
include dmg_fp dependency.

Trying ONE MORE TIME because I think gcl breaks with "A +" files (I used "svn merge -c REV ." to un-rollback my change).

Original: http://codereview.chromium.org/10683
Rollback: http://codereview.chromium.org/10908
Review URL: http://codereview.chromium.org/10733

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5490 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 39 insertions, 0 deletions

diff --git a/chrome/chrome_kjs.sln b/chrome/chrome_kjs.sln
index b2e1499..4887d03 100644
--- a/chrome/chrome_kjs.sln
+++ b/chrome/chrome_kjs.sln
@@ -833,6 +833,23 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "net_perftests", "..\net\bui
 		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}

 	EndProjectSection

 EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "media", "..\media\build\media.vcproj", "{6AE76406-B03B-11DD-94B1-80B556D89593}"

+	ProjectSection(WebsiteProperties) = preProject

+		Debug.AspNetCompiler.Debug = "True"

+		Release.AspNetCompiler.Debug = "False"

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "media_unittests", "..\media\build\media_unittests.vcproj", "{C8C6183C-B03C-11DD-B471-DFD256D89593}"

+	ProjectSection(WebsiteProperties) = preProject

+		Debug.AspNetCompiler.Debug = "True"

+		Release.AspNetCompiler.Debug = "False"

+	EndProjectSection

+	ProjectSection(ProjectDependencies) = postProject

+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}

+		{6AE76406-B03B-11DD-94B1-80B556D89593} = {6AE76406-B03B-11DD-94B1-80B556D89593}

+		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}

+	EndProjectSection

+EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "base", "..\base\build\base.vcproj", "{1832A374-8A74-4F9E-B536-69A699B3E165}"

 	ProjectSection(WebsiteProperties) = preProject

 		Debug.AspNetCompiler.Debug = "True"

@@ -2247,6 +2264,16 @@ Global
 		{65C78BBB-8FCB-48E4-94C8-1F0F981929AF}.Release|Mixed Platforms.Build.0 = Release|Win32

 		{65C78BBB-8FCB-48E4-94C8-1F0F981929AF}.Release|Win32.ActiveCfg = Release|Win32

 		{65C78BBB-8FCB-48E4-94C8-1F0F981929AF}.Release|Win32.Build.0 = Release|Win32

+		{6AE76406-B03B-11DD-94B1-80B556D89593}.Debug|Any CPU.ActiveCfg = Debug|Win32

+		{6AE76406-B03B-11DD-94B1-80B556D89593}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32

+		{6AE76406-B03B-11DD-94B1-80B556D89593}.Debug|Mixed Platforms.Build.0 = Debug|Win32

+		{6AE76406-B03B-11DD-94B1-80B556D89593}.Debug|Win32.ActiveCfg = Debug|Win32

+		{6AE76406-B03B-11DD-94B1-80B556D89593}.Debug|Win32.Build.0 = Debug|Win32

+		{6AE76406-B03B-11DD-94B1-80B556D89593}.Release|Any CPU.ActiveCfg = Release|Win32

+		{6AE76406-B03B-11DD-94B1-80B556D89593}.Release|Mixed Platforms.ActiveCfg = Release|Win32

+		{6AE76406-B03B-11DD-94B1-80B556D89593}.Release|Mixed Platforms.Build.0 = Release|Win32

+		{6AE76406-B03B-11DD-94B1-80B556D89593}.Release|Win32.ActiveCfg = Release|Win32

+		{6AE76406-B03B-11DD-94B1-80B556D89593}.Release|Win32.Build.0 = Release|Win32

 		{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}.Debug|Any CPU.ActiveCfg = Debug|Win32

 		{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32

 		{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}.Debug|Mixed Platforms.Build.0 = Debug|Win32

@@ -2737,6 +2764,16 @@ Global
 		{C70D3509-57C4-4326-90C1-2EC0AE34848D}.Release|Mixed Platforms.Build.0 = Release|Win32

 		{C70D3509-57C4-4326-90C1-2EC0AE34848D}.Release|Win32.ActiveCfg = Release|Win32

 		{C70D3509-57C4-4326-90C1-2EC0AE34848D}.Release|Win32.Build.0 = Release|Win32

+		{C8C6183C-B03C-11DD-B471-DFD256D89593}.Debug|Any CPU.ActiveCfg = Debug|Win32

+		{C8C6183C-B03C-11DD-B471-DFD256D89593}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32

+		{C8C6183C-B03C-11DD-B471-DFD256D89593}.Debug|Mixed Platforms.Build.0 = Debug|Win32

+		{C8C6183C-B03C-11DD-B471-DFD256D89593}.Debug|Win32.ActiveCfg = Debug|Win32

+		{C8C6183C-B03C-11DD-B471-DFD256D89593}.Debug|Win32.Build.0 = Debug|Win32

+		{C8C6183C-B03C-11DD-B471-DFD256D89593}.Release|Any CPU.ActiveCfg = Release|Win32

+		{C8C6183C-B03C-11DD-B471-DFD256D89593}.Release|Mixed Platforms.ActiveCfg = Release|Win32

+		{C8C6183C-B03C-11DD-B471-DFD256D89593}.Release|Mixed Platforms.Build.0 = Release|Win32

+		{C8C6183C-B03C-11DD-B471-DFD256D89593}.Release|Win32.ActiveCfg = Release|Win32

+		{C8C6183C-B03C-11DD-B471-DFD256D89593}.Release|Win32.Build.0 = Release|Win32

 		{C9E0BD1D-B175-4A91-8380-3FDC81FAB9D7}.Debug|Any CPU.ActiveCfg = Debug|Win32

 		{C9E0BD1D-B175-4A91-8380-3FDC81FAB9D7}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32

 		{C9E0BD1D-B175-4A91-8380-3FDC81FAB9D7}.Debug|Mixed Platforms.Build.0 = Debug|Win32

@@ -3126,6 +3163,7 @@ Global
 		{63011A7B-CE4D-4DF1-B5DA-1B133C14A2E8} = {2325D8C4-8EF5-42AC-8900-492225750DE4}

 		{64D81334-DE73-457D-8FC1-9492508A2663} = {2325D8C4-8EF5-42AC-8900-492225750DE4}

 		{65C78BBB-8FCB-48E4-94C8-1F0F981929AF} = {2325D8C4-8EF5-42AC-8900-492225750DE4}

+		{6AE76406-B03B-11DD-94B1-80B556D89593} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}

 		{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}

 		{6F9258E5-294F-47B2-919D-17FFE7A8B751} = {97555540-8163-4D0F-BCAC-EFA0FFED3453}

 		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}

@@ -3178,6 +3216,7 @@ Global
 		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}

 		{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09} = {CB43561E-A6F8-49E2-96A2-3F2BA1FFF21E}

 		{C70D3509-57C4-4326-90C1-2EC0AE34848D} = {2325D8C4-8EF5-42AC-8900-492225750DE4}

+		{C8C6183C-B03C-11DD-B471-DFD256D89593} = {1174D37F-6ABB-45DA-81B3-C631281273B7}

 		{C9E0BD1D-B175-4A91-8380-3FDC81FAB9D7} = {1174D37F-6ABB-45DA-81B3-C631281273B7}

 		{CA6CE3BB-B746-4D91-85A0-6944DD273E2A} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}

 		{CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3} = {2325D8C4-8EF5-42AC-8900-492225750DE4}