bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge revision 1485 changes: 

- Linux: Fix clang compile errors.

git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/1547@1491 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2013-10-24 21:51:19 +00:00
parent 1beb2975bf
commit 1b26cd32d4
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cef.gypi
View File

@ -4,6 +4,8 @@
{ {
'variables': { 'variables': {
# Don't use the chrome style plugin with CEF.
'clang_use_chrome_plugins': 0,
'conditions': [ 'conditions': [
# Directory for CEF source files. # Directory for CEF source files.
[ 'OS=="win"', { [ 'OS=="win"', {
@ -15,10 +17,6 @@
}, { # OS!="win" }, { # OS!="win"
'cef_directory' : '<!(echo $CEF_DIRECTORY)', 'cef_directory' : '<!(echo $CEF_DIRECTORY)',
}], }],
[ 'OS=="mac"', {
# Don't use the chrome style plugin with CEF.
'clang_use_chrome_plugins': 0,
}],
] ]
}, 'conditions': [ }, 'conditions': [
['os_posix==1 and OS!="mac" and OS!="android"', { ['os_posix==1 and OS!="mac" and OS!="android"', {