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

Unified Diff: build/common.gypi

Issue 10690072: Make the directx sdk path a gyp variable (Closed) Base URL: svn://chrome-svn/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
===================================================================
--- build/common.gypi (revision 145248)
+++ build/common.gypi (working copy)
@@ -822,9 +822,20 @@
'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',
+ 'windows_sdk_default_path': '<(DEPTH)/third_party/platformsdk_win8/files',
+ 'directx_sdk_default_path': '<(DEPTH)/third_party/directxsdk/files',
'conditions': [
+ ['OS=="win" and "<!(python <(DEPTH)/build/dir_exists.py <(windows_sdk_default_path))"=="True"', {
+ 'windows_sdk_path%': '<(windows_sdk_default_path)',
+ }, {
+ 'windows_sdk_path%': 'C:/Program Files (x86)/Windows Kits/8.0',
+ }],
+ ['OS=="win" and "<!(python <(DEPTH)/build/dir_exists.py <(directx_sdk_default_path))"=="True"', {
+ 'directx_sdk_path%': '<(directx_sdk_default_path)',
+ }, {
+ 'directx_sdk_path%': '$(DXSDK_DIR)',
+ }],
['os_posix==1 and OS!="mac" and OS!="ios"', {
# This will set gcc_version to XY if you are running gcc X.Y.*.
# This is used to tweak build flags for gcc 4.4.
@@ -3019,7 +3030,7 @@
'<(windows_sdk_path)/Include/shared',
'<(windows_sdk_path)/Include/um',
'<(windows_sdk_path)/Include/winrt',
- '<(DEPTH)/third_party/directxsdk/files/Include',
+ '<(directx_sdk_path)/Include',
'$(VSInstallDir)/VC/atlmfc/include',
],
'msvs_cygwin_dirs': ['<(DEPTH)/third_party/cygwin'],
@@ -3056,7 +3067,7 @@
'VCLibrarianTool': {
'AdditionalOptions': ['/ignore:4221'],
'AdditionalLibraryDirectories': [
- '<(DEPTH)/third_party/directxsdk/files/Lib/x86',
+ '<(directx_sdk_path)/Lib/x86',
'<(windows_sdk_path)/Lib/win8/um/x86',
],
},
@@ -3102,7 +3113,7 @@
}],
],
'AdditionalLibraryDirectories': [
- '<(DEPTH)/third_party/directxsdk/files/Lib/x86',
+ '<(directx_sdk_path)/Lib/x86',
'<(windows_sdk_path)/Lib/win8/um/x86',
],
'GenerateDebugInformation': 'true',
« 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