Skip to content

A
angle
Commit d2f756be by Geoff Lang
Options

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/224483Reviewed-by: 's avatarZhenyao Mo <zmo@chromium.org> Tested-by: 's avatarGeoff Lang <geofflang@chromium.org>
parent 7c1cfd61
Showing with 13 additions and 11 deletions
build/common.gypi
...@@ -223,14 +223,14 @@ ...@@ -223,14 +223,14 @@
'TargetMachine': '3', # ARM 'TargetMachine': '3', # ARM
'AdditionalLibraryDirectories': 'AdditionalLibraryDirectories':
[ [
'<(windows_sdk_path)/Lib/win8/um/arm', '<(windows_8_1_sdk_path)/Lib/win8/um/arm',
], ],
}, },
'VCLibrarianTool': 'VCLibrarianTool':
{ {
'AdditionalLibraryDirectories': 'AdditionalLibraryDirectories':
[ [
'<(windows_sdk_path)/Lib/win8/um/arm', '<(windows_8_1_sdk_path)/Lib/win8/um/arm',
], ],
}, },
}, },
......
build/common_defines.gypi
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
{ {
'component%': 'static_library', 'component%': 'static_library',
'angle_path%': '..', 'angle_path%': '..',
'windows_sdk_path%': 'C:/Program Files (x86)/Windows Kits/8.1', 'windows_sdk_path%': 'C:/Program Files (x86)/Windows Kits/8.0',
'windows8_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_winrt%': '0',
'angle_build_winphone%': '0', 'angle_build_winphone%': '0',
}, },
...@@ -17,8 +17,8 @@ ...@@ -17,8 +17,8 @@
[ [
'<(windows_sdk_path)/Include/shared', '<(windows_sdk_path)/Include/shared',
'<(windows_sdk_path)/Include/um', '<(windows_sdk_path)/Include/um',
'<(windows8_sdk_path)/Include/shared', '<(windows_8_1_sdk_path)/Include/shared',
'<(windows8_sdk_path)/Include/um', '<(windows_8_1_sdk_path)/Include/um',
], ],
'msvs_settings': 'msvs_settings':
{ {
...@@ -79,6 +79,7 @@ ...@@ -79,6 +79,7 @@
'AdditionalLibraryDirectories': 'AdditionalLibraryDirectories':
[ [
'<(windows_sdk_path)/Lib/win8/um/x86', '<(windows_sdk_path)/Lib/win8/um/x86',
'<(windows_8_1_sdk_path)/Lib/winv6.3/um/x86',
], ],
}, },
'VCLibrarianTool': 'VCLibrarianTool':
...@@ -86,6 +87,7 @@ ...@@ -86,6 +87,7 @@
'AdditionalLibraryDirectories': 'AdditionalLibraryDirectories':
[ [
'<(windows_sdk_path)/Lib/win8/um/x86', '<(windows_sdk_path)/Lib/win8/um/x86',
'<(windows_8_1_sdk_path)/Lib/winv6.3/um/x86',
], ],
}, },
}, },
...@@ -98,16 +100,16 @@ ...@@ -98,16 +100,16 @@
{ {
'AdditionalLibraryDirectories': 'AdditionalLibraryDirectories':
[ [
'<(windows_sdk_path)/Lib/winv6.3/um/x86', '<(windows_sdk_path)/Lib/win8/um/x86',
'<(windows8_sdk_path)/Lib/win8/um/x86', '<(windows_8_1_sdk_path)/Lib/winv6.3/um/x86',
], ],
}, },
'VCLibrarianTool': 'VCLibrarianTool':
{ {
'AdditionalLibraryDirectories': 'AdditionalLibraryDirectories':
[ [
'<(windows_sdk_path)/Lib/winv6.3/um/x86', '<(windows_sdk_path)/Lib/win8/um/x86',
'<(windows8_sdk_path)/Lib/win8/um/x86', '<(windows_8_1_sdk_path)/Lib/winv6.3/um/x86',
], ],
}, },
}, },
......
src/angle.gypi
...@@ -170,7 +170,7 @@ ...@@ -170,7 +170,7 @@
[ [
"<(angle_gen_path)/copy_compiler_dll.bat", "<(angle_gen_path)/copy_compiler_dll.bat",
"$(PlatformName)", "$(PlatformName)",
"<(windows8_sdk_path)", "<(windows_sdk_path)",
"<(PRODUCT_DIR)" "<(PRODUCT_DIR)"
], ],
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment