| OLD | NEW |
| 1 # Copyright 2009, Google Inc. | 1 # Copyright 2009, Google Inc. |
| 2 # All rights reserved. | 2 # All rights reserved. |
| 3 # | 3 # |
| 4 # Redistribution and use in source and binary forms, with or without | 4 # Redistribution and use in source and binary forms, with or without |
| 5 # modification, are permitted provided that the following conditions are | 5 # modification, are permitted provided that the following conditions are |
| 6 # met: | 6 # met: |
| 7 # | 7 # |
| 8 # * Redistributions of source code must retain the above copyright | 8 # * Redistributions of source code must retain the above copyright |
| 9 # notice, this list of conditions and the following disclaimer. | 9 # notice, this list of conditions and the following disclaimer. |
| 10 # * Redistributions in binary form must reproduce the above | 10 # * Redistributions in binary form must reproduce the above |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 75 COMPONENT_STATIC = True, | 75 COMPONENT_STATIC = True, |
| 76 | 76 |
| 77 COVERAGE_TARGETS = ['unit_tests', 'system_tests'], | 77 COVERAGE_TARGETS = ['unit_tests', 'system_tests'], |
| 78 MSVS_USE_MFC_DIRS=1, | 78 MSVS_USE_MFC_DIRS=1, |
| 79 ) | 79 ) |
| 80 # @@REWRITE(insert python-copyright) | 80 # @@REWRITE(insert python-copyright) |
| 81 base_env.ApplySConscript(['svn_paths.scons']) | 81 base_env.ApplySConscript(['svn_paths.scons']) |
| 82 | 82 |
| 83 base_env.Append( | 83 base_env.Append( |
| 84 # Some derived paths | 84 # Some derived paths |
| 85 NACL_IMC_SOURCE_DIR = '$NACL_DIR/intermodule_comm', | |
| 86 NACL_NRD_XFER_SOURCE_DIR = '$NACL_DIR/src/trusted/desc', | 85 NACL_NRD_XFER_SOURCE_DIR = '$NACL_DIR/src/trusted/desc', |
| 87 NACL_PLUGIN_SOURCE_DIR = '$NACL_DIR/npapi_plugin', | 86 NACL_PLUGIN_SOURCE_DIR = '$NACL_DIR/npapi_plugin', |
| 88 DOCS_DIR = '$DESTINATION_ROOT/docs', | 87 DOCS_DIR = '$DESTINATION_ROOT/docs', |
| 89 | 88 |
| 90 CPPPATH = [ | 89 CPPPATH = [ |
| 91 '$SCONSTRUCT_DIR/..', | 90 '$SCONSTRUCT_DIR/..', |
| 92 '$SCONSTRUCT_DIR', | 91 '$SCONSTRUCT_DIR', |
| 93 '$CHROME_SRC_DIR', | 92 '$CHROME_SRC_DIR', |
| 94 '$GTEST_DIR/include', | 93 '$GTEST_DIR/include', |
| 95 '$EXPERIMENTAL_O3D_DIR' | 94 '$EXPERIMENTAL_O3D_DIR', |
| 95 '$NACL_DIR/..', |
| 96 ], | 96 ], |
| 97 LIBPATH = '$LIBS_DIR', | 97 LIBPATH = '$LIBS_DIR', |
| 98 RENDERER_INCLUDE_PATH = [ | 98 RENDERER_INCLUDE_PATH = [ |
| 99 '$ZLIB_DIR', | 99 '$ZLIB_DIR', |
| 100 '$JPEG_DIR', | 100 '$JPEG_DIR', |
| 101 '$PNG_DIR', | 101 '$PNG_DIR', |
| 102 ], | 102 ], |
| 103 RENDERER_LIB_PATH = [ | 103 RENDERER_LIB_PATH = [ |
| 104 ], | 104 ], |
| 105 RENDERER_LIBS = [ | 105 RENDERER_LIBS = [ |
| 106 'libjpeg', | 106 'libjpeg', |
| 107 'libpng', | 107 'libpng', |
| 108 'zlib' | 108 'zlib', |
| 109 ], | 109 ], |
| 110 | 110 |
| 111 CPPDEFINES = [ | 111 CPPDEFINES = [ |
| 112 ['O3D_VERSION_NUMBER', '$O3D_PLUGIN_VERSION'], | 112 ['O3D_VERSION_NUMBER', '$O3D_PLUGIN_VERSION'], |
| 113 'UNICODE', | 113 'UNICODE', |
| 114 ], | 114 ], |
| 115 ICU_LIBS = ['icu'], | 115 ICU_LIBS = ['icu'], |
| 116 ) | 116 ) |
| 117 | 117 |
| 118 | 118 |
| (...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 224 | 224 |
| 225 if variant == 'nacl': | 225 if variant == 'nacl': |
| 226 build_libs = nacl_htp_all_libs | 226 build_libs = nacl_htp_all_libs |
| 227 else : | 227 else : |
| 228 build_libs = nacl_imc_all_libs | 228 build_libs = nacl_imc_all_libs |
| 229 | 229 |
| 230 targets = ['$NACL_LIB_DIR/${LIBPREFIX}' + f + '${LIBSUFFIX}' | 230 targets = ['$NACL_LIB_DIR/${LIBPREFIX}' + f + '${LIBSUFFIX}' |
| 231 for f in build_libs] | 231 for f in build_libs] |
| 232 nacl_build_tool = '$PYTHON $SCONS_DIR/scons.py' | 232 nacl_build_tool = '$PYTHON $SCONS_DIR/scons.py' |
| 233 env.Command(targets, | 233 env.Command(targets, |
| 234 ['$NACL_IMC_SOURCE_DIR', '$NACL_NRD_XFER_SOURCE_DIR', | 234 ['$NACL_NRD_XFER_SOURCE_DIR', '$NACL_PLUGIN_SOURCE_DIR'], |
| 235 '$NACL_PLUGIN_SOURCE_DIR'], | |
| 236 nacl_build_tool + ' ' | 235 nacl_build_tool + ' ' |
| 237 'MODE=$NACL_VARIANT ' | 236 'MODE=$NACL_VARIANT ' |
| 238 'naclsdk_validate=0 ' | 237 'naclsdk_validate=0 ' |
| 239 'sdl=none ' | 238 'sdl=none ' |
| 240 '--verbose ' | 239 '--verbose ' |
| 241 '--file=SConstruct ' | 240 '--file=SConstruct ' |
| 242 '$DEBUG_OPTS ' | 241 '$DEBUG_OPTS ' |
| 243 '-C $NACL_DIR ' | 242 '-C $NACL_DIR ' |
| 244 '$NACL_TARGETS', | 243 '$NACL_TARGETS', |
| 245 source_scanner = DirScanner, | 244 source_scanner = DirScanner, |
| (...skipping 581 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 827 'o3d', environment_list, | 826 'o3d', environment_list, |
| 828 exclude_pattern = '.*third_party.*', | 827 exclude_pattern = '.*third_party.*', |
| 829 extra_build_targets = { | 828 extra_build_targets = { |
| 830 'Firefox': 'c:/Program Files/Mozilla FireFox/firefox.exe', | 829 'Firefox': 'c:/Program Files/Mozilla FireFox/firefox.exe', |
| 831 'unit_tests': '$ARTIFACTS_DIR/unit_tests.exe', | 830 'unit_tests': '$ARTIFACTS_DIR/unit_tests.exe', |
| 832 'system_tests': '$ARTIFACTS_DIR/system_tests.exe', | 831 'system_tests': '$ARTIFACTS_DIR/system_tests.exe', |
| 833 'converter': '$ARTIFACTS_DIR/o3dConverter.exe', | 832 'converter': '$ARTIFACTS_DIR/o3dConverter.exe', |
| 834 }, | 833 }, |
| 835 ) | 834 ) |
| 836 solution_env.Alias('solution', solution) | 835 solution_env.Alias('solution', solution) |
| OLD | NEW |