build/common.gypi - Issue 7108010: Upstream ChromeOS patch on O3D. (Change Icf3bc91d: http://gerrit.chromium.org/gerrit/#change,2220)

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

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"', {

Tristan Schmelcher 2 2011/06/07 23:39:47 No leading space before the ' that starts the stri

zhurunz1 2011/06/07 23:58:54 Done.

+ '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 »