diff options
| author | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-02 21:48:05 +0000 |
|---|---|---|
| committer | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-02 21:48:05 +0000 |
| commit | 1ab480348f4ddcadd7aa4acbafc062973d23b8ea (patch) | |
| tree | 66c1d15deeb35c5044b9dbc36e145d6560eb527f /build | |
| parent | deafc2e41a13b5991e653fe931a79d9de653612d (diff) | |
| download | chromium_src-1ab480348f4ddcadd7aa4acbafc062973d23b8ea.zip chromium_src-1ab480348f4ddcadd7aa4acbafc062973d23b8ea.tar.gz chromium_src-1ab480348f4ddcadd7aa4acbafc062973d23b8ea.tar.bz2 | |
Base platform sdk selection on a variable.
Windows SDK 8 isn't ~integrated with visual studio.
As a result we will want to have a gyp level variable to allow folks
to set the windows sdk path in their includes.gypi.
BUG=None
TEST=None
R=cpu@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10696084
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145201 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/build/common.gypi b/build/common.gypi index 401ceb2..0d8bd6a 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', |