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

mac: Link with all necessary system libraries

Browse source
This commit is contained in:
Cheng Zhao 2015-04-03 09:56:03 +08:00
parent 4977741f35
commit 038afadd1b
2 changed files with 42 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
brightray/brightray.gyp
View file

@ -119,6 +119,38 @@
], ],
}, },
}], }],
['OS=="mac" and libchromiumcontent_component==0', {
'link_settings': {
'libraries': [
# ui_base.gypi:
'$(SDKROOT)/System/Library/Frameworks/Accelerate.framework',
# net.gypi:
'$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
'$(SDKROOT)/System/Library/Frameworks/Security.framework',
'$(SDKROOT)/System/Library/Frameworks/SystemConfiguration.framework',
'$(SDKROOT)/usr/lib/libresolv.dylib',
# media.gyp:
'$(SDKROOT)/System/Library/Frameworks/AudioToolbox.framework',
'$(SDKROOT)/System/Library/Frameworks/AudioUnit.framework',
'$(SDKROOT)/System/Library/Frameworks/CoreAudio.framework',
'$(SDKROOT)/System/Library/Frameworks/CoreMIDI.framework',
'$(SDKROOT)/System/Library/Frameworks/CoreVideo.framework',
'$(SDKROOT)/System/Library/Frameworks/OpenGL.framework',
'$(SDKROOT)/System/Library/Frameworks/QTKit.framework',
# surface.gyp:
'$(SDKROOT)/System/Library/Frameworks/IOSurface.framework',
# content_common.gypi:
'$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework',
# base.gyp:
'$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framework',
'$(SDKROOT)/System/Library/Frameworks/Carbon.framework',
'$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework',
'$(SDKROOT)/System/Library/Frameworks/IOKit.framework',
# content_browser.gypi:
'$(SDKROOT)/usr/lib/libbsm.dylib',
],
},
}],
['OS=="win"', { ['OS=="win"', {
'link_settings': { 'link_settings': {
'libraries': [ 'libraries': [

15
brightray/brightray.gypi
View file

@ -73,12 +73,8 @@
'Common_Base': { 'Common_Base': {
'abstract': 1, 'abstract': 1,
'defines': [ 'defines': [
'COMPONENT_BUILD', # We are using Release version libchromiumcontent:
'GURL_DLL',
'SKIA_DLL',
'NDEBUG', 'NDEBUG',
'USING_V8_SHARED',
'WEBKIT_DLL',
# From skia_for_chromium_defines.gypi: # From skia_for_chromium_defines.gypi:
'SK_SUPPORT_LEGACY_GETTOPDEVICE', 'SK_SUPPORT_LEGACY_GETTOPDEVICE',
'SK_SUPPORT_LEGACY_BITMAP_CONFIG', 'SK_SUPPORT_LEGACY_BITMAP_CONFIG',
@ -239,6 +235,15 @@
], ],
}, },
'conditions': [ 'conditions': [
['libchromiumcontent_component', {
'defines': [
'COMPONENT_BUILD',
'GURL_DLL',
'SKIA_DLL',
'USING_V8_SHARED',
'WEBKIT_DLL',
],
}],
['OS=="linux" and linux_clang==1', { ['OS=="linux" and linux_clang==1', {
'make_global_settings': [ 'make_global_settings': [
['CC', '/usr/bin/clang'], ['CC', '/usr/bin/clang'],