Skip to content

A
angle
Commit fc143915 by Geoff Lang
Options

Only use the Windows 8.1 SDK for WinRT configurations.

BUG=angle:772 BUG=395405 Change-Id: If26a0ec34e6bfd0e22d20803a0bb3ac2000a8e34 Reviewed-on: https://chromium-review.googlesource.com/225531Reviewed-by: 's avatarCooper Partin <coopp@microsoft.com> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Tested-by: 's avatarGeoff Lang <geofflang@chromium.org>
parent d2a67b96
Showing with 139 additions and 78 deletions
build/common.gypi
...@@ -179,23 +179,6 @@ ...@@ -179,23 +179,6 @@
}, },
}, # x64_Base }, # x64_Base
'arm_Base':
{
'abstract': 1,
'msvs_configuration_platform': 'ARM',
'msvs_settings':
{
'VCLinkerTool':
{
'TargetMachine': '3', # ARM
},
'VCLibrarianTool':
{
'TargetMachine': '3', # ARM
},
},
}, # arm_Base
# Concrete configurations # Concrete configurations
'Debug': 'Debug':
{ {
...@@ -218,6 +201,25 @@ ...@@ -218,6 +201,25 @@
'inherit_from': ['Common_Base', 'x64_Base', 'Release_Base'], 'inherit_from': ['Common_Base', 'x64_Base', 'Release_Base'],
}, },
}], }],
['angle_build_winrt==1',
{
'arm_Base':
{
'abstract': 1,
'msvs_configuration_platform': 'ARM',
'msvs_settings':
{
'VCLinkerTool':
{
'TargetMachine': '3', # ARM
},
'VCLibrarianTool':
{
'TargetMachine': '3', # ARM
},
},
}, # arm_Base
}],
['angle_build_winrt==1 and angle_build_winphone==0', ['angle_build_winrt==1 and angle_build_winphone==0',
{ {
'Debug_x64': 'Debug_x64':
......
build/common_defines.gypi
...@@ -13,12 +13,30 @@ ...@@ -13,12 +13,30 @@
'angle_build_winphone%': '0', 'angle_build_winphone%': '0',
}, },
'msvs_disabled_warnings': [ 4100, 4127, 4239, 4244, 4245, 4251, 4512, 4702, 4530, 4718, 4267, 4264, 4447, 4075 ], 'msvs_disabled_warnings': [ 4100, 4127, 4239, 4244, 4245, 4251, 4512, 4702, 4530, 4718, 4267, 4264, 4447, 4075 ],
'msvs_system_include_dirs': 'conditions':
[ [
'<(windows_sdk_path)/Include/shared', ['angle_build_winrt==0',
'<(windows_sdk_path)/Include/um', {
'<(windows_8_1_sdk_path)/Include/shared', # Desktop windows, use windows 8.0 SDK
'<(windows_8_1_sdk_path)/Include/um', 'msvs_system_include_dirs':
[
'<(windows_sdk_path)/Include/shared',
'<(windows_sdk_path)/Include/um',
],
}],
['angle_build_winrt==1',
{
# WinRT, use windows 8.1 sdk
'msvs_system_include_dirs':
[
'<(windows_8_1_sdk_path)/Include/shared',
'<(windows_8_1_sdk_path)/Include/um',
],
}],
['component=="shared_library"',
{
'defines': [ 'COMPONENT_BUILD' ],
}],
], ],
'msvs_settings': 'msvs_settings':
{ {
...@@ -76,72 +94,113 @@ ...@@ -76,72 +94,113 @@
{ {
'msvs_settings': 'msvs_settings':
{ {
'VCLinkerTool': 'conditions':
{ [
'AdditionalLibraryDirectories': ['angle_build_winrt==0',
[ {
'<(windows_sdk_path)/Lib/win8/um/x86', 'VCLinkerTool':
'<(windows_8_1_sdk_path)/Lib/winv6.3/um/x86', {
], 'AdditionalLibraryDirectories':
}, [
'VCLibrarianTool': '<(windows_sdk_path)/Lib/win8/um/x86',
{ ],
'AdditionalLibraryDirectories': },
[ 'VCLibrarianTool':
'<(windows_sdk_path)/Lib/win8/um/x86', {
'<(windows_8_1_sdk_path)/Lib/winv6.3/um/x86', 'AdditionalLibraryDirectories':
], [
}, '<(windows_sdk_path)/Lib/win8/um/x86',
],
},
}],
['angle_build_winrt==1',
{
'VCLinkerTool':
{
'AdditionalLibraryDirectories':
[
'<(windows_8_1_sdk_path)/Lib/winv6.3/um/x86',
],
},
'VCLibrarianTool':
{
'AdditionalLibraryDirectories':
[
'<(windows_8_1_sdk_path)/Lib/winv6.3/um/x86',
],
},
}],
],
}, },
}, },
'x64_Base': 'x64_Base':
{ {
'msvs_settings': 'msvs_settings':
{ {
'VCLinkerTool': 'conditions':
{ [
'AdditionalLibraryDirectories': ['angle_build_winrt==0',
[ {
'<(windows_sdk_path)/Lib/win8/um/x64', 'VCLinkerTool':
'<(windows_8_1_sdk_path)/Lib/winv6.3/um/x64', {
], 'AdditionalLibraryDirectories':
}, [
'VCLibrarianTool': '<(windows_sdk_path)/Lib/win8/um/x64',
{ ],
'AdditionalLibraryDirectories': },
[ 'VCLibrarianTool':
'<(windows_sdk_path)/Lib/win8/um/x64', {
'<(windows_8_1_sdk_path)/Lib/winv6.3/um/x64', 'AdditionalLibraryDirectories':
], [
}, '<(windows_sdk_path)/Lib/win8/um/x64',
],
},
}],
['angle_build_winrt==1',
{
'VCLinkerTool':
{
'AdditionalLibraryDirectories':
[
'<(windows_8_1_sdk_path)/Lib/winv6.3/um/x64',
],
},
'VCLibrarianTool':
{
'AdditionalLibraryDirectories':
[
'<(windows_8_1_sdk_path)/Lib/winv6.3/um/x64',
],
},
}],
],
}, },
}, },
'arm_Base': 'conditions':
{ [
'msvs_settings': ['angle_build_winrt==1',
{ {
'VCLinkerTool': 'arm_Base':
{ {
'AdditionalLibraryDirectories': 'msvs_settings':
[ {
'<(windows_8_1_sdk_path)/Lib/winv6.3/um/arm', 'VCLinkerTool':
], {
'AdditionalLibraryDirectories':
[
'<(windows_8_1_sdk_path)/Lib/winv6.3/um/arm',
],
},
'VCLibrarianTool':
{
'AdditionalLibraryDirectories':
[
'<(windows_8_1_sdk_path)/Lib/winv6.3/um/arm',
],
},
},
}, },
'VCLibrarianTool': }],
{ ],
'AdditionalLibraryDirectories':
[
'<(windows_8_1_sdk_path)/Lib/winv6.3/um/arm',
],
},
},
},
}, },
'conditions':
[
['component=="shared_library"',
{
'defines': [ 'COMPONENT_BUILD' ],
}],
],
} }
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