summaryrefslogtreecommitdiffstats
path: root/ui/ui.gyp
diff options
context:
space:
mode:
authorsadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-03 21:14:36 +0000
committersadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-03 21:14:36 +0000
commitc78395583ae96c6ad4287cc1af8ec2ba1cd038c8 (patch)
tree7d3190a78c9c6b243ab5ea6a1c12090835edc3f4 /ui/ui.gyp
parent741a46a76bd8f09547a3ea8967f380ccde31ae65 (diff)
downloadchromium_src-c78395583ae96c6ad4287cc1af8ec2ba1cd038c8.zip
chromium_src-c78395583ae96c6ad4287cc1af8ec2ba1cd038c8.tar.gz
chromium_src-c78395583ae96c6ad4287cc1af8ec2ba1cd038c8.tar.bz2
aura-x11: Add custom web cursor support.
BUG=102562 TEST=manually (using sites that use custom cursor, e.g.: http://beradrian.users.sourceforge.net/articles/cursor.html) Review URL: https://chromiumcodereview.appspot.com/9463003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130456 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/ui.gyp')
-rw-r--r--ui/ui.gyp10
1 files changed, 9 insertions, 1 deletions
diff --git a/ui/ui.gyp b/ui/ui.gyp
index e8abe9ec..5afa51a 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -99,6 +99,10 @@
'base/cocoa/fullscreen_window_manager.mm',
'base/cocoa/underlay_opengl_hosting_window.h',
'base/cocoa/underlay_opengl_hosting_window.mm',
+ 'base/cursor/cursor.cc',
+ 'base/cursor/cursor.h',
+ 'base/cursor/cursor_win.cc',
+ 'base/cursor/cursor_x11.cc',
'base/dragdrop/cocoa_dnd_util.h',
'base/dragdrop/cocoa_dnd_util.mm',
'base/dragdrop/drag_drop_types_gtk.cc',
@@ -417,6 +421,10 @@
'sources!': [
'gfx/native_theme_aura.cc',
'gfx/native_theme_aura.h',
+ 'base/cursor/cursor.cc',
+ 'base/cursor/cursor.h',
+ 'base/cursor/cursor_win.cc',
+ 'base/cursor/cursor_x11.cc',
]
}],
['use_aura==1 and OS=="win"', {
@@ -604,7 +612,7 @@
],
'link_settings': {
'libraries': [
- '-lX11',
+ '-lX11 -lXcursor',
],
},
},