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

Unified Diff: plugin/plugin.gyp

Issue 340044: Linux: Add support for loading environment variables at plugin start-up from ... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/o3d/
Patch Set: '' Created 11 years, 1 month 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 | « plugin/linux/main_linux.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: plugin/plugin.gyp
===================================================================
--- plugin/plugin.gyp (revision 30693)
+++ plugin/plugin.gyp (working copy)
@@ -194,12 +194,16 @@
'sources': [
'linux/main_linux.cc',
'linux/config.cc',
+ 'linux/envvars.cc',
],
'link_settings': {
'libraries': [
'-lGL',
],
},
+ 'defines': [
+ 'O3D_PLUGIN_ENV_VARS_FILE="/opt/google/o3d/envvars"',
+ ],
},
],
['OS == "win"',
@@ -335,12 +339,16 @@
'sources': [
'linux/main_linux.cc',
'linux/config.cc',
+ 'linux/envvars.cc',
],
'link_settings': {
'libraries': [
'-lGL',
],
},
+ 'defines': [
+ 'O3D_PLUGIN_ENV_VARS_FILE="/opt/google/o3d/envvars"',
+ ],
# On Linux, shared library targets aren't copied to the
# product dir automatically. Filed GYP issue #74 to address this.
# TODO(gspencer): Remove when issue #74 is resolved.
« no previous file with comments | « plugin/linux/main_linux.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698