diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-16 21:46:14 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-16 21:46:14 +0000 |
| commit | fa41969da48955ec4b4ab30589db22322e065a32 (patch) | |
| tree | 4a165afed24e0c4dc38bcd485100d8d56397da40 /webkit/glue/SConscript | |
| parent | 812eaca72f309bcbb51ee8f386a7d33429c3a314 (diff) | |
| download | chromium_src-fa41969da48955ec4b4ab30589db22322e065a32.zip chromium_src-fa41969da48955ec4b4ab30589db22322e065a32.tar.gz chromium_src-fa41969da48955ec4b4ab30589db22322e065a32.tar.bz2 | |
Replace MSVC pragmas with the macro. Also adds two files
from webkit/glue to the build rule.
Patch from icefox (TorchMobile)
http://codereview.chromium.org/7418
Review URL: http://codereview.chromium.org/7454
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3490 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/SConscript')
| -rw-r--r-- | webkit/glue/SConscript | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/webkit/glue/SConscript b/webkit/glue/SConscript index 2ce3611..74881d9 100644 --- a/webkit/glue/SConscript +++ b/webkit/glue/SConscript @@ -8,13 +8,13 @@ env = env.Clone() if env['PLATFORM'] == 'win32': env.Append( - CCFLAGS = [ - '/TP', + CCFLAGS = [ + '/TP', - '/WX', + '/WX', - '/wd4800', - ], + '/wd4800', + ], ) input_files = [ @@ -29,6 +29,7 @@ input_files = [ 'cpp_variant.cc', 'debugger.cc', 'dom_operations.cc', + 'dom_serializer.cc', 'dragclient_impl.cc', 'editor_client_impl.cc', 'entity_map.cc', @@ -45,6 +46,7 @@ input_files = [ 'password_autocomplete_listener.cc', 'password_form_dom_manager.cc', 'resource_fetcher.cc', + 'resource_handle_impl.cc', 'searchable_form_data.cc', 'simple_clipboard_impl.cc', 'stacking_order_iterator.cc', @@ -68,7 +70,6 @@ if env['PLATFORM'] == 'win32': input_files.append([ '$PENDING_DIR/AccessibleBase.cpp', '$PENDING_DIR/AccessibleDocument.cpp', - 'dom_serializer.cc', 'glue_accessibility.cc', 'plugins/mozilla_extensions.cc', 'plugins/plugin_host.cc', @@ -79,7 +80,6 @@ if env['PLATFORM'] == 'win32': 'plugins/plugin_stream_url.cc', 'plugins/plugin_string_stream.cc', 'plugins/webplugin_delegate_impl.cc', - 'resource_handle_win.cc', 'webdropdata.cc', 'webinputevent_win.cc', 'webplugin_impl.cc', |