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

Unified Diff: build/common.gypi

Issue 10696084: Base platform sdk selection on a variable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 6 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 401ceb298b4bf22f978b2019300220f0747dd898..0d8bd6aab24dc079b9f4dfdcc08b5b7ac89dd8f3 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -817,6 +817,8 @@
'sas_dll_exists': '<!(python <(DEPTH)/build/dir_exists.py <(sas_dll_path))',
'wix_exists': '<!(python <(DEPTH)/build/dir_exists.py <(wix_path))',
+ 'windows_sdk_path%': '<(DEPTH)/third_party/platformsdk_win8/files',
+
'conditions': [
['os_posix==1 and OS!="mac" and OS!="ios"', {
# This will set gcc_version to XY if you are running gcc X.Y.*.
@@ -1682,15 +1684,15 @@
'VCLinkerTool': {
'TargetMachine': '17', # x86 - 64
'AdditionalLibraryDirectories!':
- ['<(DEPTH)/third_party/platformsdk_win8/files/Lib/win8/um/x86'],
+ ['<(windows_sdk_path)/Lib/win8/um/x86'],
'AdditionalLibraryDirectories':
- ['<(DEPTH)/third_party/platformsdk_win8/files/Lib/win8/um/x64'],
+ ['<(windows_sdk_path)/Lib/win8/um/x64'],
},
'VCLibrarianTool': {
'AdditionalLibraryDirectories!':
- ['<(DEPTH)/third_party/platformsdk_win8/files/Lib/win8/um/x86'],
+ ['<(windows_sdk_path)/Lib/win8/um/x86'],
'AdditionalLibraryDirectories':
- ['<(DEPTH)/third_party/platformsdk_win8/files/Lib/win8/um/x64'],
+ ['<(windows_sdk_path)/Lib/win8/um/x64'],
},
},
'defines': [
@@ -3006,9 +3008,9 @@
}],
],
'msvs_system_include_dirs': [
- '<(DEPTH)/third_party/platformsdk_win8/files/Include/shared',
- '<(DEPTH)/third_party/platformsdk_win8/files/Include/um',
- '<(DEPTH)/third_party/platformsdk_win8/files/Include/winrt',
+ '<(windows_sdk_path)/Include/shared',
+ '<(windows_sdk_path)/Include/um',
+ '<(windows_sdk_path)/Include/winrt',
'<(DEPTH)/third_party/directxsdk/files/Include',
'$(VSInstallDir)/VC/atlmfc/include',
],
@@ -3047,7 +3049,7 @@
'AdditionalOptions': ['/ignore:4221'],
'AdditionalLibraryDirectories': [
'<(DEPTH)/third_party/directxsdk/files/Lib/x86',
- '<(DEPTH)/third_party/platformsdk_win8/files/Lib/win8/um/x86',
+ '<(windows_sdk_path)/Lib/win8/um/x86',
],
},
'VCLinkerTool': {
@@ -3093,7 +3095,7 @@
],
'AdditionalLibraryDirectories': [
'<(DEPTH)/third_party/directxsdk/files/Lib/x86',
- '<(DEPTH)/third_party/platformsdk_win8/files/Lib/win8/um/x86',
+ '<(windows_sdk_path)/Lib/win8/um/x86',
],
'GenerateDebugInformation': 'true',
'MapFileName': '$(OutDir)\\$(TargetName).map',
« 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