mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Revert "Link with ui_zoom in component build"

Browse source 
This reverts commit b48bc01c8f1fc11862f96db835a5f257aa6e53aa.
This commit is contained in:
Cheng Zhao 2015-05-29 17:51:22 +08:00
parent f494f90a3e
commit 155a50d00e
1 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
brightray/brightray.gyp
View file

@ -82,7 +82,6 @@
['libchromiumcontent_component', { ['libchromiumcontent_component', {
'link_settings': { 'link_settings': {
'libraries': [ 'libraries': [
'<(libchromiumcontent_dir)/libui_zoom.a',
# libgtk2ui is always linked statically. # libgtk2ui is always linked statically.
'<(libchromiumcontent_dir)/libgtk2ui.a', '<(libchromiumcontent_dir)/libgtk2ui.a',
], ],
@ -114,13 +113,7 @@
}, },
'conditions': [ 'conditions': [
# Link with system frameworks. # Link with system frameworks.
['libchromiumcontent_component', { ['libchromiumcontent_component==0', {
'link_settings': {
'libraries': [
'<(libchromiumcontent_dir)/libui_zoom.a',
],
},
}, {
'link_settings': { 'link_settings': {
'libraries': [ 'libraries': [
# ui_base.gypi: # ui_base.gypi:
@ -159,10 +152,9 @@
['OS=="win"', { ['OS=="win"', {
'conditions': [ 'conditions': [
['libchromiumcontent_component', { ['libchromiumcontent_component', {
# sandbox and base_static are always linked statically.
'link_settings': { 'link_settings': {
'libraries': [ 'libraries': [
'<(libchromiumcontent_dir)/ui_zoom.lib',
# sandbox and base_static are always linked statically.
'<(libchromiumcontent_dir)/base_static.lib', '<(libchromiumcontent_dir)/base_static.lib',
'<(libchromiumcontent_dir)/sandbox.lib', '<(libchromiumcontent_dir)/sandbox.lib',
], ],