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

Side by Side Diff: build/common.gypi

Issue 1239002: Fix some gyp errors found with --check. (Closed)
Patch Set: Created 10 years, 9 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
« 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) 2010 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2010 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': { 9 'variables': {
10 # .gyp files or targets should set chromium_code to 1 if they build 10 # .gyp files or targets should set chromium_code to 1 if they build
(...skipping 526 matching lines...) Expand 10 before | Expand all | Expand 10 after
537 }, 537 },
538 }, 538 },
539 'msvs_configuration_platform': 'Win32', 539 'msvs_configuration_platform': 'Win32',
540 }, 540 },
541 'x64_Base': { 541 'x64_Base': {
542 'abstract': 1, 542 'abstract': 1,
543 'msvs_configuration_platform': 'x64', 543 'msvs_configuration_platform': 'x64',
544 'msvs_settings': { 544 'msvs_settings': {
545 'VCLinkerTool': { 545 'VCLinkerTool': {
546 'TargetMachine': '17', # x86 - 64 546 'TargetMachine': '17', # x86 - 64
547 },
548 },
549 'msvs_settings': {
550 'VCLibrarianTool': {
551 'AdditionalLibraryDirectories!': 547 'AdditionalLibraryDirectories!':
552 ['<(DEPTH)/third_party/platformsdk_win7/files/Lib'], 548 ['<(DEPTH)/third_party/platformsdk_win7/files/Lib'],
553 'AdditionalLibraryDirectories': 549 'AdditionalLibraryDirectories':
554 ['<(DEPTH)/third_party/platformsdk_win7/files/Lib/x64'], 550 ['<(DEPTH)/third_party/platformsdk_win7/files/Lib/x64'],
555 }, 551 },
556 'VCLinkerTool': { 552 'VCLibrarianTool': {
557 'TargetMachine': '17',
558 'AdditionalLibraryDirectories!': 553 'AdditionalLibraryDirectories!':
559 ['<(DEPTH)/third_party/platformsdk_win7/files/Lib'], 554 ['<(DEPTH)/third_party/platformsdk_win7/files/Lib'],
560 'AdditionalLibraryDirectories': 555 'AdditionalLibraryDirectories':
561 ['<(DEPTH)/third_party/platformsdk_win7/files/Lib/x64'], 556 ['<(DEPTH)/third_party/platformsdk_win7/files/Lib/x64'],
562 }, 557 },
563 }, 558 },
564 'defines': [ 559 'defines': [
565 # Not sure if tcmalloc works on 64-bit Windows. 560 # Not sure if tcmalloc works on 64-bit Windows.
566 'NO_TCMALLOC', 561 'NO_TCMALLOC',
567 ], 562 ],
(...skipping 670 matching lines...) Expand 10 before | Expand all | Expand 10 after
1238 # and therefore SYMROOT, needs to be set at the project level. 1233 # and therefore SYMROOT, needs to be set at the project level.
1239 'SYMROOT': '<(DEPTH)/xcodebuild', 1234 'SYMROOT': '<(DEPTH)/xcodebuild',
1240 }, 1235 },
1241 } 1236 }
1242 1237
1243 # Local Variables: 1238 # Local Variables:
1244 # tab-width:2 1239 # tab-width:2
1245 # indent-tabs-mode:nil 1240 # indent-tabs-mode:nil
1246 # End: 1241 # End:
1247 # vim: set expandtab tabstop=2 shiftwidth=2: 1242 # vim: set expandtab tabstop=2 shiftwidth=2:
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