plugin/plugin.gyp - Issue 242145: This fixes the GL build so it works....

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

Issue 242145: This fixes the GL build so it works.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/o3d/

Patch Set: Created 11 years, 2 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:

Index: plugin/plugin.gyp

===================================================================

--- plugin/plugin.gyp (revision 28015)

+++ plugin/plugin.gyp (working copy)

@@ -36,7 +36,6 @@

'../core/core.gyp:o3dCore',

'../core/core.gyp:o3dCorePlatform',

'../import/archive.gyp:o3dArchive',

- '../serializer/serializer.gyp:o3dSerializer',

'../utils/utils.gyp:o3dUtils',

'../../native_client/src/shared/imc/imc.gyp:google_nacl_imc',

'idl/idl.gyp:o3dPluginIdl',

@@ -76,6 +75,7 @@

['renderer == "gl"',

{

'dependencies': [

+ '../build/libs.gyp:gl_libs',

'../build/libs.gyp:cg_libs',

@@ -237,7 +237,7 @@

'conditions': [

- ['o3d_in_chrome != 0',

+ ['o3d_in_chrome == "True"',

{

'variables': {

'o3d_main_lib_type': 'static_library',

« no previous file with comments | « core/core.gyp ('k') | no next file » | no next file with comments »