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

Fix generating configs on OS X and Linux

Browse source
This commit is contained in:
Cheng Zhao 2015-04-06 21:41:36 +08:00
parent 9934985974
commit 512deae254
1 changed files with 16 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

28
brightray/brightray.gypi
View file

@ -185,6 +185,15 @@
}, },
}, # Release_Base }, # Release_Base
'conditions': [ 'conditions': [
['libchromiumcontent_component', {
'D': {
'inherit_from': ['Common_Base', 'Debug_Base'],
}, # D (Debug)
}, {
'R': {
'inherit_from': ['Common_Base', 'Release_Base'],
}, # R (Release)
}], # libchromiumcontent_component
['OS=="win"', { ['OS=="win"', {
'x64_Base': { 'x64_Base': {
'abstract': 1, 'abstract': 1,
@ -202,23 +211,18 @@
'TargetMachine': '17', # x64 'TargetMachine': '17', # x64
}, },
}, },
}, }, # x64_Base
}], # OS=="win" }], # OS=="win"
['libchromiumcontent_component', { ['OS=="win" and libchromiumcontent_component==1', {
'D': {
'inherit_from': ['Common_Base', 'Debug_Base'],
},
'D_x64': { 'D_x64': {
'inherit_from': ['Common_Base', 'x64_Base', 'Debug_Base'], 'inherit_from': ['Common_Base', 'x64_Base', 'Debug_Base'],
}, }, # D_x64
}, { # libchromiumcontent_component==1 }], # OS=="win" and libchromiumcontent_component==1
'R': { ['OS=="win" and libchromiumcontent_component==0', {
'inherit_from': ['Common_Base', 'Release_Base'],
},
'R_x64': { 'R_x64': {
'inherit_from': ['Common_Base', 'x64_Base', 'Release_Base'], 'inherit_from': ['Common_Base', 'x64_Base', 'Release_Base'],
}, }, # R_x64
}], # libchromiumcontent_component==0 }], # OS=="win" and libchromiumcontent_component==0
], ],
}, },
'conditions': [ 'conditions': [