From 5b3d0f86f7b9e631eaa5acbb9cef59bbc8f8f2a9 Mon Sep 17 00:00:00 2001 From: Ales Pergl Date: Mon, 9 Jan 2017 13:31:36 +0100 Subject: [PATCH] Adjustments after migrating libchromiumcontent to GN --- atom/common/node_bindings.cc | 8 -------- electron.gyp | 12 ++---------- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/atom/common/node_bindings.cc b/atom/common/node_bindings.cc index f97009f72b..ca9931fd9f 100644 --- a/atom/common/node_bindings.cc +++ b/atom/common/node_bindings.cc @@ -63,14 +63,6 @@ REFERENCE_MODULE(atom_renderer_ipc); REFERENCE_MODULE(atom_renderer_web_frame); #undef REFERENCE_MODULE -// The "v8::Function::kLineOffsetNotFound" is exported in node.dll, but the -// linker can not find it, could be a bug of VS. -#if defined(OS_WIN) && !defined(DEBUG) -namespace v8 { -const int Function::kLineOffsetNotFound = -1; -} -#endif - namespace atom { namespace { diff --git a/electron.gyp b/electron.gyp index 3ca6717b98..7672f26eee 100644 --- a/electron.gyp +++ b/electron.gyp @@ -223,6 +223,8 @@ 'GLIB_DISABLE_DEPRECATION_WARNINGS', # Defined in Chromium but not exposed in its gyp file. 'V8_USE_EXTERNAL_STARTUP_DATA', + 'V8_SHARED', + 'USING_V8_SHARED', 'ENABLE_PLUGINS', 'ENABLE_PEPPER_CDMS', 'USE_PROPRIETARY_CODECS', @@ -583,16 +585,6 @@ '${BUILT_PRODUCTS_DIR}/<(product_name) Framework.framework/Versions/A/<(product_name) Framework', ], }, - { - 'postbuild_name': 'Fix path of ffmpeg', - 'action': [ - 'install_name_tool', - '-change', - '/usr/local/lib/libffmpeg.dylib', - '@rpath/libffmpeg.dylib', - '${BUILT_PRODUCTS_DIR}/<(product_name) Framework.framework/Versions/A/<(product_name) Framework', - ], - }, { 'postbuild_name': 'Add symlinks for framework subdirectories', 'action': [