Chromium Code Reviews| 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 2199 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2210 'VCLinkerTool': { | 2210 'VCLinkerTool': { |
| 2211 'AdditionalDependencies': [ | 2211 'AdditionalDependencies': [ |
| 2212 'kernel32.lib', | 2212 'kernel32.lib', |
| 2213 'gdi32.lib', | 2213 'gdi32.lib', |
| 2214 'winspool.lib', | 2214 'winspool.lib', |
| 2215 'comdlg32.lib', | 2215 'comdlg32.lib', |
| 2216 'advapi32.lib', | 2216 'advapi32.lib', |
| 2217 'shell32.lib', | 2217 'shell32.lib', |
| 2218 'ole32.lib', | 2218 'ole32.lib', |
| 2219 'oleaut32.lib', | 2219 'oleaut32.lib', |
| 2220 'user32.lib', | |
| 2221 'uuid.lib', | 2220 'uuid.lib', |
| 2222 'odbc32.lib', | 2221 'odbc32.lib', |
| 2223 'odbccp32.lib', | 2222 'odbccp32.lib', |
| 2224 'delayimp.lib', | 2223 'delayimp.lib', |
| 2225 ], | 2224 ], |
| 2226 }, | 2225 }, |
| 2227 }, | 2226 }, |
| 2228 }, | 2227 }, |
| 2229 'x86_Base': { | 2228 'x86_Base': { |
| 2230 'abstract': 1, | 2229 'abstract': 1, |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2308 'LinkIncremental': '<(msvs_debug_link_incremental)', | 2307 'LinkIncremental': '<(msvs_debug_link_incremental)', |
| 2309 # ASLR makes debugging with windbg difficult because Chrome.exe and | 2308 # ASLR makes debugging with windbg difficult because Chrome.exe and |
| 2310 # Chrome.dll share the same base name. As result, windbg will | 2309 # Chrome.dll share the same base name. As result, windbg will |
| 2311 # name the Chrome.dll module like chrome_<base address>, where | 2310 # name the Chrome.dll module like chrome_<base address>, where |
| 2312 # <base address> typically changes with each launch. This in turn | 2311 # <base address> typically changes with each launch. This in turn |
| 2313 # means that breakpoints in Chrome.dll don't stick from one launch | 2312 # means that breakpoints in Chrome.dll don't stick from one launch |
| 2314 # to the next. For this reason, we turn ASLR off in debug builds. | 2313 # to the next. For this reason, we turn ASLR off in debug builds. |
| 2315 # Note that this is a three-way bool, where 0 means to pick up | 2314 # Note that this is a three-way bool, where 0 means to pick up |
| 2316 # the default setting, 1 is off and 2 is on. | 2315 # the default setting, 1 is off and 2 is on. |
| 2317 'RandomizedBaseAddress': 1, | 2316 'RandomizedBaseAddress': 1, |
| 2317 # In debug builds we link with the Platform SDK user32.dll import | |
| 2318 # library. | |
| 2319 'AdditionalDependencies': [ 'user32.lib' ], | |
| 2318 }, | 2320 }, |
| 2319 'VCResourceCompilerTool': { | 2321 'VCResourceCompilerTool': { |
| 2320 'PreprocessorDefinitions': ['_DEBUG'], | 2322 'PreprocessorDefinitions': ['_DEBUG'], |
| 2321 }, | 2323 }, |
| 2322 }, | 2324 }, |
| 2323 'conditions': [ | 2325 'conditions': [ |
| 2324 ['OS=="linux" or OS=="android"', { | 2326 ['OS=="linux" or OS=="android"', { |
| 2325 'target_conditions': [ | 2327 'target_conditions': [ |
| 2326 ['_toolset=="target"', { | 2328 ['_toolset=="target"', { |
| 2327 'cflags': [ | 2329 'cflags': [ |
| (...skipping 1676 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 4004 'x86_Base': { | 4006 'x86_Base': { |
| 4005 'msvs_settings': { | 4007 'msvs_settings': { |
| 4006 'VCLinkerTool': { | 4008 'VCLinkerTool': { |
| 4007 'AdditionalOptions': [ | 4009 'AdditionalOptions': [ |
| 4008 '/safeseh', | 4010 '/safeseh', |
| 4009 '/dynamicbase', | 4011 '/dynamicbase', |
| 4010 '/ignore:4199', | 4012 '/ignore:4199', |
| 4011 '/ignore:4221', | 4013 '/ignore:4221', |
| 4012 '/nxcompat', | 4014 '/nxcompat', |
| 4013 ], | 4015 ], |
| 4016 'AdditionalLibraryDirectories': [ | |
| 4017 '<(DEPTH)/build/win/importlibs/x86', | |
| 4018 ], | |
| 4019 # Link against the XP-constrained user32 import library to avoid | |
| 4020 # inadvertently taking dependencies on post-XP user32 exports. | |
| 4021 'AdditionalDependencies': [ | |
| 4022 'user32.winxp.lib', | |
| 4023 ], | |
| 4024 'IgnoreDefaultLibraryNames': [ | |
| 4025 'user32.lib', | |
| 4026 ], | |
| 4014 }, | 4027 }, |
| 4015 }, | 4028 }, |
| 4016 }, | 4029 }, |
| 4017 'x64_Base': { | 4030 'x64_Base': { |
| 4018 'msvs_settings': { | 4031 'msvs_settings': { |
| 4019 'VCLinkerTool': { | 4032 'VCLinkerTool': { |
| 4020 'AdditionalOptions': [ | 4033 'AdditionalOptions': [ |
| 4021 # safeseh is not compatible with x64 | 4034 # safeseh is not compatible with x64 |
| 4022 '/dynamicbase', | 4035 '/dynamicbase', |
| 4023 '/ignore:4199', | 4036 '/ignore:4199', |
| 4024 '/ignore:4221', | 4037 '/ignore:4221', |
| 4025 '/nxcompat', | 4038 '/nxcompat', |
| 4026 ], | 4039 ], |
| 4040 'AdditionalLibraryDirectories': [ | |
| 4041 '<(DEPTH)/build/win/importlibs/x64', | |
| 4042 ], | |
| 4043 # On X64 we link against the SDK's user32 import library. | |
| 4044 # TODO(siggi): the right thing to do here is probably to | |
| 4045 # link against the Vista-level X64 import library. | |
|
M-A Ruel
2013/03/03 01:48:02
I'd prefer to not break the 5 Win2k3 users once ch
Sigurður Ásgeirsson
2013/03/25 20:43:29
I've reduced the patch in scope to only affect chr
| |
| 4046 'AdditionalDependencies': [ | |
| 4047 'user32.lib', | |
| 4048 ], | |
| 4027 }, | 4049 }, |
| 4028 }, | 4050 }, |
| 4029 }, | 4051 }, |
| 4030 }, | 4052 }, |
| 4031 }, | 4053 }, |
| 4032 }], | 4054 }], |
| 4033 ['enable_new_npdevice_api==1', { | 4055 ['enable_new_npdevice_api==1', { |
| 4034 'target_defaults': { | 4056 'target_defaults': { |
| 4035 'defines': [ | 4057 'defines': [ |
| 4036 'ENABLE_NEW_NPDEVICE_API', | 4058 'ENABLE_NEW_NPDEVICE_API', |
| (...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 4135 # settings in target dicts. SYMROOT is a special case, because many other | 4157 # settings in target dicts. SYMROOT is a special case, because many other |
| 4136 # Xcode variables depend on it, including variables such as | 4158 # Xcode variables depend on it, including variables such as |
| 4137 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 4159 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 4138 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 4160 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 4139 # files to appear (when present) in the UI as actual files and not red | 4161 # files to appear (when present) in the UI as actual files and not red |
| 4140 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 4162 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 4141 # and therefore SYMROOT, needs to be set at the project level. | 4163 # and therefore SYMROOT, needs to be set at the project level. |
| 4142 'SYMROOT': '<(DEPTH)/xcodebuild', | 4164 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 4143 }, | 4165 }, |
| 4144 } | 4166 } |
| OLD | NEW |