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

Side by Side Diff: build/common.gypi

Issue 11877003: windows: Remove DirectX SDK from search paths for include files and library files. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 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 3706 matching lines...) Expand 10 before | Expand all | Expand 10 after
3717 'msvs_system_include_dirs': [ 3717 'msvs_system_include_dirs': [
3718 '<(windows_driver_kit_path)/inc/atl71', 3718 '<(windows_driver_kit_path)/inc/atl71',
3719 '<(windows_driver_kit_path)/inc/mfc42', 3719 '<(windows_driver_kit_path)/inc/mfc42',
3720 ], 3720 ],
3721 }], 3721 }],
3722 ], 3722 ],
3723 'msvs_system_include_dirs': [ 3723 'msvs_system_include_dirs': [
3724 '<(windows_sdk_path)/Include/shared', 3724 '<(windows_sdk_path)/Include/shared',
3725 '<(windows_sdk_path)/Include/um', 3725 '<(windows_sdk_path)/Include/um',
3726 '<(windows_sdk_path)/Include/winrt', 3726 '<(windows_sdk_path)/Include/winrt',
3727 '<(directx_sdk_path)/Include',
3728 '$(VSInstallDir)/VC/atlmfc/include', 3727 '$(VSInstallDir)/VC/atlmfc/include',
3729 ], 3728 ],
3730 'msvs_cygwin_dirs': ['<(DEPTH)/third_party/cygwin'], 3729 'msvs_cygwin_dirs': ['<(DEPTH)/third_party/cygwin'],
3731 'msvs_disabled_warnings': [4351, 4396, 4503, 4819, 3730 'msvs_disabled_warnings': [4351, 4396, 4503, 4819,
3732 # TODO(maruel): These warnings are level 4. They will be slowly 3731 # TODO(maruel): These warnings are level 4. They will be slowly
3733 # removed as code is fixed. 3732 # removed as code is fixed.
3734 4100, 4121, 4125, 4127, 4130, 4131, 4189, 4201, 4238, 4244, 4245, 3733 4100, 4121, 4125, 4127, 4130, 4131, 4189, 4201, 4238, 4244, 4245,
3735 4310, 4355, 4428, 4481, 4505, 4510, 4512, 4530, 4610, 4611, 4701, 3734 4310, 4355, 4428, 4481, 4505, 4510, 4512, 4530, 4610, 4611, 4701,
3736 4702, 4706, 3735 4702, 4706,
3737 ], 3736 ],
(...skipping 11 matching lines...) Expand all
3749 ['component=="shared_library"', { 3748 ['component=="shared_library"', {
3750 'ExceptionHandling': '1', # /EHsc 3749 'ExceptionHandling': '1', # /EHsc
3751 }, { 3750 }, {
3752 'ExceptionHandling': '0', 3751 'ExceptionHandling': '0',
3753 }], 3752 }],
3754 ], 3753 ],
3755 }, 3754 },
3756 'VCLibrarianTool': { 3755 'VCLibrarianTool': {
3757 'AdditionalOptions': ['/ignore:4221'], 3756 'AdditionalOptions': ['/ignore:4221'],
3758 'AdditionalLibraryDirectories': [ 3757 'AdditionalLibraryDirectories': [
3759 '<(directx_sdk_path)/Lib/x86',
3760 '<(windows_sdk_path)/Lib/win8/um/x86', 3758 '<(windows_sdk_path)/Lib/win8/um/x86',
3761 ], 3759 ],
3762 }, 3760 },
3763 'VCLinkerTool': { 3761 'VCLinkerTool': {
3764 'AdditionalDependencies': [ 3762 'AdditionalDependencies': [
3765 'wininet.lib', 3763 'wininet.lib',
3766 'dnsapi.lib', 3764 'dnsapi.lib',
3767 'version.lib', 3765 'version.lib',
3768 'msimg32.lib', 3766 'msimg32.lib',
3769 'ws2_32.lib', 3767 'ws2_32.lib',
(...skipping 11 matching lines...) Expand all
3781 'advapi32.lib', 3779 'advapi32.lib',
3782 'comdlg32.lib', 3780 'comdlg32.lib',
3783 'ole32.lib', 3781 'ole32.lib',
3784 'shell32.lib', 3782 'shell32.lib',
3785 'user32.lib', 3783 'user32.lib',
3786 'winspool.lib', 3784 'winspool.lib',
3787 ], 3785 ],
3788 }], 3786 }],
3789 ], 3787 ],
3790 'AdditionalLibraryDirectories': [ 3788 'AdditionalLibraryDirectories': [
3791 '<(directx_sdk_path)/Lib/x86',
3792 '<(windows_sdk_path)/Lib/win8/um/x86', 3789 '<(windows_sdk_path)/Lib/win8/um/x86',
3793 ], 3790 ],
3794 'GenerateDebugInformation': 'true', 3791 'GenerateDebugInformation': 'true',
3795 'MapFileName': '$(OutDir)\\$(TargetName).map', 3792 'MapFileName': '$(OutDir)\\$(TargetName).map',
3796 'ImportLibrary': '$(OutDir)\\lib\\$(TargetName).lib', 3793 'ImportLibrary': '$(OutDir)\\lib\\$(TargetName).lib',
3797 'FixedBaseAddress': '1', 3794 'FixedBaseAddress': '1',
3798 # SubSystem values: 3795 # SubSystem values:
3799 # 0 == not set 3796 # 0 == not set
3800 # 1 == /SUBSYSTEM:CONSOLE 3797 # 1 == /SUBSYSTEM:CONSOLE
3801 # 2 == /SUBSYSTEM:WINDOWS 3798 # 2 == /SUBSYSTEM:WINDOWS
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
3961 # settings in target dicts. SYMROOT is a special case, because many other 3958 # settings in target dicts. SYMROOT is a special case, because many other
3962 # Xcode variables depend on it, including variables such as 3959 # Xcode variables depend on it, including variables such as
3963 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 3960 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
3964 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 3961 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
3965 # files to appear (when present) in the UI as actual files and not red 3962 # files to appear (when present) in the UI as actual files and not red
3966 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 3963 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
3967 # and therefore SYMROOT, needs to be set at the project level. 3964 # and therefore SYMROOT, needs to be set at the project level.
3968 'SYMROOT': '<(DEPTH)/xcodebuild', 3965 'SYMROOT': '<(DEPTH)/xcodebuild',
3969 }, 3966 },
3970 } 3967 }
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