From d5ce8b24cc5ee1eb53c6360dae7f2f5f64c347d3 Mon Sep 17 00:00:00 2001
From: "cpu@chromium.org"
 <cpu@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c>
Date: Fri, 6 Jul 2012 22:47:56 +0000
Subject: [PATCH] Make the directx sdk and the regular sdk path a gyp variable

For the directx it probes in src\third_party\directxsdk if you have the dxsdk there and
for the regular sdk it probems in src\third_party\platformsdk_win8

If it does not find them it takes an educated guess.

The gyp variables windows_sdk_path and directx_sdk_path can be overriden from the environment if
the defaults are wrong.

BUG=none
TEST=chrome builds
Review URL: https://chromiumcodereview.appspot.com/10690072

git-svn-id: http://src.chromium.org/svn/trunk/src/build@145619 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
---
 common.gypi | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/common.gypi b/common.gypi
index 240b41a7e..153ff01d3 100644
--- a/common.gypi
+++ b/common.gypi
@@ -828,9 +828,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.
@@ -3044,7 +3055,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'],
@@ -3081,7 +3092,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',
             ],
           },
@@ -3127,7 +3138,7 @@
               }],
             ],
             'AdditionalLibraryDirectories': [
-              '<(DEPTH)/third_party/directxsdk/files/Lib/x86',
+              '<(directx_sdk_path)/Lib/x86',
               '<(windows_sdk_path)/Lib/win8/um/x86',
             ],
             'GenerateDebugInformation': 'true',