Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 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 'variables': { | 6 'variables': { |
| 7 'conditions': [ | 7 'conditions': [ |
| 8 ['sysroot!=""', { | 8 ['sysroot!=""', { |
| 9 'pkg-config': './pkg-config-wrapper "<(sysroot)" "<(target_arch)"', | 9 'pkg-config': './pkg-config-wrapper "<(sysroot)" "<(target_arch)"', |
| 10 }, { | 10 }, { |
| (...skipping 25 matching lines...) Expand all Loading... | |
| 36 'target_name': 'gtk', | 36 'target_name': 'gtk', |
| 37 'type': 'none', | 37 'type': 'none', |
| 38 'toolsets': ['host', 'target'], | 38 'toolsets': ['host', 'target'], |
| 39 'variables': { | 39 'variables': { |
| 40 # gtk requires gmodule, but it does not list it as a dependency | 40 # gtk requires gmodule, but it does not list it as a dependency |
| 41 # in some misconfigured systems. | 41 # in some misconfigured systems. |
| 42 'gtk_packages': 'gmodule-2.0 gtk+-2.0 gthread-2.0', | 42 'gtk_packages': 'gmodule-2.0 gtk+-2.0 gthread-2.0', |
| 43 }, | 43 }, |
| 44 'conditions': [ | 44 'conditions': [ |
| 45 ['_toolset=="target"', { | 45 ['_toolset=="target"', { |
| 46 'direct_dependent_settings': { | 46 'all_dependent_settings': { |
|
Jói
2013/04/23 22:45:22
Were the changes in this file meant to be part of
Paweł Hajdan Jr.
2013/04/23 22:58:11
Unfortunately, yes. Otherwise it doesn't compile.
Jói
2013/04/24 09:09:10
Hmm, do you know why?
Paweł Hajdan Jr.
2013/04/25 17:51:43
The error message is:
CXX(target) out/Debug/obj
| |
| 47 'cflags': [ | 47 'cflags': [ |
| 48 '<!@(<(pkg-config) --cflags <(gtk_packages))', | 48 '<!@(<(pkg-config) --cflags <(gtk_packages))', |
| 49 ], | 49 ], |
| 50 }, | 50 }, |
| 51 'link_settings': { | 51 'link_settings': { |
| 52 'ldflags': [ | 52 'ldflags': [ |
| 53 '<!@(<(pkg-config) --libs-only-L --libs-only-other <(gtk_packa ges))', | 53 '<!@(<(pkg-config) --libs-only-L --libs-only-other <(gtk_packa ges))', |
| 54 ], | 54 ], |
| 55 'libraries': [ | 55 'libraries': [ |
| 56 '<!@(<(pkg-config) --libs-only-l <(gtk_packages))', | 56 '<!@(<(pkg-config) --libs-only-l <(gtk_packages))', |
| 57 ], | 57 ], |
| 58 }, | 58 }, |
| 59 }, { | 59 }, { |
| 60 'direct_dependent_settings': { | 60 'all_dependent_settings': { |
| 61 'cflags': [ | 61 'cflags': [ |
| 62 '<!@(pkg-config --cflags <(gtk_packages))', | 62 '<!@(pkg-config --cflags <(gtk_packages))', |
| 63 ], | 63 ], |
| 64 }, | 64 }, |
| 65 'link_settings': { | 65 'link_settings': { |
| 66 'ldflags': [ | 66 'ldflags': [ |
| 67 '<!@(pkg-config --libs-only-L --libs-only-other <(gtk_packages ))', | 67 '<!@(pkg-config --libs-only-L --libs-only-other <(gtk_packages ))', |
| 68 ], | 68 ], |
| 69 'libraries': [ | 69 'libraries': [ |
| 70 '<!@(pkg-config --libs-only-l <(gtk_packages))', | 70 '<!@(pkg-config --libs-only-l <(gtk_packages))', |
| (...skipping 763 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 834 ], | 834 ], |
| 835 'libraries': [ | 835 'libraries': [ |
| 836 '<!@(<(pkg-config) --libs-only-l libudev)', | 836 '<!@(<(pkg-config) --libs-only-l libudev)', |
| 837 ], | 837 ], |
| 838 }, | 838 }, |
| 839 }], | 839 }], |
| 840 ], | 840 ], |
| 841 }, | 841 }, |
| 842 ], | 842 ], |
| 843 } | 843 } |
| OLD | NEW |