Merge revision 1124 changes:

- Windows: Include custom cursor resources in libcef.dll (issue #692).


git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/1364@1125 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2013-03-05 17:59:54 +00:00
parent dfc598fd7e
commit 78e92cf244

View File

@@ -484,9 +484,10 @@
},
'sources': [
'<@(includes_win)',
# TODO(cef): Remove webkit_resources.rc once custom cursor resources
# can be loaded via ResourceBundle. See crbug.com/147663.
# TODO(cef): Remove webkit_unscaled_resources.rc once custom cursor
# resources can be loaded via ResourceBundle. See crbug.com/147663.
'$(OutDir)/obj/global_intermediate/webkit/webkit_resources.rc',
'$(OutDir)/obj/global_intermediate/webkit/webkit_unscaled_resources.rc',
'libcef_dll/libcef_dll.rc',
],
'link_settings': {