Skip to content

Commit

Permalink
Allow building on Visual Studio 2022 (#13055)
Browse files Browse the repository at this point in the history
NVDA now builds with Visual Studio 2019. Version 2022 was released recently.

Description of how this pull request fixes the issue:
1. Updates SCons to version 4.3.0.
2. Allows building with Visual Studio 2019 and newer.
3. Updates the readme with download url's that are likely to be pretty stable in the near and more distant future.
  • Loading branch information
LeonarddeR committed Nov 21, 2021
1 parent 1cc197c commit f19061c
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 8 deletions.
6 changes: 3 additions & 3 deletions nvdaHelper/archBuild_sconscript
Expand Up @@ -73,9 +73,9 @@ def COMProxyDllBuilder(env,target,source,proxyClsid):
return proxyDll
env.AddMethod(COMProxyDllBuilder,'COMProxyDll')

# We only support compiling with MSVC 14.2 (2019)
if not env.get('MSVC_VERSION')=='14.2':
raise RuntimeError("Visual C++ 14.2 (Visual Studio 2019) not found")
# We only support compiling with MSVC 14.2 (2019) or newer
if not env.get('MSVC_VERSION') or tuple(map(int, env.get('MSVC_VERSION').split("."))) < (14, 2):
raise RuntimeError("Visual C++ 14.2 (Visual Studio 2019) or newer not found")


TARGET_ARCH=env['TARGET_ARCH']
Expand Down
9 changes: 5 additions & 4 deletions readme.md
Expand Up @@ -57,11 +57,12 @@ The following dependencies need to be installed on your system:

* [Python](https://www.python.org/), version 3.7, 32 bit
* Use latest minor version if possible.
* Microsoft Visual Studio 2019:
* Microsoft Visual Studio 2019 or 2022:
* To replicate the production build environment, use the [version of Visual Studio that AppVeyor is using](https://www.appveyor.com/docs/windows-images-software/#visual-studio-2019).
* Download from https://visualstudio.microsoft.com/downloads/
* When you do not use the Visual Studio IDE itself, you can download the build tools under the Tools for Visual Studio 2019 expandable heading
* When you are intending to use the Visual Studio IDE (not required for NVDA development), you can download the community version under the Visual Studio 2019 expandable heading
* When you do not use the Visual Studio IDE itself, you can download the [build tools](https://aka.ms/vs/16/release/vs_BuildTools.exe)
* When you are intending to use the Visual Studio IDE (not required for NVDA development), you can download [the community version](https://aka.ms/vs/16/release/vs_Community.exe), which is also used by appveyor
* The Professional and Enterprise versions are also supported
* Preview versions are *not* supported
* When installing Visual Studio, you need to enable the following:
* In the list on the Workloads tab
* in the Windows grouping:
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
@@ -1,5 +1,5 @@
# NVDA's build system is SCons
SCons==4.1.0.post1
SCons==4.3.0

# NVDA's runtime dependencies
comtypes==1.1.8
Expand Down
2 changes: 2 additions & 0 deletions user_docs/en/changes.t2t
Expand Up @@ -29,6 +29,8 @@ What's New in NVDA

== Changes for Developers ==
- Note: this is a Add-on API compatibility breaking release. Add-ons will need to be re-tested and have their manifest updated.
- Compiling NVDA dependencies with Visual Studio 2022 (17.0) is now supported. For development and release builds, Visual Studio 2019 is still used. (#13033)
- Updated SCons to version 4.3.0.
- Updated py2exe to version 0.11.0.1. (#12357, #13066)
- ``NVDAObjects.UIA.winConsoleUIA.WinConsoleUIA.isImprovedTextRangeAvailable`` has been removed. Use ``apiLevel`` instead. (#12955, #12660)
- ``TVItemStruct`` has been removed from ``sysTreeView32``. (#12935)
Expand Down

0 comments on commit f19061c

Please sign in to comment.