Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(388)

Side by Side Diff: build/linux/system.gyp

Issue 173309: Revert "linux: call g_thread_init() at relevant startup points" (Closed)
Patch Set: Created 11 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « base/test_suite.h ('k') | chrome/app/chrome_dll_main.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2009 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'gtk', 8 'target_name': 'gtk',
9 'type': 'settings', 9 'type': 'settings',
10 'direct_dependent_settings': { 10 'direct_dependent_settings': {
11 'cflags': [ 11 'cflags': [
12 '<!@(pkg-config --cflags gtk+-2.0 gthread-2.0)', 12 '<!@(pkg-config --cflags gtk+-2.0)',
13 ], 13 ],
14 }, 14 },
15 'link_settings': { 15 'link_settings': {
16 'ldflags': [ 16 'ldflags': [
17 '<!@(pkg-config --libs-only-L --libs-only-other gtk+-2.0 gthread-2.0)' , 17 '<!@(pkg-config --libs-only-L --libs-only-other gtk+-2.0)',
18 ], 18 ],
19 'libraries': [ 19 'libraries': [
20 '<!@(pkg-config --libs-only-l gtk+-2.0 gthread-2.0)', 20 '<!@(pkg-config --libs-only-l gtk+-2.0)',
21 ], 21 ],
22 }, 22 },
23 }, 23 },
24 { 24 {
25 'target_name': 'nss', 25 'target_name': 'nss',
26 'type': 'settings', 26 'type': 'settings',
27 'direct_dependent_settings': { 27 'direct_dependent_settings': {
28 'cflags': [ 28 'cflags': [
29 '<!@(pkg-config --cflags nss)', 29 '<!@(pkg-config --cflags nss)',
30 ], 30 ],
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 'link_settings': { 100 'link_settings': {
101 'ldflags': [ 101 'ldflags': [
102 '<!@(pkg-config --libs-only-L --libs-only-other gconf-2.0)', 102 '<!@(pkg-config --libs-only-L --libs-only-other gconf-2.0)',
103 ], 103 ],
104 'libraries': [ 104 'libraries': [
105 '<!@(pkg-config --libs-only-l gconf-2.0)', 105 '<!@(pkg-config --libs-only-l gconf-2.0)',
106 ], 106 ],
107 }, 107 },
108 }, 108 },
109 { 109 {
110 'target_name': 'gthread',
111 'type': 'settings',
112 'direct_dependent_settings': {
113 'cflags': [
114 '<!@(pkg-config --cflags gthread-2.0)',
115 ],
116 },
117 'link_settings': {
118 'ldflags': [
119 '<!@(pkg-config --libs-only-L --libs-only-other gthread-2.0)',
120 ],
121 'libraries': [
122 '<!@(pkg-config --libs-only-l gthread-2.0)',
123 ],
124 },
125 },
126 {
110 'target_name': 'x11', 127 'target_name': 'x11',
111 'type': 'settings', 128 'type': 'settings',
112 'direct_dependent_settings': { 129 'direct_dependent_settings': {
113 'cflags': [ 130 'cflags': [
114 '<!@(pkg-config --cflags x11)', 131 '<!@(pkg-config --cflags x11)',
115 ], 132 ],
116 }, 133 },
117 'link_settings': { 134 'link_settings': {
118 'ldflags': [ 135 'ldflags': [
119 '<!@(pkg-config --libs-only-L --libs-only-other x11)', 136 '<!@(pkg-config --libs-only-L --libs-only-other x11)',
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 # 'ldflags': [ 172 # 'ldflags': [
156 # '<!@(pkg-config --libs-only-L --libs-only-other dbus-glib-1)', 173 # '<!@(pkg-config --libs-only-L --libs-only-other dbus-glib-1)',
157 # ], 174 # ],
158 # 'libraries': [ 175 # 'libraries': [
159 # '<!@(pkg-config --libs-only-l dbus-glib-1)', 176 # '<!@(pkg-config --libs-only-l dbus-glib-1)',
160 # ], 177 # ],
161 # }, 178 # },
162 # }, 179 # },
163 ], 180 ],
164 } 181 }
OLDNEW
« no previous file with comments | « base/test_suite.h ('k') | chrome/app/chrome_dll_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698