Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(321)

Side by Side Diff: webkit/webkit.gyp

Issue 200031: Take out the activex control. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « webkit/tools/test_shell/test_webview_delegate_win.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2009 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'feature_defines': [ 7 'feature_defines': [
8 'ENABLE_CHANNEL_MESSAGING=1', 8 'ENABLE_CHANNEL_MESSAGING=1',
9 'ENABLE_DATABASE=1', 9 'ENABLE_DATABASE=1',
10 'ENABLE_DATAGRID=0', 10 'ENABLE_DATAGRID=0',
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 { 148 {
149 # Currently, builders assume webkit.sln builds test_shell on windows. 149 # Currently, builders assume webkit.sln builds test_shell on windows.
150 # We should change this, but for now allows trybot runs. 150 # We should change this, but for now allows trybot runs.
151 # for now. 151 # for now.
152 'target_name': 'pull_in_test_shell', 152 'target_name': 'pull_in_test_shell',
153 'type': 'none', 153 'type': 'none',
154 'conditions': [ 154 'conditions': [
155 ['OS=="win"', { 155 ['OS=="win"', {
156 'dependencies': [ 156 'dependencies': [
157 'tools/test_shell/test_shell.gyp:*', 157 'tools/test_shell/test_shell.gyp:*',
158 'activex_shim_dll/activex_shim_dll.gyp:*',
159 ], 158 ],
160 }], 159 }],
161 ], 160 ],
162 }, 161 },
163 { 162 {
164 # This target creates config.h suitable for a WebKit-V8 build and 163 # This target creates config.h suitable for a WebKit-V8 build and
165 # copies a few other files around as needed. 164 # copies a few other files around as needed.
166 'target_name': 'config', 165 'target_name': 'config',
167 'type': 'none', 166 'type': 'none',
168 'msvs_guid': '2E2D3301-2EC4-4C0F-B889-87073B30F673', 167 'msvs_guid': '2E2D3301-2EC4-4C0F-B889-87073B30F673',
(...skipping 752 matching lines...) Expand 10 before | Expand all | Expand 10 after
921 ['OS=="win"', { 920 ['OS=="win"', {
922 'dependencies': ['../build/win/system.gyp:cygwin'], 921 'dependencies': ['../build/win/system.gyp:cygwin'],
923 'sources/': [ 922 'sources/': [
924 ['exclude', 'Posix\\.cpp$'], 923 ['exclude', 'Posix\\.cpp$'],
925 ['include', '/opentype/'], 924 ['include', '/opentype/'],
926 ['include', '/TransparencyWin\\.cpp$'], 925 ['include', '/TransparencyWin\\.cpp$'],
927 ['include', '/SkiaFontWin\\.cpp$'], 926 ['include', '/SkiaFontWin\\.cpp$'],
928 ], 927 ],
929 'defines': [ 928 'defines': [
930 '__PRETTY_FUNCTION__=__FUNCTION__', 929 '__PRETTY_FUNCTION__=__FUNCTION__',
931 'DISABLE_ACTIVEX_TYPE_CONVERSION_MPLAYER2',
932 ], 930 ],
933 # This is needed because Event.h in this directory is blocked 931 # This is needed because Event.h in this directory is blocked
934 # by a system header on windows. 932 # by a system header on windows.
935 'include_dirs++': ['../third_party/WebKit/WebCore/dom'], 933 'include_dirs++': ['../third_party/WebKit/WebCore/dom'],
936 'direct_dependent_settings': { 934 'direct_dependent_settings': {
937 'include_dirs+++': ['../third_party/WebKit/WebCore/dom'], 935 'include_dirs+++': ['../third_party/WebKit/WebCore/dom'],
938 }, 936 },
939 }], 937 }],
940 ['OS!="linux" and OS!="freebsd"', {'sources/': [['exclude', '(Gtk|Linux) \\.cpp$']]}], 938 ['OS!="linux" and OS!="freebsd"', {'sources/': [['exclude', '(Gtk|Linux) \\.cpp$']]}],
941 ['OS!="mac"', {'sources/': [['exclude', 'Mac\\.(cpp|mm?)$']]}], 939 ['OS!="mac"', {'sources/': [['exclude', 'Mac\\.(cpp|mm?)$']]}],
(...skipping 583 matching lines...) Expand 10 before | Expand all | Expand 10 after
1525 'glue/webaccessibilitymanager_impl.h', 1523 'glue/webaccessibilitymanager_impl.h',
1526 'glue/webthemeengine_impl_win.cc', 1524 'glue/webthemeengine_impl_win.cc',
1527 ], 1525 ],
1528 }, { # else: OS=="win" 1526 }, { # else: OS=="win"
1529 'sources/': [['exclude', '_posix\\.cc$']], 1527 'sources/': [['exclude', '_posix\\.cc$']],
1530 'include_dirs': [ 1528 'include_dirs': [
1531 '../chrome/third_party/wtl/include', 1529 '../chrome/third_party/wtl/include',
1532 ], 1530 ],
1533 'dependencies': [ 1531 'dependencies': [
1534 '../build/win/system.gyp:cygwin', 1532 '../build/win/system.gyp:cygwin',
1535 'activex_shim/activex_shim.gyp:activex_shim',
1536 'default_plugin/default_plugin.gyp:default_plugin', 1533 'default_plugin/default_plugin.gyp:default_plugin',
1537 ], 1534 ],
1538 'sources!': [ 1535 'sources!': [
1539 'glue/plugins/plugin_stubs.cc', 1536 'glue/plugins/plugin_stubs.cc',
1540 ], 1537 ],
1541 }], 1538 }],
1542 ], 1539 ],
1543 }, 1540 },
1544 { 1541 {
1545 'target_name': 'inspector_resources', 1542 'target_name': 'inspector_resources',
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
1579 'files': [ 1576 'files': [
1580 1577
1581 '<@(webinspector_image_files)', 1578 '<@(webinspector_image_files)',
1582 1579
1583 ], 1580 ],
1584 }, 1581 },
1585 ], 1582 ],
1586 }, 1583 },
1587 ], 1584 ],
1588 } 1585 }
OLDNEW
« no previous file with comments | « webkit/tools/test_shell/test_webview_delegate_win.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698