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

Merge pull request #202 from deepak1556/sysroot

Browse source 
allow setting pkg-config variable
This commit is contained in:
Cheng Zhao 2016-03-10 17:15:09 +09:00
commit 5652af8e61
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
brightray/brightray.gyp
View file

@ -55,15 +55,15 @@
['OS=="linux"', { ['OS=="linux"', {
'link_settings': { 'link_settings': {
'ldflags': [ 'ldflags': [
'<!@(pkg-config --libs-only-L --libs-only-other <(linux_system_libraries))', '<!@(<(pkg-config) --libs-only-L --libs-only-other <(linux_system_libraries))',
], ],
'libraries': [ 'libraries': [
'-lpthread', '-lpthread',
'<!@(pkg-config --libs-only-l <(linux_system_libraries))', '<!@(<(pkg-config) --libs-only-l <(linux_system_libraries))',
], ],
}, },
'cflags': [ 'cflags': [
'<!@(pkg-config --cflags <(linux_system_libraries))', '<!@(<(pkg-config) --cflags <(linux_system_libraries))',
# Needed by using libgtk2ui: # Needed by using libgtk2ui:
'-Wno-deprecated-register', '-Wno-deprecated-register',
'-Wno-sentinel', '-Wno-sentinel',
@ -73,7 +73,7 @@
], ],
'direct_dependent_settings': { 'direct_dependent_settings': {
'cflags': [ 'cflags': [
'<!@(pkg-config --cflags <(linux_system_libraries))', '<!@(<(pkg-config) --cflags <(linux_system_libraries))',
'-Wno-deprecated-register', '-Wno-deprecated-register',
'-Wno-sentinel', '-Wno-sentinel',
], ],

1
brightray/brightray.gypi
View file

@ -4,6 +4,7 @@
], ],
'variables': { 'variables': {
'libchromiumcontent_component%': 1, 'libchromiumcontent_component%': 1,
'pkg-config%': 'pkg-config',
'conditions': [ 'conditions': [
# The "libchromiumcontent_component" is defined when calling "gyp". # The "libchromiumcontent_component" is defined when calling "gyp".
['libchromiumcontent_component', { ['libchromiumcontent_component', {