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

Side by Side Diff: webkit/webkit.gyp

Issue 100195: Enable video in linux build and remove unneeded ifdefs to guard windows. (Closed)
Patch Set: Fix inifite loop. Created 11 years, 7 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
« no previous file with comments | « media/media.gyp ('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_DASHBOARD_SUPPORT=0', 10 'ENABLE_DASHBOARD_SUPPORT=0',
11 'ENABLE_JAVASCRIPT_DEBUGGER=0', 11 'ENABLE_JAVASCRIPT_DEBUGGER=0',
12 'ENABLE_JSC_MULTIPLE_THREADS=0', 12 'ENABLE_JSC_MULTIPLE_THREADS=0',
13 'ENABLE_ICONDATABASE=0', 13 'ENABLE_ICONDATABASE=0',
14 'ENABLE_XSLT=1', 14 'ENABLE_XSLT=1',
15 'ENABLE_XPATH=1', 15 'ENABLE_XPATH=1',
16 'ENABLE_SVG=1', 16 'ENABLE_SVG=1',
17 'ENABLE_SVG_ANIMATION=1', 17 'ENABLE_SVG_ANIMATION=1',
18 'ENABLE_SVG_AS_IMAGE=1', 18 'ENABLE_SVG_AS_IMAGE=1',
19 'ENABLE_SVG_USE=1', 19 'ENABLE_SVG_USE=1',
20 'ENABLE_SVG_FOREIGN_OBJECT=1', 20 'ENABLE_SVG_FOREIGN_OBJECT=1',
21 'ENABLE_SVG_FONTS=1', 21 'ENABLE_SVG_FONTS=1',
22 'ENABLE_VIDEO=1',
22 'ENABLE_WORKERS=1', 23 'ENABLE_WORKERS=1',
23 ], 24 ],
24 'non_feature_defines': [ 25 'non_feature_defines': [
25 'BUILDING_CHROMIUM__=1', 26 'BUILDING_CHROMIUM__=1',
26 'USE_GOOGLE_URL_LIBRARY=1', 27 'USE_GOOGLE_URL_LIBRARY=1',
27 'USE_SYSTEM_MALLOC=1', 28 'USE_SYSTEM_MALLOC=1',
28 ], 29 ],
29 'webcore_include_dirs': [ 30 'webcore_include_dirs': [
30 'pending', 31 'pending',
31 '../third_party/WebKit/WebCore/bindings/v8', 32 '../third_party/WebKit/WebCore/bindings/v8',
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 ], 100 ],
100 'webcore_include_dirs': [ 101 'webcore_include_dirs': [
101 # TODO(port): Eliminate dependency on platform/mac and related 102 # TODO(port): Eliminate dependency on platform/mac and related
102 # directories. 103 # directories.
103 '../third_party/WebKit/WebCore/loader/archive/cf', 104 '../third_party/WebKit/WebCore/loader/archive/cf',
104 '../third_party/WebKit/WebCore/platform/mac', 105 '../third_party/WebKit/WebCore/platform/mac',
105 '../third_party/WebKit/WebCore/platform/text/mac', 106 '../third_party/WebKit/WebCore/platform/text/mac',
106 ], 107 ],
107 }], 108 }],
108 ['OS=="win"', { 109 ['OS=="win"', {
109 'feature_defines': [
110 'ENABLE_VIDEO=1'
111 ],
112 'non_feature_defines': [ 110 'non_feature_defines': [
113 'CRASH=__debugbreak', 111 'CRASH=__debugbreak',
114 # Match Safari and Mozilla on Windows. 112 # Match Safari and Mozilla on Windows.
115 'WEBCORE_NAVIGATOR_PLATFORM="Win32"', 113 'WEBCORE_NAVIGATOR_PLATFORM="Win32"',
116 ], 114 ],
117 'webcore_include_dirs': [ 115 'webcore_include_dirs': [
118 '../third_party/WebKit/WebCore/page/win', 116 '../third_party/WebKit/WebCore/page/win',
119 '../third_party/WebKit/WebCore/platform/graphics/win', 117 '../third_party/WebKit/WebCore/platform/graphics/win',
120 '../third_party/WebKit/WebCore/platform/text/win', 118 '../third_party/WebKit/WebCore/platform/text/win',
121 '../third_party/WebKit/WebCore/platform/win', 119 '../third_party/WebKit/WebCore/platform/win',
122 ], 120 ],
123 }, { # else: OS!="win"
124 'feature_defines': [
125 'ENABLE_VIDEO=0'
126 ],
127 }], 121 }],
128 ], 122 ],
129 }, 123 },
130 'includes': [ 124 'includes': [
131 '../build/common.gypi', 125 '../build/common.gypi',
132 ], 126 ],
133 'targets': [ 127 'targets': [
134 { 128 {
135 # Currently, builders assume webkit.sln builds test_shell on windows. 129 # Currently, builders assume webkit.sln builds test_shell on windows.
136 # We should change this, but for now allows trybot runs. 130 # We should change this, but for now allows trybot runs.
(...skipping 3994 matching lines...) Expand 10 before | Expand all | Expand 10 after
4131 'include_dirs+++': ['../third_party/WebKit/WebCore/dom'], 4125 'include_dirs+++': ['../third_party/WebKit/WebCore/dom'],
4132 }, 4126 },
4133 }], 4127 }],
4134 ['OS!="linux"', {'sources/': [['exclude', '(Gtk|Linux)\\.cpp$']]}], 4128 ['OS!="linux"', {'sources/': [['exclude', '(Gtk|Linux)\\.cpp$']]}],
4135 ['OS!="mac"', {'sources/': [['exclude', 'Mac\\.(cpp|mm?)$']]}], 4129 ['OS!="mac"', {'sources/': [['exclude', 'Mac\\.(cpp|mm?)$']]}],
4136 ['OS!="win"', { 4130 ['OS!="win"', {
4137 'sources/': [ 4131 'sources/': [
4138 ['exclude', 'Win\\.cpp$'], 4132 ['exclude', 'Win\\.cpp$'],
4139 ['exclude', '/(Windows|Uniscribe)[^/]*\\.cpp$'] 4133 ['exclude', '/(Windows|Uniscribe)[^/]*\\.cpp$']
4140 ], 4134 ],
4141 'sources!': [
4142 '../third_party/WebKit/WebCore/platform/graphics/MediaPlayer.cpp',
4143 ],
4144 }], 4135 }],
4145 ], 4136 ],
4146 }, 4137 },
4147 { 4138 {
4148 'target_name': 'webkit', 4139 'target_name': 'webkit',
4149 'type': '<(library)', 4140 'type': '<(library)',
4150 'msvs_guid': '5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65', 4141 'msvs_guid': '5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65',
4151 'dependencies': [ 4142 'dependencies': [
4152 'webcore', 4143 'webcore',
4153 ], 4144 ],
(...skipping 620 matching lines...) Expand 10 before | Expand all | Expand 10 after
4774 '../third_party/WebKit/WebCore/inspector/front-end/Images/userInputP reviousIcon.png', 4765 '../third_party/WebKit/WebCore/inspector/front-end/Images/userInputP reviousIcon.png',
4775 '../third_party/WebKit/WebCore/inspector/front-end/Images/warningIco n.png', 4766 '../third_party/WebKit/WebCore/inspector/front-end/Images/warningIco n.png',
4776 '../third_party/WebKit/WebCore/inspector/front-end/Images/warningMed iumIcon.png', 4767 '../third_party/WebKit/WebCore/inspector/front-end/Images/warningMed iumIcon.png',
4777 '../third_party/WebKit/WebCore/inspector/front-end/Images/warningsEr rors.png', 4768 '../third_party/WebKit/WebCore/inspector/front-end/Images/warningsEr rors.png',
4778 ], 4769 ],
4779 }, 4770 },
4780 ], 4771 ],
4781 }, 4772 },
4782 ], 4773 ],
4783 } 4774 }
OLDNEW
« no previous file with comments | « media/media.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698