| OLD | NEW |
| 1 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 Import('env') | 5 Import('env') |
| 6 | 6 |
| 7 env = env.Clone() | 7 env = env.Clone() |
| 8 | 8 |
| 9 env.ApplySConscript([ | 9 env.ApplySConscript([ |
| 10 '$BASE_DIR/using_base.scons', | 10 '$BASE_DIR/using_base.scons', |
| (...skipping 24 matching lines...) Expand all Loading... |
| 35 '/MACHINE:X86', | 35 '/MACHINE:X86', |
| 36 '/FIXED:No', | 36 '/FIXED:No', |
| 37 | 37 |
| 38 '/safeseh', | 38 '/safeseh', |
| 39 '/dynamicbase', | 39 '/dynamicbase', |
| 40 '/ignore:4199', | 40 '/ignore:4199', |
| 41 '/nxcompat', | 41 '/nxcompat', |
| 42 ], | 42 ], |
| 43 ) | 43 ) |
| 44 | 44 |
| 45 input_files = [ | 45 input_files = ChromeFileList([ |
| 46 'image_diff.cc', | 46 'image_diff.cc', |
| 47 ] | 47 ]) |
| 48 | 48 |
| 49 env.ChromeTestProgram('image_diff', input_files) | 49 env.ChromeTestProgram('image_diff', input_files) |
| 50 | 50 |
| 51 env.ChromeMSVSProject('$CHROME_DIR/tools/test/image_diff/image_diff.vcproj', | 51 p = env.ChromeMSVSProject('image_diff.vcproj', |
| 52 dependencies = [ | 52 dest=('$CHROME_SRC_DIR/chrome/' |
| 53 '$BASE_DIR/build/base.vcproj', | 53 + 'tools/test/image_diff/image_diff.vcproj'), |
| 54 '$ZLIB_DIR/zlib.vcproj', | 54 guid='{50B079C7-CD01-42D3-B8C4-9F8D9322E822}', |
| 55 '$ICU38_DIR/build/icu.vcproj', | 55 keyword='Win32Proj', |
| 56 '$BASE_DIR/build/base_gfx.vcproj', | 56 dependencies = [ |
| 57 '$LIBPNG_DIR/libpng.vcproj', | 57 '$BASE_DIR/build/base.vcproj', |
| 58 '$SKIA_DIR/skia.vcproj', | 58 '$ZLIB_DIR/zlib.vcproj', |
| 59 ], | 59 '$ICU38_DIR/build/icu.vcproj', |
| 60 guid='{50B079C7-CD01-42D3-B8C4-9F8D9322E822}') | 60 '$BASE_DIR/build/base_gfx.vcproj', |
| 61 '$LIBPNG_DIR/libpng.vcproj', |
| 62 '$SKIA_DIR/skia.vcproj', |
| 63 ], |
| 64 # TODO(sgk): when we can intuit the hierarchy |
| 65 # from the built targets. |
| 66 #buildtargets=TODO, |
| 67 files=input_files, |
| 68 relative_path_prefix='./', |
| 69 tools=[ |
| 70 MSVSTool('VCLinkerTool', |
| 71 SubSystem='1'), |
| 72 'VCCLCompilerTool', |
| 73 ], |
| 74 ConfigurationType='1') |
| 75 |
| 76 p.AddConfig('Debug|Win32', |
| 77 InheritedPropertySheets=[ |
| 78 '$(SolutionDir)../build/common.vsprops', |
| 79 '$(SolutionDir)../build/debug.vsprops', |
| 80 '$(SolutionDir)../third_party/libpng/using_libpng.vsprops', |
| 81 '$(SolutionDir)../third_party/zlib/using_zlib.vsprops', |
| 82 ]) |
| 83 |
| 84 p.AddConfig('Release|Win32', |
| 85 InheritedPropertySheets=[ |
| 86 '$(SolutionDir)../build/common.vsprops', |
| 87 '$(SolutionDir)../build/release.vsprops', |
| 88 '$(SolutionDir)../third_party/libpng/using_libpng.vsprops', |
| 89 '$(SolutionDir)../third_party/zlib/using_zlib.vsprops', |
| 90 ]) |
| OLD | NEW |