| 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 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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_NRD_XFER_SOURCE_DIR = '$NACL_DIR/src/trusted/desc', | 85 NACL_NRD_XFER_SOURCE_DIR = '$NACL_DIR/src/trusted/desc', |
| 86 NACL_PLUGIN_SOURCE_DIR = '$NACL_DIR/npapi_plugin', | 86 NACL_PLUGIN_SOURCE_DIR = '$NACL_DIR/npapi_plugin', |
| 87 DOCS_DIR = '$DESTINATION_ROOT/docs', | 87 DOCS_DIR = '$DESTINATION_ROOT/docs', |
| 88 | 88 |
| 89 CPPPATH = [ | 89 CPPPATH = [ |
| 90 # The internal dir is first so that headers in internal can replace |
| 91 # those in external. |
| 92 '$INTERNAL_DIR', |
| 90 '$SCONSTRUCT_DIR/..', | 93 '$SCONSTRUCT_DIR/..', |
| 91 '$SCONSTRUCT_DIR', | 94 '$SCONSTRUCT_DIR', |
| 92 '$CHROME_SRC_DIR', | 95 '$CHROME_SRC_DIR', |
| 93 '$GTEST_DIR/include', | 96 '$GTEST_DIR/include', |
| 94 '$EXPERIMENTAL_O3D_DIR', | 97 '$EXPERIMENTAL_O3D_DIR', |
| 95 '$NACL_DIR/..', | 98 '$NACL_DIR/..', |
| 96 ], | 99 ], |
| 97 LIBPATH = '$LIBS_DIR', | 100 LIBPATH = '$LIBS_DIR', |
| 98 RENDERER_INCLUDE_PATH = [ | 101 RENDERER_INCLUDE_PATH = [ |
| 99 '$ZLIB_DIR', | 102 '$ZLIB_DIR', |
| (...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 301 | 304 |
| 302 # Use MIDL compiler from the platform sdk, since | 305 # Use MIDL compiler from the platform sdk, since |
| 303 # we're including headers from there. | 306 # we're including headers from there. |
| 304 MIDL = '"$PLATFORM_SDK_VISTA_6_0_DIR/Bin/Midl.exe"', | 307 MIDL = '"$PLATFORM_SDK_VISTA_6_0_DIR/Bin/Midl.exe"', |
| 305 MIDLFLAGS=['"/I$PLATFORM_SDK_VISTA_6_0_DIR/Include"'], | 308 MIDLFLAGS=['"/I$PLATFORM_SDK_VISTA_6_0_DIR/Include"'], |
| 306 ) | 309 ) |
| 307 | 310 |
| 308 windows_env.Append( | 311 windows_env.Append( |
| 309 CPPPATH = [ | 312 CPPPATH = [ |
| 310 '$PLATFORM_SDK_VISTA_6_0_DIR/Include', | 313 '$PLATFORM_SDK_VISTA_6_0_DIR/Include', |
| 314 '$SWIFTSHADER_DIR', |
| 311 ], | 315 ], |
| 312 LIBPATH = [ | 316 LIBPATH = [ |
| 313 '$PLATFORM_SDK_VISTA_6_0_DIR/Lib', | 317 '$PLATFORM_SDK_VISTA_6_0_DIR/Lib', |
| 314 ], | 318 ], |
| 315 CPPDEFINES = [ | 319 CPPDEFINES = [ |
| 316 '_UNICODE', # turn on unicode | 320 '_UNICODE', # turn on unicode |
| 317 'WIN32', | 321 'WIN32', |
| 318 '_WINDOWS', | 322 '_WINDOWS', |
| 319 'WIN32_LEAN_AND_MEAN', | 323 'WIN32_LEAN_AND_MEAN', |
| 320 'NOMINMAX', | 324 'NOMINMAX', |
| (...skipping 505 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 826 'o3d', environment_list, | 830 'o3d', environment_list, |
| 827 exclude_pattern = '.*third_party.*', | 831 exclude_pattern = '.*third_party.*', |
| 828 extra_build_targets = { | 832 extra_build_targets = { |
| 829 'Firefox': 'c:/Program Files/Mozilla FireFox/firefox.exe', | 833 'Firefox': 'c:/Program Files/Mozilla FireFox/firefox.exe', |
| 830 'unit_tests': '$ARTIFACTS_DIR/unit_tests.exe', | 834 'unit_tests': '$ARTIFACTS_DIR/unit_tests.exe', |
| 831 'system_tests': '$ARTIFACTS_DIR/system_tests.exe', | 835 'system_tests': '$ARTIFACTS_DIR/system_tests.exe', |
| 832 'converter': '$ARTIFACTS_DIR/o3dConverter.exe', | 836 'converter': '$ARTIFACTS_DIR/o3dConverter.exe', |
| 833 }, | 837 }, |
| 834 ) | 838 ) |
| 835 solution_env.Alias('solution', solution) | 839 solution_env.Alias('solution', solution) |
| OLD | NEW |