1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
|
From e2aabe2618ee91c3f6e817c72370573f45c8b20e Mon Sep 17 00:00:00 2001
From: Elvis Pranskevichus <elvis@magic.io>
Date: Mon, 8 Feb 2016 15:14:58 -0500
Subject: [PATCH] brightray build fixes
---
brightray.gyp | 32 +++++++++++++++++++++++++++++---
brightray.gypi | 21 ++++++++-------------
2 files changed, 37 insertions(+), 16 deletions(-)
diff --git a/brightray.gyp b/brightray.gyp
index d7120ea..b23c1eb 100644
--- a/brightray.gyp
+++ b/brightray.gyp
@@ -1,7 +1,7 @@
{
'variables': {
# The libraries brightray will be compiled to.
- 'linux_system_libraries': 'gtk+-2.0 libnotify dbus-1 x11 xi xcursor xdamage xrandr xcomposite xext xfixes xrender xtst gconf-2.0 gmodule-2.0 nss'
+ 'linux_system_libraries': 'gtk+-2.0 libnotify dbus-1 x11 xi xcursor xdamage xrandr xcomposite xext xfixes xrender xtst gmodule-2.0 nss'
},
'includes': [
'filenames.gypi',
@@ -9,6 +9,10 @@
'targets': [
{
'target_name': 'brightray',
+ 'dependencies': [
+ 'gconf',
+ '<(libchromiumcontent_src_dir)/chromiumcontent/chromiumcontent.gyp:chromiumcontent_all'
+ ],
'type': 'static_library',
'include_dirs': [
'.',
@@ -100,8 +104,6 @@
}, {
'link_settings': {
'libraries': [
- # Link with ffmpeg.
- '<(libchromiumcontent_dir)/libffmpeg.so',
# Following libraries are required by libchromiumcontent:
'-lasound',
'-lcap',
@@ -274,5 +276,29 @@
}], # OS=="win"
],
},
+ {
+ 'target_name': 'gconf',
+ 'type': 'none',
+ 'conditions': [
+ ['use_gconf==1 and _toolset=="target"', {
+ 'direct_dependent_settings': {
+ 'cflags': [
+ '<!@(<(pkg-config) --cflags gconf-2.0)',
+ ],
+ 'defines': [
+ 'USE_GCONF',
+ ],
+ },
+ 'link_settings': {
+ 'ldflags': [
+ '<!@(<(pkg-config) --libs-only-L --libs-only-other gconf-2.0)',
+ ],
+ 'libraries': [
+ '<!@(<(pkg-config) --libs-only-l gconf-2.0)',
+ ],
+ },
+ }],
+ ],
+ },
],
}
diff --git a/brightray.gypi b/brightray.gypi
index 4513fa9..95bdfa1 100644
--- a/brightray.gypi
+++ b/brightray.gypi
@@ -1,9 +1,14 @@
{
- 'includes': [
- 'vendor/download/libchromiumcontent/filenames.gypi',
- ],
'variables': {
'libchromiumcontent_component%': 1,
+ 'libchromiumcontent_src_dir': '<(DEPTH)',
+ 'libchromiumcontent_shared_libraries_dir': '<(SHARED_INTERMEDIATE_DIR)',
+ 'libchromiumcontent_static_libraries_dir': '<(SHARED_INTERMEDIATE_DIR)',
+ 'libchromiumcontent_shared_libraries': [],
+ 'libchromiumcontent_static_libraries': [],
+ 'libchromiumcontent_shared_v8_libraries': [],
+ 'libchromiumcontent_static_v8_libraries': [],
+ 'pkg-config%': 'pkg-config',
'conditions': [
# The "libchromiumcontent_component" is defined when calling "gyp".
['libchromiumcontent_component', {
@@ -258,22 +263,12 @@
'conditions': [
['OS=="linux"', {
'cflags': [
- '-O2',
- # Generate symbols, will be stripped later.
- '-g',
- # Don't emit the GCC version ident directives, they just end up
- # in the .comment section taking up binary size.
- '-fno-ident',
# Put data and code in their own sections, so that unused symbols
# can be removed at link time with --gc-sections.
'-fdata-sections',
'-ffunction-sections',
],
'ldflags': [
- # Specifically tell the linker to perform optimizations.
- # See http://lwn.net/Articles/192624/ .
- '-Wl,-O1',
- '-Wl,--as-needed',
'-Wl,--gc-sections',
],
}], # OS=="linux"
--
2.7.3
|
GitWeb