diff options
| author | rlp@google.com <rlp@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-08 00:33:06 +0000 |
|---|---|---|
| committer | rlp@google.com <rlp@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-08 00:33:06 +0000 |
| commit | d0e7a1430e0fe39134acdfd12cf6e4d84511ca8d (patch) | |
| tree | 690d4adec0e7e1057ff23d6df44a8e319415bea9 /o3d/main.scons | |
| parent | 631b8174301b96a174bfc263d1af6117e288a5be (diff) | |
| download | chromium_src-d0e7a1430e0fe39134acdfd12cf6e4d84511ca8d.zip chromium_src-d0e7a1430e0fe39134acdfd12cf6e4d84511ca8d.tar.gz chromium_src-d0e7a1430e0fe39134acdfd12cf6e4d84511ca8d.tar.bz2 | |
Removing unneeded EffectStream class. Cleaning up data assignment for stream info. Updating the main.scons so that cb can build.
Review URL: http://codereview.chromium.org/155188
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20106 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/main.scons')
| -rw-r--r-- | o3d/main.scons | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/o3d/main.scons b/o3d/main.scons index ac4746e..9d357ae 100644 --- a/o3d/main.scons +++ b/o3d/main.scons @@ -165,9 +165,10 @@ nacl_imc_all_libs = [ # All the libs required for HTP layer on the host. nacl_htp_all_libs = [ nacl_imc_lib, - 'google_nacl_npruntime', # The lib reguired for the NPAPI bridge. + 'google_nacl_imc_c', 'nrd_xfer', 'gio', + 'naclthread', ] binaries_env = base_env.Clone() @@ -192,7 +193,7 @@ binaries_env.Append( # TODO: this is ugly, should all be rolling into builder. NACL_OBJ_ROOT = '$NACL_DIR/scons-out/$NACL_VARIANT/obj', NACL_LIB_DIR = '$NACL_DIR/scons-out/$NACL_VARIANT/lib', - NACL_HTP_LIBS = nacl_imc_all_libs, + NACL_HTP_LIBS = nacl_htp_all_libs, ) # This function adds a path to a windows environment variable like PATH, @@ -225,10 +226,7 @@ def AddNaclBuildCommand(env, variant, platforms): else: script_suffix = '.sh' - if variant == 'nacl': - build_libs = nacl_htp_all_libs - else : - build_libs = nacl_imc_all_libs + build_libs = nacl_htp_all_libs targets = ['$NACL_LIB_DIR/${LIBPREFIX}' + f + '${LIBSUFFIX}' for f in build_libs] @@ -505,7 +503,7 @@ windows_cb_env.Append( 'o3dCmdBuf_client', 'o3dCmdBuf_common', 'd3d9', 'dxerr', 'd3dx9' - ] + nacl_imc_all_libs + ] + nacl_htp_all_libs ) windows_cb_debug_env = windows_cb_env.Clone( |