Merge 000f60b into 5657960

LeonarddeR · web-flow · commit c9426ea68ce6 · 2021-11-15T17:33:04.000+10:00
diff --git a/nvdaHelper/archBuild_sconscript b/nvdaHelper/archBuild_sconscript
@@ -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 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']
diff --git a/readme.md b/readme.md
@@ -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:
diff --git a/requirements.txt b/requirements.txt
@@ -1,5 +1,5 @@
 # NVDA's build system is SCons
-SCons==4.1.0.post1
+https://elles.deruijter.it/SCons-4.2.0-py3-none-any.whl
 
 # NVDA's runtime dependencies
 comtypes==1.1.8
