| OLD | NEW |
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 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 { | 5 { |
| 6 'variables': { | 6 'variables': { |
| 7 'lastchange_path': '../build/util/LASTCHANGE', | 7 'lastchange_path': '../build/util/LASTCHANGE', |
| 8 'libpeer_target_type%': 'static_library', | 8 'libpeer_target_type%': 'static_library', |
| 9 # 'branding_dir' is set in the 'conditions' section at the bottom. | 9 # 'branding_dir' is set in the 'conditions' section at the bottom. |
| 10 }, | 10 }, |
| (...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 286 'installer/setup/setup_constants.cc', | 286 'installer/setup/setup_constants.cc', |
| 287 'installer/setup/setup_constants.h', | 287 'installer/setup/setup_constants.h', |
| 288 'installer/setup/setup_exe_version.rc.version', | 288 'installer/setup/setup_exe_version.rc.version', |
| 289 'installer/setup/setup_resource.h', | 289 'installer/setup/setup_resource.h', |
| 290 'installer/setup/setup_util.cc', | 290 'installer/setup/setup_util.cc', |
| 291 'installer/setup/setup_util.h', | 291 'installer/setup/setup_util.h', |
| 292 'installer/setup/uninstall.cc', | 292 'installer/setup/uninstall.cc', |
| 293 'installer/setup/uninstall.h', | 293 'installer/setup/uninstall.h', |
| 294 ], | 294 ], |
| 295 'msvs_settings': { | 295 'msvs_settings': { |
| 296 'VCCLCompilerTool': { |
| 297 'EnableEnhancedInstructionSet': '4', # NoExtensions |
| 298 }, |
| 296 'VCLinkerTool': { | 299 'VCLinkerTool': { |
| 297 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS | 300 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS |
| 298 }, | 301 }, |
| 299 'VCManifestTool': { | 302 'VCManifestTool': { |
| 300 'AdditionalManifestFiles': [ | 303 'AdditionalManifestFiles': [ |
| 301 '$(ProjectDir)\\installer\\setup\\setup.exe.manifest', | 304 '$(ProjectDir)\\installer\\setup\\setup.exe.manifest', |
| 302 ], | 305 ], |
| 303 }, | 306 }, |
| 304 }, | 307 }, |
| 305 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. | 308 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. |
| (...skipping 817 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1123 'branding_dir_100': 'app/theme/default_100_percent/google_chrome', | 1126 'branding_dir_100': 'app/theme/default_100_percent/google_chrome', |
| 1124 }, | 1127 }, |
| 1125 }, { # else branding!="Chrome" | 1128 }, { # else branding!="Chrome" |
| 1126 'variables': { | 1129 'variables': { |
| 1127 'branding_dir': 'app/theme/chromium', | 1130 'branding_dir': 'app/theme/chromium', |
| 1128 'branding_dir_100': 'app/theme/default_100_percent/chromium', | 1131 'branding_dir_100': 'app/theme/default_100_percent/chromium', |
| 1129 }, | 1132 }, |
| 1130 }], | 1133 }], |
| 1131 ], | 1134 ], |
| 1132 } | 1135 } |
| OLD | NEW |