Skip to content

Properly support MSVC 14.40 toolset for getting the universal CRT files #16480

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
seanbudd merged 8 commits into from
May 7, 2024
Merged

Properly support MSVC 14.40 toolset for getting the universal CRT files #16480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1561ae4
Properly support MSVC 14.40 toolset
LeonarddeR May 3, 2024
99f5bc8
Try 2019
LeonarddeR May 3, 2024
b2c4223
Extra logging, and back to 2022
LeonarddeR May 3, 2024
406886d
Hopefully fix sorting
LeonarddeR May 3, 2024
86997cc
Print toolsets for debugging
LeonarddeR May 3, 2024
bc193a8
Less restrictive
LeonarddeR May 3, 2024
765553d
Merge remote-tracking branch 'origin/master' into 1440Toolset
LeonarddeR May 7, 2024
0e53319
Add changelog entry
LeonarddeR May 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions nvdaHelper/localWin10/sconscript
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
###
# This file is a part of the NVDA project.
# URL: http://www.nvaccess.org/
# Copyright 2016-2020 NV Access Limited, Leonard de Ruijter
# Copyright 2016-2024 NV Access Limited, Leonard de Ruijter
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License version 2.0, as published by
# the Free Software Foundation.
Expand Down Expand Up @@ -43,12 +43,12 @@ localWin10Lib = env.SharedLibrary(
# UWP dlls can only be dynamically linked with the CRT,
# but some systems might not have this version of the CRT.
# Therefore, we must include it.
# VS 2017 keeps changing the path to reflect the latest major.minor.build version which we canot easily find out.
# VS keeps changing the path to reflect the latest major.minor.build version which we canot easily find out.
# Therefore Search these versioned directories from newest to oldest to collect all the files we need.
msvc = env.get('MSVC_VERSION')
vcRedistDirs = glob.glob(os.path.join(
find_vc_pdir(env, msvc),
rf"Redist\MSVC\{msvc}*\x86\Microsoft.VC{msvc.replace('.', '')}.CRT"
rf"Redist\MSVC\{msvc[:2]}*\x86\Microsoft.VC{msvc.replace('.', '')}.CRT"
))
if len(vcRedistDirs)==0:
raise RuntimeError("Could not locate vc redistributables. Perhaps the Universal Windows Platform component in visual Studio is not installed")
Expand Down
2 changes: 2 additions & 0 deletions user_docs/en/changes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@

Please refer to [the developer guide](https://www.nvaccess.org/files/nvda/documentation/developerGuide.html#API) for information on NVDA's API deprecation and removal process.

* Fixed NVDA's build system to work properly when using Visual Studio 2022 version 17.10 and above. (#16480, @LeonarddeR)

#### Deprecations


Expand Down