gpu/demos/demos.gyp - Issue 6976055: More POSIX support for Chromium, consisting mostly of broadening ifdefs. This

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: gpu/demos/demos.gyp

Issue 6976055: More POSIX support for Chromium, consisting mostly of broadening ifdefs. This (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 9 years, 7 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: gpu/demos/demos.gyp

diff --git a/gpu/demos/demos.gyp b/gpu/demos/demos.gyp

index 4da7107e35b4996e8ce794de41637eff88b5c493..d9e60fcd925ff9902537724aad513aaa83cedcb4 100644

--- a/gpu/demos/demos.gyp

+++ b/gpu/demos/demos.gyp

@@ -14,7 +14,7 @@

# also be compiled with -fPIC flag. Setting GYP_DEFINES="linux_fpic=1"

# compiles everything with -fPIC. Disable pepper demos on linux/x64

# unless linux_fpic is 1.

- ['OS=="linux" and (target_arch=="x64" or target_arch=="arm") and linux_fpic!=1', {

+ ['os_posix == 1 and OS != "mac" and (target_arch=="x64" or target_arch=="arm") and linux_fpic!=1', {

'enable_pepper_demos%': 0,

}, {

'enable_pepper_demos%': 1,

@@ -107,7 +107,7 @@

'conditions': [

- ['OS=="linux"', {

+ ['os_posix == 1 and OS != "mac"', {

# -gstabs, used in the official builds, causes an ICE. Remove it.

'cflags!': ['-gstabs'],

}],

« no previous file with comments | « gpu/command_buffer/service/gles2_cmd_decoder.cc ('k') | gpu/demos/framework/main_exe.cc » ('j') | no next file with comments »