From 78e92cf2446e316ac18373b61c07be7fb47e0a8a Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Tue, 5 Mar 2013 17:59:54 +0000 Subject: [PATCH] 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 --- cef3/cef.gyp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cef3/cef.gyp b/cef3/cef.gyp index 515891ed3..cb9c47a9f 100644 --- a/cef3/cef.gyp +++ b/cef3/cef.gyp @@ -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': {