bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-02-17 20:50:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge revision 1206 changes:

Browse Source 
- Linux: Simplify gtk-related dependencies in cef.gyp.

git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/1364@1208 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2013-04-10 23:54:15 +00:00
parent 479c2ad8ed
commit ac280be98e
1 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
cef3/cef.gyp
View File

@ -98,11 +98,6 @@
'<(DEPTH)/sandbox/sandbox.gyp:sandbox',
],
}],
['toolkit_uses_gtk == 1', {
'dependencies': [
'<(DEPTH)/build/linux/system.gyp:gtk',
],
}],
[ 'OS=="mac"', {
'product_name': 'cefclient',
'dependencies': [
@ -211,6 +206,9 @@
],
}],
[ 'OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
'dependencies': [
'<(DEPTH)/build/linux/system.gyp:gtk',
],
'sources': [
'<@(includes_linux)',
'<@(cefclient_sources_linux)',
@ -412,6 +410,11 @@
'tests/unittests/run_all_unittests_mac.mm',
],
}],
[ 'OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
'dependencies': [
'<(DEPTH)/build/linux/system.gyp:gtk',
],
}],
],
},
{
@ -450,11 +453,6 @@
'<(DEPTH)/base/allocator/allocator.gyp:allocator',
],
}],
['toolkit_uses_gtk == 1', {
'dependencies': [
'<(DEPTH)/build/linux/system.gyp:gtk',
],
}],
['OS=="win"', {
'configurations': {
'Debug_Base': {
@ -488,20 +486,8 @@
[ 'OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
'dependencies':[
'<(DEPTH)/base/allocator/allocator.gyp:allocator',
'<(DEPTH)/build/linux/system.gyp:gtk',
],
'direct_dependent_settings': {
'cflags': [
'<!@(<(pkg-config) --cflags gtk+-2.0 gthread-2.0)',
],
},
'link_settings': {
'ldflags': [
'<!@(<(pkg-config) --libs-only-L --libs-only-other gtk+-2.0 gthread-2.0)',
],
'libraries': [
'<!@(<(pkg-config) --libs-only-l gtk+-2.0 gthread-2.0)',
],
},
}],
],
},
@ -524,6 +510,13 @@
'<@(includes_wrapper)',
'<@(libcef_dll_wrapper_sources_common)',
],
'conditions': [
[ 'OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
'dependencies': [
'<(DEPTH)/build/linux/system.gyp:gtk',
],
}],
],
},
{
# Create the pack file for CEF strings.