commit d2f756be4fd198d630b64dc6c3568184363e6d14
author Geoff Lang <geofflang@chromium.org> Tue Oct 21 21:24:11 2014
committer Geoff Lang <geofflang@chromium.org> Tue Oct 21 21:29:07 2014
tree 96b6b427521af34ce3de1ea1d54e5910948de879
parent 7c1cfd61549d50e3873ffc72d9a48998934180c8

Use windows_sdk_path for the 8.0 SDK path and windows_8_1_sdk_path for 8.1.

Change-Id: I0cb4262552852ccbc772ca828a0faa7d3e63784b
Reviewed-on: https://chromium-review.googlesource.com/224483
Reviewed-by: Zhenyao Mo <zmo@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>

build/common.gypi

diff --git a/build/common.gypi b/build/common.gypi
index 4d4d64b..fb976ff 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -223,14 +223,14 @@
                         'TargetMachine': '3', # ARM
                         'AdditionalLibraryDirectories':
                         [
-                            '<(windows_sdk_path)/Lib/win8/um/arm',
+                            '<(windows_8_1_sdk_path)/Lib/win8/um/arm',
                         ],
                     },
                     'VCLibrarianTool':
                     {
                         'AdditionalLibraryDirectories':
                         [
-                            '<(windows_sdk_path)/Lib/win8/um/arm',
+                            '<(windows_8_1_sdk_path)/Lib/win8/um/arm',
                         ],
                     },
                 },

build/common_defines.gypi

diff --git a/build/common_defines.gypi b/build/common_defines.gypi
index 654be74..f9b32e2 100644
--- a/build/common_defines.gypi
+++ b/build/common_defines.gypi
@@ -7,8 +7,8 @@
     {
         'component%': 'static_library',
         'angle_path%': '..',
-        'windows_sdk_path%': 'C:/Program Files (x86)/Windows Kits/8.1',
-        'windows8_sdk_path%': 'C:/Program Files (x86)/Windows Kits/8.0',
+        'windows_sdk_path%': 'C:/Program Files (x86)/Windows Kits/8.0',
+        'windows_8_1_sdk_path%': 'C:/Program Files (x86)/Windows Kits/8.1',
         'angle_build_winrt%': '0',
         'angle_build_winphone%': '0',
     },
@@ -17,8 +17,8 @@
     [
         '<(windows_sdk_path)/Include/shared',
         '<(windows_sdk_path)/Include/um',
-        '<(windows8_sdk_path)/Include/shared',
-        '<(windows8_sdk_path)/Include/um',
+        '<(windows_8_1_sdk_path)/Include/shared',
+        '<(windows_8_1_sdk_path)/Include/um',
     ],
     'msvs_settings':
     {
@@ -79,6 +79,7 @@
                     'AdditionalLibraryDirectories':
                     [
                         '<(windows_sdk_path)/Lib/win8/um/x86',
+                        '<(windows_8_1_sdk_path)/Lib/winv6.3/um/x86',
                     ],
                 },
                 'VCLibrarianTool':
@@ -86,6 +87,7 @@
                     'AdditionalLibraryDirectories':
                     [
                         '<(windows_sdk_path)/Lib/win8/um/x86',
+                        '<(windows_8_1_sdk_path)/Lib/winv6.3/um/x86',
                     ],
                 },
             },
@@ -98,16 +100,16 @@
                 {
                     'AdditionalLibraryDirectories':
                     [
-                        '<(windows_sdk_path)/Lib/winv6.3/um/x86',
-                        '<(windows8_sdk_path)/Lib/win8/um/x86',
+                        '<(windows_sdk_path)/Lib/win8/um/x86',
+                        '<(windows_8_1_sdk_path)/Lib/winv6.3/um/x86',
                     ],
                 },
                 'VCLibrarianTool':
                 {
                     'AdditionalLibraryDirectories':
                     [
-                        '<(windows_sdk_path)/Lib/winv6.3/um/x86',
-                        '<(windows8_sdk_path)/Lib/win8/um/x86',
+                        '<(windows_sdk_path)/Lib/win8/um/x86',
+                        '<(windows_8_1_sdk_path)/Lib/winv6.3/um/x86',
                     ],
                 },
             },

src/angle.gypi

diff --git a/src/angle.gypi b/src/angle.gypi
index 4b8521d..efbfd37 100644
--- a/src/angle.gypi
+++ b/src/angle.gypi
@@ -170,7 +170,7 @@
                                     [
                                         "<(angle_gen_path)/copy_compiler_dll.bat",
                                         "$(PlatformName)",
-                                        "<(windows8_sdk_path)",
+                                        "<(windows_sdk_path)",
                                         "<(PRODUCT_DIR)"
                                     ],
                                 },