diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-25 01:38:02 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-25 01:38:02 +0000 |
| commit | 8c414fb2b7a662540fb8f7f67802fec788347ac4 (patch) | |
| tree | 3badbc6db5026bcdc888ca343e4f3c083e0f64c5 /chrome | |
| parent | f2ac24f080bba97cafaca933e7d4efcf0e9eb9d6 (diff) | |
| download | chromium_src-8c414fb2b7a662540fb8f7f67802fec788347ac4.zip chromium_src-8c414fb2b7a662540fb8f7f67802fec788347ac4.tar.gz chromium_src-8c414fb2b7a662540fb8f7f67802fec788347ac4.tar.bz2 | |
Added FFmpeg project to chrome, chrome_kjs and media solution files.
Review URL: http://codereview.chromium.org/28011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10319 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/chrome.sln | 11 | ||||
| -rw-r--r-- | chrome/chrome_kjs.sln | 13 |
2 files changed, 24 insertions, 0 deletions
diff --git a/chrome/chrome.sln b/chrome/chrome.sln index 25fb503..54e54b9 100644 --- a/chrome/chrome.sln +++ b/chrome/chrome.sln @@ -98,6 +98,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\third_party\zlib EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjpeg", "..\third_party\libjpeg\libjpeg.vcproj", "{238CE175-76CE-4A25-A676-69D115885601}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ffmpeg", "..\third_party\ffmpeg\ffmpeg.vcproj", "{D7A94F58-576A-45D9-A45F-EB87C63ABBB0}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "image_diff", "tools\test\image_diff\image_diff.vcproj", "{50B079C7-CD01-42D3-B8C4-9F8D9322E822}" ProjectSection(ProjectDependencies) = postProject {1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165} @@ -2416,6 +2418,14 @@ Global {D703D7A0-EDC1-4FE6-9E22-56154155B24E}.Release|Mixed Platforms.Build.0 = Release|Win32 {D703D7A0-EDC1-4FE6-9E22-56154155B24E}.Release|Win32.ActiveCfg = Release|Win32 {D703D7A0-EDC1-4FE6-9E22-56154155B24E}.Release|Win32.Build.0 = Release|Win32 + {D7A94F58-576A-45D9-A45F-EB87C63ABBB0}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 + {D7A94F58-576A-45D9-A45F-EB87C63ABBB0}.Debug|Mixed Platforms.Build.0 = Debug|Win32 + {D7A94F58-576A-45D9-A45F-EB87C63ABBB0}.Debug|Win32.ActiveCfg = Debug|Win32 + {D7A94F58-576A-45D9-A45F-EB87C63ABBB0}.Debug|Win32.Build.0 = Debug|Win32 + {D7A94F58-576A-45D9-A45F-EB87C63ABBB0}.Release|Mixed Platforms.ActiveCfg = Release|Win32 + {D7A94F58-576A-45D9-A45F-EB87C63ABBB0}.Release|Mixed Platforms.Build.0 = Release|Win32 + {D7A94F58-576A-45D9-A45F-EB87C63ABBB0}.Release|Win32.ActiveCfg = Release|Win32 + {D7A94F58-576A-45D9-A45F-EB87C63ABBB0}.Release|Win32.Build.0 = Release|Win32 {D7ED06E8-6138-4CE3-A906-5EF1D9C804E0}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 {D7ED06E8-6138-4CE3-A906-5EF1D9C804E0}.Debug|Mixed Platforms.Build.0 = Debug|Win32 {D7ED06E8-6138-4CE3-A906-5EF1D9C804E0}.Debug|Win32.ActiveCfg = Debug|Win32 @@ -2755,6 +2765,7 @@ Global {D3E6C0FD-54C7-4FF2-9AE1-72F2DAFD820C} = {1174D37F-6ABB-45DA-81B3-C631281273B7} {D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA} {D703D7A0-EDC1-4FE6-9E22-56154155B24E} = {97555540-8163-4D0F-BCAC-EFA0FFED3453} + {D7A94F58-576A-45D9-A45F-EB87C63ABBB0} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA} {D7ED06E8-6138-4CE3-A906-5EF1D9C804E0} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA} {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {B6867423-23BD-4588-9321-2D500F128A3D} {DA5C6FCB-FCFD-49B8-8DDA-8351638096DB} = {2325D8C4-8EF5-42AC-8900-492225750DE4} diff --git a/chrome/chrome_kjs.sln b/chrome/chrome_kjs.sln index 3500797..20c9984 100644 --- a/chrome/chrome_kjs.sln +++ b/chrome/chrome_kjs.sln @@ -98,6 +98,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\third_party\zlib EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjpeg", "..\third_party\libjpeg\libjpeg.vcproj", "{238CE175-76CE-4A25-A676-69D115885601}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ffmpeg", "..\third_party\ffmpeg\ffmpeg.vcproj", "{D7A94F58-576A-45D9-A45F-EB87C63ABBB0}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "image_diff", "tools\test\image_diff\image_diff.vcproj", "{50B079C7-CD01-42D3-B8C4-9F8D9322E822}" ProjectSection(ProjectDependencies) = postProject {1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165} @@ -2319,6 +2321,16 @@ Global {D703D7A0-EDC1-4FE6-9E22-56154155B24E}.Release|Mixed Platforms.Build.0 = Release|Win32 {D703D7A0-EDC1-4FE6-9E22-56154155B24E}.Release|Win32.ActiveCfg = Release|Win32 {D703D7A0-EDC1-4FE6-9E22-56154155B24E}.Release|Win32.Build.0 = Release|Win32 + {D7A94F58-576A-45D9-A45F-EB87C63ABBB0}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {D7A94F58-576A-45D9-A45F-EB87C63ABBB0}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 + {D7A94F58-576A-45D9-A45F-EB87C63ABBB0}.Debug|Mixed Platforms.Build.0 = Debug|Win32 + {D7A94F58-576A-45D9-A45F-EB87C63ABBB0}.Debug|Win32.ActiveCfg = Debug|Win32 + {D7A94F58-576A-45D9-A45F-EB87C63ABBB0}.Debug|Win32.Build.0 = Debug|Win32 + {D7A94F58-576A-45D9-A45F-EB87C63ABBB0}.Release|Any CPU.ActiveCfg = Release|Win32 + {D7A94F58-576A-45D9-A45F-EB87C63ABBB0}.Release|Mixed Platforms.ActiveCfg = Release|Win32 + {D7A94F58-576A-45D9-A45F-EB87C63ABBB0}.Release|Mixed Platforms.Build.0 = Release|Win32 + {D7A94F58-576A-45D9-A45F-EB87C63ABBB0}.Release|Win32.ActiveCfg = Release|Win32 + {D7A94F58-576A-45D9-A45F-EB87C63ABBB0}.Release|Win32.Build.0 = Release|Win32 {D7ED06E8-6138-4CE3-A906-5EF1D9C804E0}.Debug|Any CPU.ActiveCfg = Debug|Win32 {D7ED06E8-6138-4CE3-A906-5EF1D9C804E0}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 {D7ED06E8-6138-4CE3-A906-5EF1D9C804E0}.Debug|Mixed Platforms.Build.0 = Debug|Win32 @@ -2672,6 +2684,7 @@ Global {D3E6C0FD-54C7-4FF2-9AE1-72F2DAFD820C} = {1174D37F-6ABB-45DA-81B3-C631281273B7} {D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA} {D703D7A0-EDC1-4FE6-9E22-56154155B24E} = {97555540-8163-4D0F-BCAC-EFA0FFED3453} + {D7A94F58-576A-45D9-A45F-EB87C63ABBB0} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA} {D7ED06E8-6138-4CE3-A906-5EF1D9C804E0} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA} {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {B6867423-23BD-4588-9321-2D500F128A3D} {DA5C6FCB-FCFD-49B8-8DDA-8351638096DB} = {2325D8C4-8EF5-42AC-8900-492225750DE4} |