| 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 # IMPORTANT: | 5 # IMPORTANT: |
| 6 # Please don't directly include this file if you are building via gyp_chromium, | 6 # Please don't directly include this file if you are building via gyp_chromium, |
| 7 # since gyp_chromium is automatically forcing its inclusion. | 7 # since gyp_chromium is automatically forcing its inclusion. |
| 8 { | 8 { |
| 9 # Variables expected to be overriden on the GYP command line (-D) or by | 9 # Variables expected to be overriden on the GYP command line (-D) or by |
| 10 # ~/.gyp/include.gypi. | 10 # ~/.gyp/include.gypi. |
| (...skipping 2951 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2962 'TargetMachine': '1', | 2962 'TargetMachine': '1', |
| 2963 }, | 2963 }, |
| 2964 }, | 2964 }, |
| 2965 'msvs_configuration_platform': 'Win32', | 2965 'msvs_configuration_platform': 'Win32', |
| 2966 }, | 2966 }, |
| 2967 'x64_Base': { | 2967 'x64_Base': { |
| 2968 'abstract': 1, | 2968 'abstract': 1, |
| 2969 'msvs_configuration_platform': 'x64', | 2969 'msvs_configuration_platform': 'x64', |
| 2970 'msvs_settings': { | 2970 'msvs_settings': { |
| 2971 'VCLinkerTool': { | 2971 'VCLinkerTool': { |
| 2972 # Make sure to understand http://crbug.com/361720 if you want to |
| 2973 # increase this. |
| 2974 'MinimumRequiredVersion': '5.02', # Server 2003. |
| 2972 'TargetMachine': '17', # x86 - 64 | 2975 'TargetMachine': '17', # x86 - 64 |
| 2973 'AdditionalLibraryDirectories!': | 2976 'AdditionalLibraryDirectories!': |
| 2974 ['<(windows_sdk_path)/Lib/win8/um/x86'], | 2977 ['<(windows_sdk_path)/Lib/win8/um/x86'], |
| 2975 'AdditionalLibraryDirectories': | 2978 'AdditionalLibraryDirectories': |
| 2976 ['<(windows_sdk_path)/Lib/win8/um/x64'], | 2979 ['<(windows_sdk_path)/Lib/win8/um/x64'], |
| 2977 # Doesn't exist x64 SDK. Should use oleaut32 in any case. | 2980 # Doesn't exist x64 SDK. Should use oleaut32 in any case. |
| 2978 'IgnoreDefaultLibraryNames': [ 'olepro32.lib' ], | 2981 'IgnoreDefaultLibraryNames': [ 'olepro32.lib' ], |
| 2979 }, | 2982 }, |
| 2980 'VCLibrarianTool': { | 2983 'VCLibrarianTool': { |
| 2981 'AdditionalLibraryDirectories!': | 2984 'AdditionalLibraryDirectories!': |
| (...skipping 2440 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5422 # settings in target dicts. SYMROOT is a special case, because many other | 5425 # settings in target dicts. SYMROOT is a special case, because many other |
| 5423 # Xcode variables depend on it, including variables such as | 5426 # Xcode variables depend on it, including variables such as |
| 5424 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 5427 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 5425 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 5428 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 5426 # files to appear (when present) in the UI as actual files and not red | 5429 # files to appear (when present) in the UI as actual files and not red |
| 5427 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 5430 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 5428 # and therefore SYMROOT, needs to be set at the project level. | 5431 # and therefore SYMROOT, needs to be set at the project level. |
| 5429 'SYMROOT': '<(DEPTH)/xcodebuild', | 5432 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 5430 }, | 5433 }, |
| 5431 } | 5434 } |
| OLD | NEW |