diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-13 22:10:12 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-13 22:10:12 +0000 |
| commit | 116f3a823b65833ef8a5c56dcf8c2c33a69b914d (patch) | |
| tree | c71b3ccdc0bad1bf28d3c0bd4d63d701870e29ee /webkit/webkit.sln | |
| parent | 2c56af1a6677c9b1141778173dcb1b3bdb63f14b (diff) | |
| download | chromium_src-116f3a823b65833ef8a5c56dcf8c2c33a69b914d.zip chromium_src-116f3a823b65833ef8a5c56dcf8c2c33a69b914d.tar.gz chromium_src-116f3a823b65833ef8a5c56dcf8c2c33a69b914d.tar.bz2 | |
Checking in the media project files (layout based on net/base libraries).
Added a dummy media.cc file in order to produce media.lib so there are no
linker errors when building media_unittests.exe. Currently chrome_dll
does NOT depend on media so it will not be linked in, which is OK for now :)
Review URL: http://codereview.chromium.org/10683
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5389 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/webkit.sln')
| -rw-r--r-- | webkit/webkit.sln | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/webkit/webkit.sln b/webkit/webkit.sln index c9ba67c..e5659ab 100644 --- a/webkit/webkit.sln +++ b/webkit/webkit.sln @@ -127,6 +127,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tld_cleanup", "..\net\build {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}") = "googleurl", "..\googleurl\build\googleurl.vcproj", "{EF5E94AB-B646-4E5B-A058-52EF07B8351C}"
ProjectSection(WebsiteProperties) = preProject
Debug.AspNetCompiler.Debug = "True"
@@ -492,6 +498,10 @@ Global {625A8F11-2B4E-45B4-BD99-C6D629C606C0}.Debug|Win32.Build.0 = Debug|Win32
{625A8F11-2B4E-45B4-BD99-C6D629C606C0}.Release|Win32.ActiveCfg = Release|Win32
{625A8F11-2B4E-45B4-BD99-C6D629C606C0}.Release|Win32.Build.0 = Release|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|Win32.ActiveCfg = Release|Win32
+ {6AE76406-B03B-11DD-94B1-80B556D89593}.Release|Win32.Build.0 = Release|Win32
{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}.Debug|Win32.ActiveCfg = Debug|Win32
{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}.Debug|Win32.Build.0 = Debug|Win32
{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}.Release|Win32.ActiveCfg = Release|Win32
@@ -616,6 +626,7 @@ Global {5916D37D-8C97-424F-A904-74E52594C2D6} = {4BC2C9E2-78FA-446A-B6E0-85689A2B4D3D}
{60B43839-95E6-4526-A661-209F16335E0E} = {4BC2C9E2-78FA-446A-B6E0-85689A2B4D3D}
{625A8F11-2B4E-45B4-BD99-C6D629C606C0} = {4BC2C9E2-78FA-446A-B6E0-85689A2B4D3D}
+ {6AE76406-B03B-11DD-94B1-80B556D89593} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}
{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}
{7100F41F-868D-4E99-80A2-AF8E6574749D} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}
{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}
|