diff options
Diffstat (limited to 'gn/BUILD.gn')
| -rw-r--r-- | gn/BUILD.gn | 96 |
1 files changed, 50 insertions, 46 deletions
diff --git a/gn/BUILD.gn b/gn/BUILD.gn index 363965fa98..fa2f91d4ab 100644 --- a/gn/BUILD.gn +++ b/gn/BUILD.gn @@ -54,32 +54,34 @@ config("default") { "NOMINMAX", ] - _include_dirs = [ - #2017 - "$windk/VC/Tools/MSVC/14.10.25017/include", - - #2015 - "$windk/VC/include", - - # For local builds. + if (msvc == 2015) { + _include_dirs = [ + "$windk/VC/include", + + # For local builds. + "$windk/../Windows Kits/8.1/Include/shared", + "$windk/../Windows Kits/10/Include/10.0.10150.0/ucrt", + "$windk/../Windows Kits/8.1/Include/um", + "$windk/../Windows Kits/8.1/Include/winrt", + + # For builds using win_toolchain asset (currently 2015). + "$windk/win_sdk/Include/10.0.14393.0/shared", + "$windk/win_sdk/Include/10.0.14393.0/ucrt", + "$windk/win_sdk/Include/10.0.14393.0/um", + "$windk/win_sdk/Include/10.0.14393.0/winrt", + ] + } else { # 2017 - "$windk/../../../Windows Kits/10/Include/10.0.14393.0/shared", - "$windk/../../../Windows Kits/10/Include/10.0.14393.0/ucrt", - "$windk/../../../Windows Kits/10/Include/10.0.14393.0/um", - "$windk/../../../Windows Kits/10/Include/10.0.14393.0/winrt", - - # 2015 - "$windk/../Windows Kits/8.1/Include/shared", - "$windk/../Windows Kits/10/Include/10.0.10150.0/ucrt", - "$windk/../Windows Kits/8.1/Include/um", - "$windk/../Windows Kits/8.1/Include/winrt", - - # For builds using win_toolchain asset. - "$windk/win_sdk/Include/10.0.14393.0/shared", - "$windk/win_sdk/Include/10.0.14393.0/ucrt", - "$windk/win_sdk/Include/10.0.14393.0/um", - "$windk/win_sdk/Include/10.0.14393.0/winrt", - ] + _include_dirs = [ + "$windk/VC/Tools/MSVC/$win_toolchain_version/include", + + # For local builds. + "$windk/../../../Windows Kits/10/Include/10.0.14393.0/shared", + "$windk/../../../Windows Kits/10/Include/10.0.14393.0/ucrt", + "$windk/../../../Windows Kits/10/Include/10.0.14393.0/um", + "$windk/../../../Windows Kits/10/Include/10.0.14393.0/winrt", + ] + } if (is_clang) { foreach(dir, _include_dirs) { cflags += [ @@ -91,29 +93,31 @@ config("default") { include_dirs = _include_dirs } - lib_dirs = [ - # For local builds. + if (msvc == 2015) { + lib_dirs = [ + # For local builds. + "$windk/../Windows Kits/10/Lib/10.0.10150.0/ucrt/$target_cpu", + "$windk/../Windows Kits/8.1/Lib/winv6.3/um/$target_cpu", + + # For builds using win_toolchain asset (currently 2015). + "$windk/win_sdk/Lib/10.0.14393.0/ucrt/$target_cpu", + "$windk/win_sdk/Lib/10.0.14393.0/um/$target_cpu", + ] + + if (target_cpu == "x86") { + lib_dirs += [ "$windk/VC/lib" ] + } else { + lib_dirs += [ "$windk/VC/lib/amd64" ] + } + } else { # 2017 - "$windk/../../../Windows Kits/10/Lib/10.0.14393.0/ucrt/$target_cpu", - "$windk/../../../Windows Kits/10/Lib/10.0.14393.0/um/$target_cpu", - - #2015 - "$windk/../Windows Kits/10/Lib/10.0.10150.0/ucrt/$target_cpu", - "$windk/../Windows Kits/8.1/Lib/winv6.3/um/$target_cpu", - - # For builds using win_toolchain asset. - "$windk/win_sdk/Lib/10.0.14393.0/ucrt/$target_cpu", - "$windk/win_sdk/Lib/10.0.14393.0/um/$target_cpu", - ] - - #2017 - lib_dirs += [ "$windk/VC/Tools/MSVC/14.10.25017/lib/$target_cpu" ] + lib_dirs = [ + "$windk/VC/Tools/MSVC/$win_toolchain_version/lib/$target_cpu", - #2015 - if (target_cpu == "x86") { - lib_dirs += [ "$windk/VC/lib" ] - } else { - lib_dirs += [ "$windk/VC/lib/amd64" ] + # For local builds. + "$windk/../../../Windows Kits/10/Lib/10.0.14393.0/ucrt/$target_cpu", + "$windk/../../../Windows Kits/10/Lib/10.0.14393.0/um/$target_cpu", + ] } } else { cflags += [ |