Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1348)

Side by Side Diff: build/common.gypi

Issue 145493007: win: Remove msbuild_toolset, and msvs-specific ProgramDatabaseFile. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 1181 matching lines...) Expand 10 before | Expand all | Expand 10 after
1192 'chromium_ios_signing%': 1, 1192 'chromium_ios_signing%': 1,
1193 1193
1194 # This flag is only used when disable_nacl==0 and disables all those 1194 # This flag is only used when disable_nacl==0 and disables all those
1195 # subcomponents which would require the installation of a native_client 1195 # subcomponents which would require the installation of a native_client
1196 # untrusted toolchain. 1196 # untrusted toolchain.
1197 'disable_nacl_untrusted%': 0, 1197 'disable_nacl_untrusted%': 0,
1198 1198
1199 # Disable Dart by default. 1199 # Disable Dart by default.
1200 'enable_dart%': 0, 1200 'enable_dart%': 0,
1201 1201
1202 # The desired version of Windows SDK can be set in ~/.gyp/include.gypi.
1203 'msbuild_toolset%': '',
1204
1205 # Native Client is enabled by default. 1202 # Native Client is enabled by default.
1206 'disable_nacl%': 0, 1203 'disable_nacl%': 0,
1207 1204
1208 # Portable Native Client is enabled by default. 1205 # Portable Native Client is enabled by default.
1209 'disable_pnacl%': 0, 1206 'disable_pnacl%': 0,
1210 1207
1211 # Whether to build full debug version for Debug configuration on Android. 1208 # Whether to build full debug version for Debug configuration on Android.
1212 # Compared to full debug version, the default Debug configuration on Android 1209 # Compared to full debug version, the default Debug configuration on Android
1213 # has no full v8 debug, has size optimization and linker gc section, so that 1210 # has no full v8 debug, has size optimization and linker gc section, so that
1214 # we can build a debug version with acceptable size and performance. 1211 # we can build a debug version with acceptable size and performance.
(...skipping 865 matching lines...) Expand 10 before | Expand all | Expand 10 after
2080 'defines': ['TYPE_PROFILING'], 2077 'defines': ['TYPE_PROFILING'],
2081 'dependencies': [ 2078 'dependencies': [
2082 '<(DEPTH)/base/allocator/allocator.gyp:type_profiler', 2079 '<(DEPTH)/base/allocator/allocator.gyp:type_profiler',
2083 ], 2080 ],
2084 }], 2081 }],
2085 ['OS=="linux" and clang==1 and host_arch=="ia32"', { 2082 ['OS=="linux" and clang==1 and host_arch=="ia32"', {
2086 # TODO(dmikurube): Remove -Wno-sentinel when Clang/LLVM is fixed. 2083 # TODO(dmikurube): Remove -Wno-sentinel when Clang/LLVM is fixed.
2087 # See http://crbug.com/162818. 2084 # See http://crbug.com/162818.
2088 'cflags+': ['-Wno-sentinel'], 2085 'cflags+': ['-Wno-sentinel'],
2089 }], 2086 }],
2090 ['OS=="win" and "<(msbuild_toolset)"!=""', {
2091 'msbuild_toolset': '<(msbuild_toolset)',
2092 }],
2093 ['branding=="Chrome"', { 2087 ['branding=="Chrome"', {
2094 'defines': ['GOOGLE_CHROME_BUILD'], 2088 'defines': ['GOOGLE_CHROME_BUILD'],
2095 }, { # else: branding!="Chrome" 2089 }, { # else: branding!="Chrome"
2096 'defines': ['CHROMIUM_BUILD'], 2090 'defines': ['CHROMIUM_BUILD'],
2097 }], 2091 }],
2098 ['OS=="mac" and component=="shared_library"', { 2092 ['OS=="mac" and component=="shared_library"', {
2099 'xcode_settings': { 2093 'xcode_settings': {
2100 'DYLIB_INSTALL_NAME_BASE': '@rpath', 2094 'DYLIB_INSTALL_NAME_BASE': '@rpath',
2101 'LD_RUNPATH_SEARCH_PATHS': [ 2095 'LD_RUNPATH_SEARCH_PATHS': [
2102 # For unbundled binaries. 2096 # For unbundled binaries.
(...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after
2352 # Generates debug info when win_z7=1 2346 # Generates debug info when win_z7=1
2353 # even if fastbuild=1 (that makes GenerateDebugInformation false). 2347 # even if fastbuild=1 (that makes GenerateDebugInformation false).
2354 'VCLinkerTool': { 2348 'VCLinkerTool': {
2355 'GenerateDebugInformation': 'true', 2349 'GenerateDebugInformation': 'true',
2356 }, 2350 },
2357 'VCCLCompilerTool': { 2351 'VCCLCompilerTool': {
2358 'DebugInformationFormat': '1', 2352 'DebugInformationFormat': '1',
2359 } 2353 }
2360 } 2354 }
2361 }], 2355 }],
2362 ['"<(GENERATOR)"=="msvs"', {
2363 'msvs_settings': {
2364 'VCLinkerTool': {
2365 # Make the pdb name sane. Otherwise foo.exe and foo.dll both
2366 # have foo.pdb. The ninja generator already defaults to this and
2367 # can't handle the $(TargetPath) macro.
2368 'ProgramDatabaseFile': '$(TargetPath).pdb',
2369 }
2370 },
2371 }],
2372 ], # win_z7!=0 2356 ], # win_z7!=0
2373 }], # OS==win 2357 }], # OS==win
2374 ['enable_task_manager==1', { 2358 ['enable_task_manager==1', {
2375 'defines': [ 2359 'defines': [
2376 'ENABLE_TASK_MANAGER=1', 2360 'ENABLE_TASK_MANAGER=1',
2377 ], 2361 ],
2378 }], 2362 }],
2379 ['enable_extensions==1', { 2363 ['enable_extensions==1', {
2380 'defines': [ 2364 'defines': [
2381 'ENABLE_EXTENSIONS=1', 2365 'ENABLE_EXTENSIONS=1',
(...skipping 2448 matching lines...) Expand 10 before | Expand all | Expand 10 after
4830 # settings in target dicts. SYMROOT is a special case, because many other 4814 # settings in target dicts. SYMROOT is a special case, because many other
4831 # Xcode variables depend on it, including variables such as 4815 # Xcode variables depend on it, including variables such as
4832 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4816 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4833 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4817 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4834 # files to appear (when present) in the UI as actual files and not red 4818 # files to appear (when present) in the UI as actual files and not red
4835 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4819 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4836 # and therefore SYMROOT, needs to be set at the project level. 4820 # and therefore SYMROOT, needs to be set at the project level.
4837 'SYMROOT': '<(DEPTH)/xcodebuild', 4821 'SYMROOT': '<(DEPTH)/xcodebuild',
4838 }, 4822 },
4839 } 4823 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698