VERY experimental Nintendo Switch 2 emulator
C++
[.ci] install-msvc: fix installation on MSVC (#2611)
Caio Oliveira50ceb9a43a6d
diff --git a/.ci/windows/install-msvc.ps1 b/.ci/windows/install-msvc.ps1index b88f727ed8..788b2848ad 100755--- a/.ci/windows/install-msvc.ps1+++ b/.ci/windows/install-msvc.ps1@@ -10,7 +10,7 @@ if (-not ([bool](net session 2>$null))) {}$VSVer = "17"-$ExeFile = "vs_BuildTools.exe"+$ExeFile = "vs_community.exe"$Uri = "https://aka.ms/vs/$VSVer/release/$ExeFile"$Destination = "./$ExeFile"@@ -19,21 +19,39 @@ $WebClient = New-Object System.Net.WebClient$WebClient.DownloadFile($Uri, $Destination)Write-Host "Finished downloading $ExeFile"-$VSROOT = "C:/VSBuildTools/$VSVer"$Arguments = @(- "--installPath `"$VSROOT`"", # set custom installation path- "--quiet", # suppress UI- "--wait", # wait for installation to complete- "--norestart", # prevent automatic restart- "--add Microsoft.VisualStudio.Workload.VCTools", # add C++ build tools workload- "--add Microsoft.VisualStudio.Component.VC.Tools.x86.x64", # add core x86/x64 C++ tools- "--add Microsoft.VisualStudio.Component.Windows10SDK.19041" # add specific Windows SDK+ "--quiet", # Suppress installer UI+ "--wait", # Wait for installation to complete+ "--norestart", # Prevent automatic restart+ "--force", # Force installation even if components are already installed+ "--add Microsoft.VisualStudio.Workload.NativeDesktop", # Desktop development with C+++ "--add Microsoft.VisualStudio.Component.VC.Tools.x86.x64", # Core C++ compiler/tools for x86/x64+ "--add Microsoft.VisualStudio.Component.Windows11SDK.26100",# Windows 11 SDK (26100)+ "--add Microsoft.VisualStudio.Component.Windows10SDK.19041",# Windows 10 SDK (19041)+ "--add Microsoft.VisualStudio.Component.VC.Llvm.Clang", # LLVM Clang compiler+ "--add Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset", # LLVM Clang integration toolset+ "--add Microsoft.VisualStudio.Component.Windows11SDK.22621",# Windows 11 SDK (22621)+ "--add Microsoft.VisualStudio.Component.VC.CMake.Project", # CMake project support+ "--add Microsoft.VisualStudio.ComponentGroup.VC.Tools.142.x86.x64", # VC++ 14.2 toolset+ "--add Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Llvm.Clang" # LLVM Clang for native desktop)Write-Host "Installing Visual Studio Build Tools"-$InstallProcess = Start-Process -FilePath $Destination -NoNewWindow -PassThru -Wait -ArgumentList $Arguments-$ExitCode = $InstallProcess.ExitCode+$InstallProcess = Start-Process -FilePath $Destination -NoNewWindow -PassThru -ArgumentList $Arguments++# Spinner while installing+$Spinner = "|/-\"+$i = 0+while (-not $InstallProcess.HasExited) {+ Write-Host -NoNewline ("`rInstalling... " + $Spinner[$i % $Spinner.Length])+ Start-Sleep -Milliseconds 250+ $i+++}+# Clear spinner line+Write-Host "`rSetup completed! "++$ExitCode = $InstallProcess.ExitCodeif ($ExitCode -ne 0) {Write-Host "Error installing Visual Studio Build Tools (Error: $ExitCode)"Exit $ExitCodediff --git a/docs/Deps.md b/docs/Deps.mdindex cfc6f0365b..0e7b7cff62 100644--- a/docs/Deps.md+++ b/docs/Deps.md@@ -4,8 +4,8 @@ To build Eden, you MUST have a C++ compiler.* On Linux, this is usually [GCC](https://gcc.gnu.org/) 11+ or [Clang](https://clang.llvm.org/) v14+- GCC 12 also requires Clang 14+* On Windows, this is either:- - **[MSVC](https://visualstudio.microsoft.com/downloads/)**,- * *A convenience script to install the **minimal** version (Visual Build Tools) is provided in `.ci/windows/install-msvc.ps1`*+ - **[MSVC](https://visualstudio.microsoft.com/downloads/)** (you should select *Community* option),+ * *A convenience script to install the Visual Community Studio 2022 with necessary tools is provided in `.ci/windows/install-msvc.ps1`*- clang-cl - can be downloaded from the MSVC installer,- or **[MSYS2](https://www.msys2.org)*** On macOS, this is Apple Clang@@ -211,4 +211,4 @@ Then install the libraries: `sudo pkg install qt6 boost glslang libzip library/l## All Done-You may now return to the **[root build guide](Build.md)**.\ No newline at end of file+You may now return to the **[root build guide](Build.md)**.