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

Unified Diff: main.scons

Issue 115847: This adds a DEPS file for o3d that maps in all of its dependencies,... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/o3d/
Patch Set: '' Created 11 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
« no previous file with comments | « DEPS ('k') | scons » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: main.scons
===================================================================
--- main.scons (revision 17117)
+++ main.scons (working copy)
@@ -82,7 +82,6 @@
base_env.Append(
# Some derived paths
- NACL_IMC_SOURCE_DIR = '$NACL_DIR/intermodule_comm',
NACL_NRD_XFER_SOURCE_DIR = '$NACL_DIR/src/trusted/desc',
NACL_PLUGIN_SOURCE_DIR = '$NACL_DIR/npapi_plugin',
DOCS_DIR = '$DESTINATION_ROOT/docs',
@@ -92,7 +91,8 @@
'$SCONSTRUCT_DIR',
'$CHROME_SRC_DIR',
'$GTEST_DIR/include',
- '$EXPERIMENTAL_O3D_DIR'
+ '$EXPERIMENTAL_O3D_DIR',
+ '$NACL_DIR/..',
],
LIBPATH = '$LIBS_DIR',
RENDERER_INCLUDE_PATH = [
@@ -105,7 +105,7 @@
RENDERER_LIBS = [
'libjpeg',
'libpng',
- 'zlib'
+ 'zlib',
],
CPPDEFINES = [
@@ -231,8 +231,7 @@
for f in build_libs]
nacl_build_tool = '$PYTHON $SCONS_DIR/scons.py'
env.Command(targets,
- ['$NACL_IMC_SOURCE_DIR', '$NACL_NRD_XFER_SOURCE_DIR',
- '$NACL_PLUGIN_SOURCE_DIR'],
+ ['$NACL_NRD_XFER_SOURCE_DIR', '$NACL_PLUGIN_SOURCE_DIR'],
nacl_build_tool + ' '
'MODE=$NACL_VARIANT '
'naclsdk_validate=0 '
« no previous file with comments | « DEPS ('k') | scons » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698