Skip to content

A
angle
Commit f55d4d17 by Austin Kinross Committed by Jamie Madill
Options

Remove hardcoded additional include/lib paths from WinRT projects

Change-Id: Ic78a7dc3a1b3027f4fffc352fa2fb097b6024970 Reviewed-on: https://chromium-review.googlesource.com/261185Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Tested-by: 's avatarJamie Madill <jmadill@chromium.org>
parent 8b695ee3
Showing with 32 additions and 49 deletions
build/common_defines.gypi
...@@ -24,11 +24,6 @@ ...@@ -24,11 +24,6 @@
4718, # Recursive call has no side effects. Fires on xtree too. 4718, # Recursive call has no side effects. Fires on xtree too.
], ],
'msvs_system_include_dirs':
[
'<(windows_sdk_path)/Include/shared',
'<(windows_sdk_path)/Include/um',
],
'conditions': 'conditions':
[ [
['component=="shared_library"', ['component=="shared_library"',
...@@ -39,6 +34,14 @@ ...@@ -39,6 +34,14 @@
4251, # STL objects do not have DLL interface, needed by ShaderVars.h 4251, # STL objects do not have DLL interface, needed by ShaderVars.h
], ],
}], }],
['angle_build_winrt==0',
{
'msvs_system_include_dirs':
[
'<(windows_sdk_path)/Include/shared',
'<(windows_sdk_path)/Include/um',
],
}],
], ],
'msvs_settings': 'msvs_settings':
{ {
...@@ -93,51 +96,31 @@ ...@@ -93,51 +96,31 @@
# Windows SDK library directories for the configurations # Windows SDK library directories for the configurations
'configurations': 'configurations':
{ {
'x86_Base':
{
'msvs_settings':
{
'VCLinkerTool':
{
'AdditionalLibraryDirectories':
[
'<(windows_sdk_path)/Lib/winv6.3/um/x86',
],
},
'VCLibrarianTool':
{
'AdditionalLibraryDirectories':
[
'<(windows_sdk_path)/Lib/winv6.3/um/x86',
],
},
},
},
'x64_Base':
{
'msvs_settings':
{
'VCLinkerTool':
{
'AdditionalLibraryDirectories':
[
'<(windows_sdk_path)/Lib/winv6.3/um/x64',
],
},
'VCLibrarianTool':
{
'AdditionalLibraryDirectories':
[
'<(windows_sdk_path)/Lib/winv6.3/um/x64',
],
},
},
},
'conditions': 'conditions':
[ [
['angle_build_winrt==1', ['angle_build_winrt==0',
{ {
'arm_Base': 'x86_Base':
{
'msvs_settings':
{
'VCLinkerTool':
{
'AdditionalLibraryDirectories':
[
'<(windows_sdk_path)/Lib/winv6.3/um/x86',
],
},
'VCLibrarianTool':
{
'AdditionalLibraryDirectories':
[
'<(windows_sdk_path)/Lib/winv6.3/um/x86',
],
},
},
},
'x64_Base':
{ {
'msvs_settings': 'msvs_settings':
{ {
...@@ -145,14 +128,14 @@ ...@@ -145,14 +128,14 @@
{ {
'AdditionalLibraryDirectories': 'AdditionalLibraryDirectories':
[ [
'<(windows_sdk_path)/Lib/winv6.3/um/arm', '<(windows_sdk_path)/Lib/winv6.3/um/x64',
], ],
}, },
'VCLibrarianTool': 'VCLibrarianTool':
{ {
'AdditionalLibraryDirectories': 'AdditionalLibraryDirectories':
[ [
'<(windows_sdk_path)/Lib/winv6.3/um/arm', '<(windows_sdk_path)/Lib/winv6.3/um/x64',
], ],
}, },
}, },
......
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