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

Side by Side Diff: build/common.gypi

Issue 8568029: Add gamepad hardware data fetcher, and higher level thread container (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: swap search path order for platformsdk/directx Created 9 years, 1 month 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 | content/browser/gamepad/data_fetcher.h » ('j') | 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 # 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 2415 matching lines...) Expand 10 before | Expand all | Expand 10 after
2426 '_HAS_EXCEPTIONS=0', 2426 '_HAS_EXCEPTIONS=0',
2427 ], 2427 ],
2428 }], 2428 }],
2429 ['secure_atl', { 2429 ['secure_atl', {
2430 'defines': [ 2430 'defines': [
2431 '_SECURE_ATL', 2431 '_SECURE_ATL',
2432 ], 2432 ],
2433 }], 2433 }],
2434 ], 2434 ],
2435 'msvs_system_include_dirs': [ 2435 'msvs_system_include_dirs': [
2436 '<(DEPTH)/third_party/directxsdk/files/Include',
2436 '<(DEPTH)/third_party/platformsdk_win7/files/Include', 2437 '<(DEPTH)/third_party/platformsdk_win7/files/Include',
2437 '<(DEPTH)/third_party/directxsdk/files/Include',
2438 '$(VSInstallDir)/VC/atlmfc/include', 2438 '$(VSInstallDir)/VC/atlmfc/include',
2439 ], 2439 ],
2440 'msvs_cygwin_dirs': ['<(DEPTH)/third_party/cygwin'], 2440 'msvs_cygwin_dirs': ['<(DEPTH)/third_party/cygwin'],
2441 'msvs_disabled_warnings': [4351, 4396, 4503, 4819, 2441 'msvs_disabled_warnings': [4351, 4396, 4503, 4819,
2442 # TODO(maruel): These warnings are level 4. They will be slowly 2442 # TODO(maruel): These warnings are level 4. They will be slowly
2443 # removed as code is fixed. 2443 # removed as code is fixed.
2444 4100, 4121, 4125, 4127, 4130, 4131, 4189, 4201, 4238, 4244, 4245, 2444 4100, 4121, 4125, 4127, 4130, 4131, 4189, 4201, 4238, 4244, 4245,
2445 4310, 4355, 4428, 4481, 4505, 4510, 4512, 4530, 4610, 4611, 4701, 2445 4310, 4355, 4428, 4481, 4505, 4510, 4512, 4530, 4610, 4611, 4701,
2446 4702, 4706, 2446 4702, 4706,
2447 ], 2447 ],
(...skipping 16 matching lines...) Expand all
2464 ['component=="shared_library"', { 2464 ['component=="shared_library"', {
2465 'ExceptionHandling': '1', # /EHsc 2465 'ExceptionHandling': '1', # /EHsc
2466 }, { 2466 }, {
2467 'ExceptionHandling': '0', 2467 'ExceptionHandling': '0',
2468 }], 2468 }],
2469 ], 2469 ],
2470 }, 2470 },
2471 'VCLibrarianTool': { 2471 'VCLibrarianTool': {
2472 'AdditionalOptions': ['/ignore:4221'], 2472 'AdditionalOptions': ['/ignore:4221'],
2473 'AdditionalLibraryDirectories': [ 2473 'AdditionalLibraryDirectories': [
2474 '<(DEPTH)/third_party/directxsdk/files/Lib/x86',
2474 '<(DEPTH)/third_party/platformsdk_win7/files/Lib', 2475 '<(DEPTH)/third_party/platformsdk_win7/files/Lib',
2475 '<(DEPTH)/third_party/directxsdk/files/Lib/x86',
2476 ], 2476 ],
2477 }, 2477 },
2478 'VCLinkerTool': { 2478 'VCLinkerTool': {
2479 'AdditionalDependencies': [ 2479 'AdditionalDependencies': [
2480 'wininet.lib', 2480 'wininet.lib',
2481 'dnsapi.lib', 2481 'dnsapi.lib',
2482 'version.lib', 2482 'version.lib',
2483 'msimg32.lib', 2483 'msimg32.lib',
2484 'ws2_32.lib', 2484 'ws2_32.lib',
2485 'usp10.lib', 2485 'usp10.lib',
(...skipping 15 matching lines...) Expand all
2501 'advapi32.lib', 2501 'advapi32.lib',
2502 'comdlg32.lib', 2502 'comdlg32.lib',
2503 'ole32.lib', 2503 'ole32.lib',
2504 'shell32.lib', 2504 'shell32.lib',
2505 'user32.lib', 2505 'user32.lib',
2506 'winspool.lib', 2506 'winspool.lib',
2507 ], 2507 ],
2508 }], 2508 }],
2509 ], 2509 ],
2510 'AdditionalLibraryDirectories': [ 2510 'AdditionalLibraryDirectories': [
2511 '<(DEPTH)/third_party/directxsdk/files/Lib/x86',
2511 '<(DEPTH)/third_party/platformsdk_win7/files/Lib', 2512 '<(DEPTH)/third_party/platformsdk_win7/files/Lib',
2512 '<(DEPTH)/third_party/directxsdk/files/Lib/x86',
2513 ], 2513 ],
2514 'GenerateDebugInformation': 'true', 2514 'GenerateDebugInformation': 'true',
2515 'MapFileName': '$(OutDir)\\$(TargetName).map', 2515 'MapFileName': '$(OutDir)\\$(TargetName).map',
2516 'ImportLibrary': '$(OutDir)\\lib\\$(TargetName).lib', 2516 'ImportLibrary': '$(OutDir)\\lib\\$(TargetName).lib',
2517 'FixedBaseAddress': '1', 2517 'FixedBaseAddress': '1',
2518 # SubSystem values: 2518 # SubSystem values:
2519 # 0 == not set 2519 # 0 == not set
2520 # 1 == /SUBSYSTEM:CONSOLE 2520 # 1 == /SUBSYSTEM:CONSOLE
2521 # 2 == /SUBSYSTEM:WINDOWS 2521 # 2 == /SUBSYSTEM:WINDOWS
2522 # Most of the executables we'll ever create are tests 2522 # Most of the executables we'll ever create are tests
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
2627 # settings in target dicts. SYMROOT is a special case, because many other 2627 # settings in target dicts. SYMROOT is a special case, because many other
2628 # Xcode variables depend on it, including variables such as 2628 # Xcode variables depend on it, including variables such as
2629 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 2629 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
2630 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 2630 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
2631 # files to appear (when present) in the UI as actual files and not red 2631 # files to appear (when present) in the UI as actual files and not red
2632 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 2632 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
2633 # and therefore SYMROOT, needs to be set at the project level. 2633 # and therefore SYMROOT, needs to be set at the project level.
2634 'SYMROOT': '<(DEPTH)/xcodebuild', 2634 'SYMROOT': '<(DEPTH)/xcodebuild',
2635 }, 2635 },
2636 } 2636 }
OLDNEW
« no previous file with comments | « no previous file | content/browser/gamepad/data_fetcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698