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

Unified Diff: build/common.gypi

Issue 6676030: WinDDK ATL and MSVC express compatability (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: Address comments: -EXPRESS define, memset always implemented, coding style 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 side-by-side diff with in-line comments
Download patch
Index: build/common.gypi
===================================================================
--- build/common.gypi (revision 78547)
+++ build/common.gypi (working copy)
@@ -452,6 +452,13 @@
},{
'msvs_large_module_debug_link_mode%': '2', # Yes
}],
+ ['MSVS_VERSION=="2010e" or MSVS_VERSION=="2008e" or MSVS_VERSION=="2005e"', {
+ 'msvs_express%': 1,
+ 'secure_atl%': 0,
+ },{
+ 'msvs_express%': 0,
+ 'secure_atl%': 1,
+ }],
],
'nacl_win64_defines': [
# This flag is used to minimize dependencies when building
@@ -1446,7 +1453,6 @@
'_CRT_RAND_S',
'CERT_CHAIN_PARA_HAS_EXTRA_FIELDS',
'WIN32_LEAN_AND_MEAN',
- '_SECURE_ATL',
'_ATL_NO_OPENGL',
'_HAS_TR1=0',
],
@@ -1456,6 +1462,11 @@
'_HAS_EXCEPTIONS=0',
],
}],
+ ['secure_atl', {
+ 'defines': [
+ '_SECURE_ATL',
+ ],
+ }],
],
'msvs_system_include_dirs': [
'<(DEPTH)/third_party/platformsdk_win7/files/Include',
@@ -1474,7 +1485,7 @@
'WarnAsError': 'true',
'DebugInformationFormat': '3',
'conditions': [
- [ 'msvs_multi_core_compile', {
+ ['msvs_multi_core_compile', {
'AdditionalOptions': ['/MP'],
}],
['component=="shared_library"', {
@@ -1502,6 +1513,14 @@
'psapi.lib',
'dbghelp.lib',
],
+ 'conditions': [
+ ['msvs_express', {
+ # Explicitly required when using the ATL with express
+ 'AdditionalDependencies': [
+ 'atlthunk.lib',
+ ],
+ }],
+ ],
'AdditionalLibraryDirectories': [
'<(DEPTH)/third_party/platformsdk_win7/files/Lib',
'<(DEPTH)/third_party/directxsdk/files/Lib/x86',

Powered by Google App Engine
This is Rietveld 408576698