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

Unified Diff: webkit/common/webkit_common.gypi

Issue 15971005: Move the WebCursor sources from webkit/glue to webkit/common/cursors. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/common/cursors/webcursor_win.cc ('k') | webkit/common/webkit_common_export.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/common/webkit_common.gypi
===================================================================
--- webkit/common/webkit_common.gypi (revision 203204)
+++ webkit/common/webkit_common.gypi (working copy)
@@ -19,4 +19,87 @@
'<@(webkit_common_quota_sources)',
],
},
+
+ 'targets': [
+ {
+ 'target_name': 'webkit_common',
+ 'type': '<(component)',
+ 'variables': { 'enable_wexit_time_destructors': 1, },
+ 'defines': [
+ 'WEBKIT_COMMON_IMPLEMENTATION',
+ ],
+ 'dependencies': [
+ '<(DEPTH)/base/base.gyp:base_i18n',
+ '<(DEPTH)/base/base.gyp:base',
+ '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+ '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl',
+ '<(DEPTH)/net/net.gyp:net',
+ '<(DEPTH)/skia/skia.gyp:skia',
+ '<(DEPTH)/ui/ui.gyp:ui',
+ '<(DEPTH)/ui/ui.gyp:ui_resources',
+ 'webkit_resources',
+ ],
+
+ 'include_dirs': [
+ '<(INTERMEDIATE_DIR)',
+ '<(SHARED_INTERMEDIATE_DIR)/ui',
+ '<(SHARED_INTERMEDIATE_DIR)/webkit',
+ ],
+
+ 'sources': [
+ 'cursors/webcursor.cc',
+ 'cursors/webcursor.h',
+ 'cursors/webcursor_android.cc',
+ 'cursors/webcursor_aura.cc',
+ 'cursors/webcursor_aurawin.cc',
+ 'cursors/webcursor_aurax11.cc',
+ 'cursors/webcursor_null.cc',
+ 'cursors/webcursor_gtk.cc',
+ 'cursors/webcursor_gtk_data.h',
+ 'cursors/webcursor_mac.mm',
+ 'cursors/webcursor_win.cc',
+ ],
+
+ 'conditions': [
+ ['toolkit_uses_gtk == 1', {
+ 'dependencies': [
+ '<(DEPTH)/build/linux/system.gyp:gtk',
+ ],
+ 'sources/': [['exclude', '_x11\\.cc$']],
+ }],
+ ['use_aura==1', {
+ 'sources!': [
+ 'cursors/webcursor_mac.mm',
+ 'cursors/webcursor_win.cc',
+ ],
+ }],
+ ['use_aura==1 and use_x11==1', {
+ 'link_settings': {
+ 'libraries': [ '-lXcursor', ],
+ },
+ }],
+ ['use_ozone==0', {
+ 'sources!': [
+ 'cursors/webcursor_null.cc',
+ ],
+ }],
+ ['OS!="mac"', {
+ 'sources/': [['exclude', '_mac\\.(cc|mm)$']],
+ }, { # else: OS=="mac"
+ 'link_settings': {
+ 'libraries': [
+ '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework',
+ ],
+ },
+ }],
+ ['OS!="win"', {
+ 'sources/': [['exclude', '_win\\.cc$']],
+ }, { # else: OS=="win"
+ # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+ 'msvs_disabled_warnings': [ 4800, 4267 ],
+ 'sources/': [['exclude', '_posix\\.cc$']],
+ }],
+ ],
+ },
+ ],
}
« no previous file with comments | « webkit/common/cursors/webcursor_win.cc ('k') | webkit/common/webkit_common_export.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698