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

Side by Side Diff: build/common.gypi

Issue 10264015: Don't override _HAS_TR1 on VS > 2008 (Closed) Base URL: http://git.chromium.org/native_client/src/native_client.git@master
Patch Set: Created 8 years, 7 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) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 # .gyp files should set chromium_code to 1 if they build Chromium-specific 7 # .gyp files should set chromium_code to 1 if they build Chromium-specific
8 # code, as opposed to external code. This variable is used to control 8 # code, as opposed to external code. This variable is used to control
9 # such things as the set of warnings to enable, and whether warnings are 9 # such things as the set of warnings to enable, and whether warnings are
10 # treated as errors. 10 # treated as errors.
(...skipping 638 matching lines...) Expand 10 before | Expand all | Expand 10 after
649 'defines': [ 649 'defines': [
650 '_WIN32_WINNT=0x0600', 650 '_WIN32_WINNT=0x0600',
651 'WINVER=0x0600', 651 'WINVER=0x0600',
652 'WIN32', 652 'WIN32',
653 '_WINDOWS', 653 '_WINDOWS',
654 'NOMINMAX', 654 'NOMINMAX',
655 '_CRT_RAND_S', 655 '_CRT_RAND_S',
656 'CERT_CHAIN_PARA_HAS_EXTRA_FIELDS', 656 'CERT_CHAIN_PARA_HAS_EXTRA_FIELDS',
657 'WIN32_LEAN_AND_MEAN', 657 'WIN32_LEAN_AND_MEAN',
658 '_SECURE_ATL', 658 '_SECURE_ATL',
659 '_HAS_TR1=0',
660 '__STDC_LIMIT_MACROS=1', 659 '__STDC_LIMIT_MACROS=1',
661 660
662 'NACL_LINUX=0', 661 'NACL_LINUX=0',
663 'NACL_OSX=0', 662 'NACL_OSX=0',
664 'NACL_WINDOWS=1' 663 'NACL_WINDOWS=1'
665 ], 664 ],
666 'conditions': [ 665 'conditions': [
667 ['component=="static_library"', { 666 ['component=="static_library"', {
668 'defines': [ 667 'defines': [
669 '_HAS_EXCEPTIONS=0', 668 '_HAS_EXCEPTIONS=0',
670 ], 669 ],
671 }], 670 }],
671 ['MSVS_VERSION=="2008"', {
672 'defines': [
673 '_HAS_TR1=0',
674 ],
675 }],
672 ], 676 ],
673 'msvs_system_include_dirs': [ 677 'msvs_system_include_dirs': [
674 '<(DEPTH)/third_party/platformsdk_win7/files/Include', 678 '<(DEPTH)/third_party/platformsdk_win7/files/Include',
675 ], 679 ],
676 'msvs_cygwin_dirs': ['../third_party/cygwin'], 680 'msvs_cygwin_dirs': ['../third_party/cygwin'],
677 # TODO(bsy) remove 4355 once cross-repo 681 # TODO(bsy) remove 4355 once cross-repo
678 # NACL_ALLOW_THIS_IN_INITIALIZER_LIST changes go in. 682 # NACL_ALLOW_THIS_IN_INITIALIZER_LIST changes go in.
679 'msvs_disabled_warnings': [4355, 4396, 4503, 4800, 4819], 683 'msvs_disabled_warnings': [4355, 4396, 4503, 4800, 4819],
680 'msvs_settings': { 684 'msvs_settings': {
681 'VCCLCompilerTool': { 685 'VCCLCompilerTool': {
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
799 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 803 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
800 # files to appear (when present) in the UI as actual files and not red 804 # files to appear (when present) in the UI as actual files and not red
801 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 805 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
802 # and therefore SYMROOT, needs to be set at the project level. 806 # and therefore SYMROOT, needs to be set at the project level.
803 'SYMROOT': '<(DEPTH)/xcodebuild', 807 'SYMROOT': '<(DEPTH)/xcodebuild',
804 }, 808 },
805 'includes': [ 809 'includes': [
806 'untrusted.gypi', 810 'untrusted.gypi',
807 ], 811 ],
808 } 812 }
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