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

Side by Side Diff: build/common.gypi

Issue 6676030: WinDDK ATL and MSVC express compatability (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: common.gypi: use gyp defines instead of direct compiler flags; _SECURE_ATL conditional handling Created 9 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 | Annotate | Revision Log
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 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 434 matching lines...) Expand 10 before | Expand all | Expand 10 after
445 'msvs_multi_core_compile%': 0, 445 'msvs_multi_core_compile%': 0,
446 },{ 446 },{
447 'msvs_multi_core_compile%': 1, 447 'msvs_multi_core_compile%': 1,
448 }], 448 }],
449 # Don't do incremental linking for large modules on 32-bit. 449 # Don't do incremental linking for large modules on 32-bit.
450 ['MSVS_OS_BITS==32', { 450 ['MSVS_OS_BITS==32', {
451 'msvs_large_module_debug_link_mode%': '1', # No 451 'msvs_large_module_debug_link_mode%': '1', # No
452 },{ 452 },{
453 'msvs_large_module_debug_link_mode%': '2', # Yes 453 'msvs_large_module_debug_link_mode%': '2', # Yes
454 }], 454 }],
455 ['MSVS_VERSION=="2010e" or MSVS_VERSION=="2008e" or MSVS_VERSION=="200 5e"', {
456 'msvs_express%': 1,
457 'secure_atl%': 0,
Mark Mentovai 2011/03/17 16:45:10 For my own benefit, what’s “secure” ATL? Is this r
Mark Mentovai 2011/03/17 16:49:48 Mark Mentovai wrote:
458 },{
459 'msvs_express%': 0,
460 'secure_atl%': 1,
461 }],
455 ], 462 ],
456 'nacl_win64_defines': [ 463 'nacl_win64_defines': [
457 # This flag is used to minimize dependencies when building 464 # This flag is used to minimize dependencies when building
458 # Native Client loader for 64-bit Windows. 465 # Native Client loader for 64-bit Windows.
459 'NACL_WIN64', 466 'NACL_WIN64',
460 ], 467 ],
461 }], 468 }],
462 469
463 ['OS=="mac" or (OS=="linux" and chromeos==0 and target_arch!="arm")', { 470 ['OS=="mac" or (OS=="linux" and chromeos==0 and target_arch!="arm")', {
464 'use_cups%': 1, 471 'use_cups%': 1,
(...skipping 974 matching lines...) Expand 10 before | Expand all | Expand 10 after
1439 'target_defaults': { 1446 'target_defaults': {
1440 'defines': [ 1447 'defines': [
1441 '_WIN32_WINNT=0x0600', 1448 '_WIN32_WINNT=0x0600',
1442 'WINVER=0x0600', 1449 'WINVER=0x0600',
1443 'WIN32', 1450 'WIN32',
1444 '_WINDOWS', 1451 '_WINDOWS',
1445 'NOMINMAX', 1452 'NOMINMAX',
1446 '_CRT_RAND_S', 1453 '_CRT_RAND_S',
1447 'CERT_CHAIN_PARA_HAS_EXTRA_FIELDS', 1454 'CERT_CHAIN_PARA_HAS_EXTRA_FIELDS',
1448 'WIN32_LEAN_AND_MEAN', 1455 'WIN32_LEAN_AND_MEAN',
1449 '_SECURE_ATL',
1450 '_ATL_NO_OPENGL', 1456 '_ATL_NO_OPENGL',
1451 '_HAS_TR1=0', 1457 '_HAS_TR1=0',
1452 ], 1458 ],
1453 'conditions': [ 1459 'conditions': [
1454 ['component=="static_library"', { 1460 ['component=="static_library"', {
1455 'defines': [ 1461 'defines': [
1456 '_HAS_EXCEPTIONS=0', 1462 '_HAS_EXCEPTIONS=0',
1457 ], 1463 ],
1458 }], 1464 }],
1465 [ 'msvs_express', {
Mark Mentovai 2011/03/17 16:45:10 It’s unusual to put a space between the [ and ' as
RN 2011/03/17 20:15:11 It's still inconsistent; just following the existi
1466 'defines': [
1467 'COMPILER_MSVC_EXPRESS',
M-A Ruel 2011/03/17 14:01:24 I prefer COMPILER_MSVC_EXPRESS to be set in build/
Mark Mentovai 2011/03/17 16:45:10 This is now only used in exactly one location. If
RN 2011/03/17 16:50:27 So would I, but it isn't possible to determine an
RN 2011/03/17 20:15:11 Yeah, I can agree with that. Done.
1468 ],
1469 }],
1470 [ 'secure_atl', {
1471 'defines': [
1472 '_SECURE_ATL',
1473 ],
1474 }],
1459 ], 1475 ],
1460 'msvs_system_include_dirs': [ 1476 'msvs_system_include_dirs': [
1461 '<(DEPTH)/third_party/platformsdk_win7/files/Include', 1477 '<(DEPTH)/third_party/platformsdk_win7/files/Include',
1462 '<(DEPTH)/third_party/directxsdk/files/Include', 1478 '<(DEPTH)/third_party/directxsdk/files/Include',
1463 '$(VSInstallDir)/VC/atlmfc/include', 1479 '$(VSInstallDir)/VC/atlmfc/include',
1464 ], 1480 ],
1465 'msvs_cygwin_dirs': ['<(DEPTH)/third_party/cygwin'], 1481 'msvs_cygwin_dirs': ['<(DEPTH)/third_party/cygwin'],
1466 'msvs_disabled_warnings': [4351, 4396, 4503, 4819], 1482 'msvs_disabled_warnings': [4351, 4396, 4503, 4819],
1467 'msvs_settings': { 1483 'msvs_settings': {
1468 'VCCLCompilerTool': { 1484 'VCCLCompilerTool': {
1469 'MinimalRebuild': 'false', 1485 'MinimalRebuild': 'false',
1470 'BufferSecurityCheck': 'true', 1486 'BufferSecurityCheck': 'true',
1471 'EnableFunctionLevelLinking': 'true', 1487 'EnableFunctionLevelLinking': 'true',
1472 'RuntimeTypeInfo': 'false', 1488 'RuntimeTypeInfo': 'false',
1473 'WarningLevel': '3', 1489 'WarningLevel': '3',
1474 'WarnAsError': 'true', 1490 'WarnAsError': 'true',
1475 'DebugInformationFormat': '3', 1491 'DebugInformationFormat': '3',
1476 'conditions': [ 1492 'conditions': [
1477 [ 'msvs_multi_core_compile', { 1493 [ 'msvs_multi_core_compile', {
1478 'AdditionalOptions': ['/MP'], 1494 'AdditionalOptions': ['/MP'],
1479 }], 1495 }],
1480 ['component=="shared_library"', { 1496 [ 'component=="shared_library"', {
1481 'ExceptionHandling': '1', # /EHsc 1497 'ExceptionHandling': '1', # /EHsc
1482 }, { 1498 }, {
1483 'ExceptionHandling': '0', 1499 'ExceptionHandling': '0',
1484 }], 1500 }],
1485 ], 1501 ],
1486 }, 1502 },
1487 'VCLibrarianTool': { 1503 'VCLibrarianTool': {
1488 'AdditionalOptions': ['/ignore:4221'], 1504 'AdditionalOptions': ['/ignore:4221'],
1489 'AdditionalLibraryDirectories': [ 1505 'AdditionalLibraryDirectories': [
1490 '<(DEPTH)/third_party/platformsdk_win7/files/Lib', 1506 '<(DEPTH)/third_party/platformsdk_win7/files/Lib',
1491 '<(DEPTH)/third_party/directxsdk/files/Lib/x86', 1507 '<(DEPTH)/third_party/directxsdk/files/Lib/x86',
1492 ], 1508 ],
1493 }, 1509 },
1494 'VCLinkerTool': { 1510 'VCLinkerTool': {
1495 'AdditionalDependencies': [ 1511 'AdditionalDependencies': [
1496 'wininet.lib', 1512 'wininet.lib',
1497 'dnsapi.lib', 1513 'dnsapi.lib',
1498 'version.lib', 1514 'version.lib',
1499 'msimg32.lib', 1515 'msimg32.lib',
1500 'ws2_32.lib', 1516 'ws2_32.lib',
1501 'usp10.lib', 1517 'usp10.lib',
1502 'psapi.lib', 1518 'psapi.lib',
1503 'dbghelp.lib', 1519 'dbghelp.lib',
1504 ], 1520 ],
1521 'conditions': [
1522 ['msvs_express', {
Mark Mentovai 2011/03/17 16:45:10 Does this section have to do with Express or with
RN 2011/03/17 20:15:11 This is actually express-specific. Non-express ver
1523 # Explicitly required when using the ATL with express
1524 'AdditionalDependencies': [
1525 'atlthunk.lib',
1526 ],
1527 }],
1528 ],
1505 'AdditionalLibraryDirectories': [ 1529 'AdditionalLibraryDirectories': [
1506 '<(DEPTH)/third_party/platformsdk_win7/files/Lib', 1530 '<(DEPTH)/third_party/platformsdk_win7/files/Lib',
1507 '<(DEPTH)/third_party/directxsdk/files/Lib/x86', 1531 '<(DEPTH)/third_party/directxsdk/files/Lib/x86',
1508 ], 1532 ],
1509 'GenerateDebugInformation': 'true', 1533 'GenerateDebugInformation': 'true',
1510 'MapFileName': '$(OutDir)\\$(TargetName).map', 1534 'MapFileName': '$(OutDir)\\$(TargetName).map',
1511 'ImportLibrary': '$(OutDir)\\lib\\$(TargetName).lib', 1535 'ImportLibrary': '$(OutDir)\\lib\\$(TargetName).lib',
1512 'FixedBaseAddress': '1', 1536 'FixedBaseAddress': '1',
1513 # SubSystem values: 1537 # SubSystem values:
1514 # 0 == not set 1538 # 0 == not set
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
1618 # and therefore SYMROOT, needs to be set at the project level. 1642 # and therefore SYMROOT, needs to be set at the project level.
1619 'SYMROOT': '<(DEPTH)/xcodebuild', 1643 'SYMROOT': '<(DEPTH)/xcodebuild',
1620 }, 1644 },
1621 } 1645 }
1622 1646
1623 # Local Variables: 1647 # Local Variables:
1624 # tab-width:2 1648 # tab-width:2
1625 # indent-tabs-mode:nil 1649 # indent-tabs-mode:nil
1626 # End: 1650 # End:
1627 # vim: set expandtab tabstop=2 shiftwidth=2: 1651 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698