makepanda: Support Visual Studio 2022

Closes #1214
This commit is contained in:
Daniel 2021-12-05 17:11:13 +02:00 committed by rdb
parent 541b9471b5
commit 6acb94f451
3 changed files with 8 additions and 7 deletions

View File

@ -52,8 +52,8 @@ Building Panda3D
Windows Windows
------- -------
You can build Panda3D with the Microsoft Visual C++ 2015, 2017 or 2019 compiler, You can build Panda3D with the Microsoft Visual C++ 2015, 2017, 2019 or 2022
which can be downloaded for free from the [Visual Studio site](https://visualstudio.microsoft.com/downloads/). compiler, which can be downloaded for free from the [Visual Studio site](https://visualstudio.microsoft.com/downloads/).
You will also need to install the [Windows 10 SDK](https://developer.microsoft.com/en-us/windows/downloads/windows-10-sdk), You will also need to install the [Windows 10 SDK](https://developer.microsoft.com/en-us/windows/downloads/windows-10-sdk),
and if you intend to target Windows XP, you will also need the Windows 7.1A and if you intend to target Windows XP, you will also need the Windows 7.1A
SDK (which can be installed from the Visual Studio Installer). SDK (which can be installed from the Visual Studio Installer).
@ -69,12 +69,12 @@ building them from source.
After acquiring these dependencies, you can build Panda3D from the command After acquiring these dependencies, you can build Panda3D from the command
prompt using the following command. Change the `--msvc-version` option based prompt using the following command. Change the `--msvc-version` option based
on your version of Visual C++; 2019 is 14.2, 2017 is 14.1, and 2015 is 14. on your version of Visual C++; 2022 is 14.3, 2019 is 14.2, 2017 is 14.1, and
Remove the `--windows-sdk=10` option if you need to support Windows XP, which 2015 is 14. Remove the `--windows-sdk=10` option if you need to support
requires the Windows 7.1A SDK. Windows XP, which requires the Windows 7.1A SDK.
```bash ```bash
makepanda\makepanda.bat --everything --installer --msvc-version=14.2 --windows-sdk=10 --no-eigen --threads=2 makepanda\makepanda.bat --everything --installer --msvc-version=14.3 --windows-sdk=10 --no-eigen --threads=2
``` ```
When the build succeeds, it will produce an .exe file that you can use to When the build succeeds, it will produce an .exe file that you can use to

View File

@ -159,7 +159,7 @@ def usage(problem):
print(" --everything (enable every third-party lib)") print(" --everything (enable every third-party lib)")
print(" --directx-sdk=X (specify version of DirectX SDK to use: jun2010, aug2009, mar2009, aug2006)") print(" --directx-sdk=X (specify version of DirectX SDK to use: jun2010, aug2009, mar2009, aug2006)")
print(" --windows-sdk=X (specify Windows SDK version, eg. 7.0, 7.1 or 10. Default is 7.1)") print(" --windows-sdk=X (specify Windows SDK version, eg. 7.0, 7.1 or 10. Default is 7.1)")
print(" --msvc-version=X (specify Visual C++ version, eg. 10, 11, 12, 14, 14.1, 14.2. Default is 14)") print(" --msvc-version=X (specify Visual C++ version, eg. 10, 11, 12, 14, 14.1, 14.2, 14.3. Default is 14)")
print(" --use-icl (experimental setting to use an intel compiler instead of MSVC on Windows)") print(" --use-icl (experimental setting to use an intel compiler instead of MSVC on Windows)")
print("") print("")
print("The simplest way to compile panda is to just type:") print("The simplest way to compile panda is to just type:")

View File

@ -79,6 +79,7 @@ MSVCVERSIONINFO = {
(14,0): {"vsversion":(14,0), "vsname":"Visual Studio 2015"}, (14,0): {"vsversion":(14,0), "vsname":"Visual Studio 2015"},
(14,1): {"vsversion":(15,0), "vsname":"Visual Studio 2017"}, (14,1): {"vsversion":(15,0), "vsname":"Visual Studio 2017"},
(14,2): {"vsversion":(16,0), "vsname":"Visual Studio 2019"}, (14,2): {"vsversion":(16,0), "vsname":"Visual Studio 2019"},
(14,3): {"vsversion":(17,0), "vsname":"Visual Studio 2022"},
} }
######################################################################## ########################################################################