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

Unified Diff: build/common.gypi

Issue 7108010: Upstream ChromeOS patch on O3D. (Change Icf3bc91d: http://gerrit.chromium.org/gerrit/#change,2220) (Closed) Base URL: svn://chrome-svn/chrome/trunk/o3d/
Patch Set: '' Created 9 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | build/libs.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
===================================================================
--- build/common.gypi (revision 88158)
+++ build/common.gypi (working copy)
@@ -80,6 +80,22 @@
# Whether to enable the English-only, Win/Mac-only fullscreen message.
'plugin_enable_fullscreen_msg%': '1',
+
+ 'conditions': [
+ ['OS == "linux" or OS == "freebsd" or OS == "openbsd"', {
+ 'conditions': [
+ ['sysroot!=""', {
+ 'variables': {
+ 'pkg-config%': '<(DEPTH)/o3d/build/linux/pkg-config-wrapper "<(sysroot)"',
+ },
+ }, {
+ 'variables': {
+ 'pkg-config%': 'pkg-config'
+ },
+ }],
+ ],
+ }],
+ ],
},
'target_defaults': {
'defines': [
« no previous file with comments | « no previous file | build/libs.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698