diff options
| author | gspencer@google.com <gspencer@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-29 00:05:30 +0000 |
|---|---|---|
| committer | gspencer@google.com <gspencer@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-29 00:05:30 +0000 |
| commit | 84c63880bf6afc3bc9c6075c807e2206db9ed59b (patch) | |
| tree | 8f931ad2d4c62b420fb0f2b40723e860473dbd4a /o3d/main.scons | |
| parent | 0df95fd432f9023ce03548c2aba8ca4d774910f7 (diff) | |
| download | chromium_src-84c63880bf6afc3bc9c6075c807e2206db9ed59b.zip chromium_src-84c63880bf6afc3bc9c6075c807e2206db9ed59b.tar.gz chromium_src-84c63880bf6afc3bc9c6075c807e2206db9ed59b.tar.bz2 | |
This adds a DEPS file for o3d that maps in all of its dependencies,
and updates the build files so that it will build.
Review URL: http://codereview.chromium.org/115847
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17142 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/main.scons')
| -rw-r--r-- | o3d/main.scons | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/o3d/main.scons b/o3d/main.scons index 4303675..1f026fc 100644 --- a/o3d/main.scons +++ b/o3d/main.scons @@ -82,7 +82,6 @@ base_env.ApplySConscript(['svn_paths.scons']) 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 @@ base_env.Append( '$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 @@ base_env.Append( RENDERER_LIBS = [ 'libjpeg', 'libpng', - 'zlib' + 'zlib', ], CPPDEFINES = [ @@ -231,8 +231,7 @@ def AddNaclBuildCommand(env, variant, platforms): 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 ' |