Removing unneeded EffectStream class. Cleaning up data assignment for stream ...

main.scons

 # Copyright 2009, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
@@ skipping 147 matching lines @@
 
 # All the libs required for IMC layer on the host.
 nacl_imc_all_libs = [
   nacl_imc_lib,
   'google_nacl_imc_c',
   ]
 
 # 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()
 binaries_env.Append(
     BUILD_COMPONENTS = [
         'base',
         'bitmap',
         'compiler/antlr',
         'compiler/technique',
         'converter',
         'core',
         'import',
         'plugin',
         'samples',
         'serializer',
         'skia',
         'tests',
         'tests/common',
         'utils',
         'v8',
     ],
     # 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,
 # INCLUDE, or LIB.
 def AddPathToWindowsEnv(env_dict, var, path):
   try:
     src = env_dict[var]
   except KeyError:
     src = ''
   if not src:
@@ skipping 12 matching lines @@
     script_suffix = '.bat'
     # We want native client to use the same Platform SDK as ours. Pass it
     # through INCLUDE and LIB.
     AddPathToWindowsEnv(nacl_os_env, 'INCLUDE',
                         env.subst('$PLATFORM_SDK_VISTA_6_0_DIR/Include'))
     AddPathToWindowsEnv(nacl_os_env, 'LIB',
                         env.subst('$PLATFORM_SDK_VISTA_6_0_DIR/Lib'))
   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]
   nacl_build_tool = '$PYTHON $SCONS_DIR/scons.py'
   env.Command(targets,
               ['$NACL_NRD_XFER_SOURCE_DIR', '$NACL_PLUGIN_SOURCE_DIR'],
               nacl_build_tool + ' '
               'MODE=$NACL_VARIANT '
               'naclsdk_validate=0 '
               'sdl=none '
@@ skipping 256 matching lines @@
       'command_buffer/service',
       'command_buffer/client',
     ],
     # TODO: remove link-time dependency on d3dx9, using dynamic loading
     # instead.
     RENDERER_LIBS = [
       'o3dCmdBuf_service',
       'o3dCmdBuf_client',
       'o3dCmdBuf_common',
       'd3d9', 'dxerr', 'd3dx9'
-    ] + nacl_imc_all_libs
+    ] + nacl_htp_all_libs
 )
 
 windows_cb_debug_env = windows_cb_env.Clone(
     BUILD_TYPE = 'dbg-cb',
     BUILD_TYPE_DESCRIPTION = 'Windows Command Buffer debug build',
 )
 
 AddWindowsDebugSettings(windows_cb_debug_env)
 environment_list.append(windows_cb_debug_env)
 
@@ skipping 316 matching lines @@
     'o3d', environment_list,
     exclude_pattern = '.*third_party.*',
     extra_build_targets = {
         'Firefox': 'c:/Program Files/Mozilla FireFox/firefox.exe',
         'unit_tests': '$ARTIFACTS_DIR/unit_tests.exe',
         'system_tests': '$ARTIFACTS_DIR/system_tests.exe',
         'converter': '$ARTIFACTS_DIR/o3dConverter.exe',
     },
 )
 solution_env.Alias('solution', solution)