From 2813bef7411ef1dbf56611160062e1e4226a417b Mon Sep 17 00:00:00 2001 From: Adam Roben Date: Wed, 22 May 2013 13:48:08 -0400 Subject: [PATCH] Link against sandbox_static.lib * vendor/libchromiumcontent 15ada44...c973a7c (3): > Create and export sandbox_static.lib for Windows clients > Export content/app/startup_helper_win.cc to clients > Rename dist/include to dist/src --- brightray/brightray.gyp | 1 + brightray/vendor/libchromiumcontent | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/brightray/brightray.gyp b/brightray/brightray.gyp index 92554d1d8bfd..c1dd0c0e0b2a 100644 --- a/brightray/brightray.gyp +++ b/brightray/brightray.gyp @@ -74,6 +74,7 @@ 'link_settings': { 'libraries': [ '<(libchromiumcontent_library_dir)/chromiumcontent.dll.lib', + '<(libchromiumcontent_library_dir)/sandbox_static.lib', ], }, }], diff --git a/brightray/vendor/libchromiumcontent b/brightray/vendor/libchromiumcontent index 65b85bf315a9..c973a7c3937f 160000 --- a/brightray/vendor/libchromiumcontent +++ b/brightray/vendor/libchromiumcontent @@ -1 +1 @@ -Subproject commit 65b85bf315a9db754a590a6e484f6f705c837583 +Subproject commit c973a7c3937fd31183e2fcf6809dc7182c5fe0ec