diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-25 23:55:41 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-25 23:55:41 +0000 |
| commit | 47c10ee88d695ac7becebf06677634fd67f26796 (patch) | |
| tree | fd0fc365db13d589223bacd4b800aedb168f67cd /webkit/SConscript | |
| parent | 0e8ada09ab49bafd0841393ef30ad550ecf9dfcb (diff) | |
| download | chromium_src-47c10ee88d695ac7becebf06677634fd67f26796.zip chromium_src-47c10ee88d695ac7becebf06677634fd67f26796.tar.gz chromium_src-47c10ee88d695ac7becebf06677634fd67f26796.tar.bz2 | |
Repair the SCons test_shell build on Windows:
* Remove the BUILDING_CHROMIUM__ definition so SCons still builds
webkit with the currently-checked-in cairo.h shim instead of the
new PLATFORM_SKIA definitions.
* Link with the new sdch library.
* Remove /WX from the test_shell compilation.
* Add the additional platform-specific port source files to the
input_files list, don't replace the list with a subset.
Review URL: http://codereview.chromium.org/4282
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2617 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/SConscript')
| -rw-r--r-- | webkit/SConscript | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/webkit/SConscript b/webkit/SConscript index 485d4e7..4daa31b 100644 --- a/webkit/SConscript +++ b/webkit/SConscript @@ -129,7 +129,10 @@ env.Append( ['ANDROID_CANVAS_IMPL', '1'], ['WEBCORE_NAVIGATOR_PLATFORM', '"\\"Win32\\""'], 'USE_GOOGLE_URL_LIBRARY', - 'BUILDING_CHROMIUM__', + # TODO: Uncomment this when building the merged WebKit, + # so it uses the PLATFORM_SKIA definitions instead of + # the old cairo.h shim. + #'BUILDING_CHROMIUM__', 'CHROMIUM_BUILD', '_SECURE_ATL', |