OLD | NEW |
1 # | 1 # |
2 # Copyright (C) 2011 Google Inc. All rights reserved. | 2 # Copyright (C) 2011 Google Inc. All rights reserved. |
3 # | 3 # |
4 # Redistribution and use in source and binary forms, with or without | 4 # Redistribution and use in source and binary forms, with or without |
5 # modification, are permitted provided that the following conditions are | 5 # modification, are permitted provided that the following conditions are |
6 # met: | 6 # met: |
7 # | 7 # |
8 # * Redistributions of source code must retain the above copyright | 8 # * Redistributions of source code must retain the above copyright |
9 # notice, this list of conditions and the following disclaimer. | 9 # notice, this list of conditions and the following disclaimer. |
10 # * Redistributions in binary form must reproduce the above | 10 # * Redistributions in binary form must reproduce the above |
(...skipping 26 matching lines...) Expand all Loading... |
37 '../modules/modules.gypi', | 37 '../modules/modules.gypi', |
38 '../wtf/wtf.gypi', | 38 '../wtf/wtf.gypi', |
39 'web.gypi', | 39 'web.gypi', |
40 ], | 40 ], |
41 'targets': [ | 41 'targets': [ |
42 { | 42 { |
43 'target_name': 'webkit', | 43 'target_name': 'webkit', |
44 'type': '<(component)', | 44 'type': '<(component)', |
45 'variables': { 'enable_wexit_time_destructors': 1, }, | 45 'variables': { 'enable_wexit_time_destructors': 1, }, |
46 'dependencies': [ | 46 'dependencies': [ |
| 47 '../platform/blink_platform.gyp:blink_common', |
47 '../core/core.gyp:webcore', | 48 '../core/core.gyp:webcore', |
48 '../modules/modules.gyp:modules', | 49 '../modules/modules.gyp:modules', |
49 '<(DEPTH)/skia/skia.gyp:skia', | 50 '<(DEPTH)/skia/skia.gyp:skia', |
50 '<(DEPTH)/third_party/angle_dx11/src/build_angle.gyp:translator_
glsl', | 51 '<(DEPTH)/third_party/angle_dx11/src/build_angle.gyp:translator_
glsl', |
51 '<(DEPTH)/third_party/icu/icu.gyp:icuuc', | 52 '<(DEPTH)/third_party/icu/icu.gyp:icuuc', |
52 '<(DEPTH)/third_party/npapi/npapi.gyp:npapi', | 53 '<(DEPTH)/third_party/npapi/npapi.gyp:npapi', |
53 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', | 54 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', |
54 'blink_common', | |
55 ], | 55 ], |
56 'export_dependent_settings': [ | 56 'export_dependent_settings': [ |
57 '<(DEPTH)/skia/skia.gyp:skia', | 57 '<(DEPTH)/skia/skia.gyp:skia', |
58 '<(DEPTH)/third_party/icu/icu.gyp:icuuc', | 58 '<(DEPTH)/third_party/icu/icu.gyp:icuuc', |
59 '<(DEPTH)/third_party/npapi/npapi.gyp:npapi', | 59 '<(DEPTH)/third_party/npapi/npapi.gyp:npapi', |
60 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', | 60 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', |
61 ], | 61 ], |
62 'include_dirs': [ | 62 'include_dirs': [ |
63 '../../public/web', | 63 '../../public/web', |
64 '../web', | 64 '../web', |
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
256 '../../public/web', | 256 '../../public/web', |
257 '../core/testing/v8', # for WebCoreTestSupport.h, needed
to link in window.internals code. | 257 '../core/testing/v8', # for WebCoreTestSupport.h, needed
to link in window.internals code. |
258 '../../', | 258 '../../', |
259 ], | 259 ], |
260 'sources': [ | 260 'sources': [ |
261 'WebTestingSupport.cpp', | 261 'WebTestingSupport.cpp', |
262 ], | 262 ], |
263 }], | 263 }], |
264 ], | 264 ], |
265 }, | 265 }, |
266 { | |
267 'target_name': 'blink_common', | |
268 'type': '<(component)', | |
269 'variables': { 'enable_wexit_time_destructors': 1 }, | |
270 'dependencies': [ | |
271 '../wtf/wtf.gyp:wtf', | |
272 '<(DEPTH)/skia/skia.gyp:skia', | |
273 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', | |
274 ], | |
275 'export_dependent_settings': [ | |
276 '<(DEPTH)/skia/skia.gyp:skia', | |
277 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', | |
278 ], | |
279 'defines': [ | |
280 'INSIDE_BLINK', | |
281 'BLINK_COMMON_IMPLEMENTATION=1', | |
282 ], | |
283 'include_dirs': [ | |
284 '..', | |
285 '../..', | |
286 ], | |
287 'sources': [ | |
288 '../core/platform/chromium/support/WebCString.cpp', | |
289 '../core/platform/chromium/support/WebString.cpp', | |
290 'WebCommon.cpp', | |
291 ], | |
292 }, | |
293 ], # targets | 266 ], # targets |
294 'conditions': [ | 267 'conditions': [ |
295 ['gcc_version>=46', { | 268 ['gcc_version>=46', { |
296 'target_defaults': { | 269 'target_defaults': { |
297 # Disable warnings about c++0x compatibility, as some names (suc
h | 270 # Disable warnings about c++0x compatibility, as some names (suc
h |
298 # as nullptr) conflict with upcoming c++0x types. | 271 # as nullptr) conflict with upcoming c++0x types. |
299 'cflags_cc': ['-Wno-c++0x-compat'], | 272 'cflags_cc': ['-Wno-c++0x-compat'], |
300 }, | 273 }, |
301 }], | 274 }], |
302 ['OS=="mac"', { | 275 ['OS=="mac"', { |
(...skipping 12 matching lines...) Expand all Loading... |
315 ['clang==1', { | 288 ['clang==1', { |
316 'target_defaults': { | 289 'target_defaults': { |
317 'cflags': ['-Wglobal-constructors'], | 290 'cflags': ['-Wglobal-constructors'], |
318 'xcode_settings': { | 291 'xcode_settings': { |
319 'WARNING_CFLAGS': ['-Wglobal-constructors'], | 292 'WARNING_CFLAGS': ['-Wglobal-constructors'], |
320 }, | 293 }, |
321 }, | 294 }, |
322 }], | 295 }], |
323 ], # conditions | 296 ], # conditions |
324 } | 297 } |
OLD | NEW |