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

Side by Side Diff: build/common.gypi

Issue 11188040: Automatically use ATL from Windows Driver Kit for SDK-only or Visual Studio Express setup. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 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 904 matching lines...) Expand 10 before | Expand all | Expand 10 after
915 ['OS=="win" and "<!(python <(DEPTH)/build/dir_exists.py <(windows_sdk_defa ult_path))"=="True"', { 915 ['OS=="win" and "<!(python <(DEPTH)/build/dir_exists.py <(windows_sdk_defa ult_path))"=="True"', {
916 'windows_sdk_path%': '<(windows_sdk_default_path)', 916 'windows_sdk_path%': '<(windows_sdk_default_path)',
917 }, { 917 }, {
918 'windows_sdk_path%': 'C:/Program Files (x86)/Windows Kits/8.0', 918 'windows_sdk_path%': 'C:/Program Files (x86)/Windows Kits/8.0',
919 }], 919 }],
920 ['OS=="win" and "<!(python <(DEPTH)/build/dir_exists.py <(directx_sdk_defa ult_path))"=="True"', { 920 ['OS=="win" and "<!(python <(DEPTH)/build/dir_exists.py <(directx_sdk_defa ult_path))"=="True"', {
921 'directx_sdk_path%': '<(directx_sdk_default_path)', 921 'directx_sdk_path%': '<(directx_sdk_default_path)',
922 }, { 922 }, {
923 'directx_sdk_path%': '$(DXSDK_DIR)', 923 'directx_sdk_path%': '$(DXSDK_DIR)',
924 }], 924 }],
925 ['OS=="win"', {
926 'windows_driver_kit_path%': '$(WDK_DIR)',
927 }],
925 # If use_official_google_api_keys is already set (to 0 or 1), we 928 # If use_official_google_api_keys is already set (to 0 or 1), we
926 # do none of the implicit checking. If it is set to 1 and the 929 # do none of the implicit checking. If it is set to 1 and the
927 # internal keys file is missing, the build will fail at compile 930 # internal keys file is missing, the build will fail at compile
928 # time. If it is set to 0 and keys are not provided by other 931 # time. If it is set to 0 and keys are not provided by other
929 # means, a warning will be printed at compile time. 932 # means, a warning will be printed at compile time.
930 ['use_official_google_api_keys==2', { 933 ['use_official_google_api_keys==2', {
931 'use_official_google_api_keys%': 934 'use_official_google_api_keys%':
932 '<!(python <(DEPTH)/google_apis/build/check_internal.py <(DEPTH)/goo gle_apis/internal/google_chrome_api_keys.h)', 935 '<!(python <(DEPTH)/google_apis/build/check_internal.py <(DEPTH)/goo gle_apis/internal/google_chrome_api_keys.h)',
933 }], 936 }],
934 ['os_posix==1 and OS!="mac" and OS!="ios"', { 937 ['os_posix==1 and OS!="mac" and OS!="ios"', {
(...skipping 1001 matching lines...) Expand 10 before | Expand all | Expand 10 after
1936 ['<(windows_sdk_path)/Lib/win8/um/x86'], 1939 ['<(windows_sdk_path)/Lib/win8/um/x86'],
1937 'AdditionalLibraryDirectories': 1940 'AdditionalLibraryDirectories':
1938 ['<(windows_sdk_path)/Lib/win8/um/x64'], 1941 ['<(windows_sdk_path)/Lib/win8/um/x64'],
1939 }, 1942 },
1940 'VCLibrarianTool': { 1943 'VCLibrarianTool': {
1941 'AdditionalLibraryDirectories!': 1944 'AdditionalLibraryDirectories!':
1942 ['<(windows_sdk_path)/Lib/win8/um/x86'], 1945 ['<(windows_sdk_path)/Lib/win8/um/x86'],
1943 'AdditionalLibraryDirectories': 1946 'AdditionalLibraryDirectories':
1944 ['<(windows_sdk_path)/Lib/win8/um/x64'], 1947 ['<(windows_sdk_path)/Lib/win8/um/x64'],
1945 }, 1948 },
1949 'conditions': [
1950 ['msvs_express', {
1951 'VCLinkerTool': {
1952 'AdditionalLibraryDirectories!':
1953 ['<(windows_driver_kit_path)/lib/ATL/i386'],
1954 'AdditionalLibraryDirectories':
1955 ['<(windows_driver_kit_path)/lib/ATL/amd64'],
1956 },
1957 'VCLibrarianTool': {
1958 'AdditionalLibraryDirectories!':
1959 ['<(windows_driver_kit_path)/lib/ATL/i386'],
1960 'AdditionalLibraryDirectories':
1961 ['<(windows_driver_kit_path)/lib/ATL/amd64'],
1962 },
1963 }],
1964 ],
1946 }, 1965 },
1947 'defines': [ 1966 'defines': [
1948 # Not sure if tcmalloc works on 64-bit Windows. 1967 # Not sure if tcmalloc works on 64-bit Windows.
1949 'NO_TCMALLOC', 1968 'NO_TCMALLOC',
1950 ], 1969 ],
1951 }, 1970 },
1952 'Debug_Base': { 1971 'Debug_Base': {
1953 'abstract': 1, 1972 'abstract': 1,
1954 'defines': [ 1973 'defines': [
1955 'DYNAMIC_ANNOTATIONS_ENABLED=1', 1974 'DYNAMIC_ANNOTATIONS_ENABLED=1',
(...skipping 1402 matching lines...) Expand 10 before | Expand all | Expand 10 after
3358 ['MSVS_VERSION=="2008"', { 3377 ['MSVS_VERSION=="2008"', {
3359 'defines': [ 3378 'defines': [
3360 '_HAS_TR1=0', 3379 '_HAS_TR1=0',
3361 ], 3380 ],
3362 }], 3381 }],
3363 ['secure_atl', { 3382 ['secure_atl', {
3364 'defines': [ 3383 'defines': [
3365 '_SECURE_ATL', 3384 '_SECURE_ATL',
3366 ], 3385 ],
3367 }], 3386 }],
3387 ['msvs_express', {
3388 'msvs_system_include_dirs': [
3389 '<(windows_driver_kit_path)/inc/atl71',
3390 '<(windows_driver_kit_path)/inc/mfc42',
scottmg 2012/10/17 18:26:20 we need the mfc headers but no libs?
alexeypa (please no reviews) 2012/10/17 22:17:03 Yes. The build fails without it. I haven't looked
3391 ],
3392 }],
3368 ], 3393 ],
3369 'msvs_system_include_dirs': [ 3394 'msvs_system_include_dirs': [
3370 '<(windows_sdk_path)/Include/shared', 3395 '<(windows_sdk_path)/Include/shared',
3371 '<(windows_sdk_path)/Include/um', 3396 '<(windows_sdk_path)/Include/um',
3372 '<(windows_sdk_path)/Include/winrt', 3397 '<(windows_sdk_path)/Include/winrt',
3373 '<(directx_sdk_path)/Include', 3398 '<(directx_sdk_path)/Include',
3374 '$(VSInstallDir)/VC/atlmfc/include', 3399 '$(VSInstallDir)/VC/atlmfc/include',
3375 ], 3400 ],
3376 'msvs_cygwin_dirs': ['<(DEPTH)/third_party/cygwin'], 3401 'msvs_cygwin_dirs': ['<(DEPTH)/third_party/cygwin'],
3377 'msvs_disabled_warnings': [4351, 4396, 4503, 4819, 3402 'msvs_disabled_warnings': [4351, 4396, 4503, 4819,
(...skipping 20 matching lines...) Expand all
3398 'ExceptionHandling': '0', 3423 'ExceptionHandling': '0',
3399 }], 3424 }],
3400 ], 3425 ],
3401 }, 3426 },
3402 'VCLibrarianTool': { 3427 'VCLibrarianTool': {
3403 'AdditionalOptions': ['/ignore:4221'], 3428 'AdditionalOptions': ['/ignore:4221'],
3404 'AdditionalLibraryDirectories': [ 3429 'AdditionalLibraryDirectories': [
3405 '<(directx_sdk_path)/Lib/x86', 3430 '<(directx_sdk_path)/Lib/x86',
3406 '<(windows_sdk_path)/Lib/win8/um/x86', 3431 '<(windows_sdk_path)/Lib/win8/um/x86',
3407 ], 3432 ],
3433 'conditions': [
3434 ['msvs_express', {
3435 'AdditionalLibraryDirectories': [
3436 '<(windows_driver_kit_path)/lib/ATL/i386',
3437 ],
3438 }],
3439 ],
3408 }, 3440 },
3409 'VCLinkerTool': { 3441 'VCLinkerTool': {
3410 'AdditionalDependencies': [ 3442 'AdditionalDependencies': [
3411 'wininet.lib', 3443 'wininet.lib',
3412 'dnsapi.lib', 3444 'dnsapi.lib',
3413 'version.lib', 3445 'version.lib',
3414 'msimg32.lib', 3446 'msimg32.lib',
3415 'ws2_32.lib', 3447 'ws2_32.lib',
3416 'usp10.lib', 3448 'usp10.lib',
3417 'psapi.lib', 3449 'psapi.lib',
3418 'dbghelp.lib', 3450 'dbghelp.lib',
3419 'winmm.lib', 3451 'winmm.lib',
3420 'shlwapi.lib', 3452 'shlwapi.lib',
3421 ], 3453 ],
3422 3454
3423 'conditions': [ 3455 'conditions': [
3424 ['msvs_express', { 3456 ['msvs_express', {
3425 # Explicitly required when using the ATL with express 3457 # Explicitly required when using the ATL with express
3426 'AdditionalDependencies': [ 3458 'AdditionalDependencies': [
3427 'atlthunk.lib', 3459 'atlthunk.lib',
3428 ], 3460 ],
3461 'AdditionalLibraryDirectories': [
3462 '<(windows_driver_kit_path)/lib/ATL/i386',
3463 ],
3429 3464
3430 # ATL 8.0 included in WDK 7.1 makes the linker to generate 3465 # ATL 8.0 included in WDK 7.1 makes the linker to generate
3431 # almost eight hundred LNK4254 and LNK4078 warnings: 3466 # almost eight hundred LNK4254 and LNK4078 warnings:
3432 # - warning LNK4254: section 'ATL' (50000040) merged into 3467 # - warning LNK4254: section 'ATL' (50000040) merged into
3433 # '.rdata' (40000040) with different attributes 3468 # '.rdata' (40000040) with different attributes
3434 # - warning LNK4078: multiple 'ATL' sections found with 3469 # - warning LNK4078: multiple 'ATL' sections found with
3435 # different attributes 3470 # different attributes
3436 'AdditionalOptions': ['/ignore:4254', '/ignore:4078'], 3471 'AdditionalOptions': ['/ignore:4254', '/ignore:4078'],
3437 }], 3472 }],
3438 ['MSVS_VERSION=="2005e"', { 3473 ['MSVS_VERSION=="2005e"', {
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
3620 # settings in target dicts. SYMROOT is a special case, because many other 3655 # settings in target dicts. SYMROOT is a special case, because many other
3621 # Xcode variables depend on it, including variables such as 3656 # Xcode variables depend on it, including variables such as
3622 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 3657 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
3623 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 3658 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
3624 # files to appear (when present) in the UI as actual files and not red 3659 # files to appear (when present) in the UI as actual files and not red
3625 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 3660 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
3626 # and therefore SYMROOT, needs to be set at the project level. 3661 # and therefore SYMROOT, needs to be set at the project level.
3627 'SYMROOT': '<(DEPTH)/xcodebuild', 3662 'SYMROOT': '<(DEPTH)/xcodebuild',
3628 }, 3663 },
3629 } 3664 }
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