Merge pull request #32 from GerHobbelt/patch-msvc2026

updated install script to include support for Visual Studio 2026

Author: Sibras

README.md

@@ -11,7 +11,7 @@ VSNASM
 
 This project provides a set of build customisations that can be used within Visual Studio to compile assembly code using NASM.
 Provides Visual Studio integration for the NASM assembler.
-Supports Visual Studio 2010, 2012, 2013, 2015, 2017, 2019 and 2022.
+Supports Visual Studio 2010, 2012, 2013, 2015, 2017, 2019, 2022 and 2026.
 
 ## NASM
 
@@ -20,7 +20,7 @@ For more information on NASM refer to the official site: [www.nasm.us](https://w
 
 ## Installation
 
-The project provides a basic installer script that can automatically detect any installed Visual Studio 2013, 2015, 2017, 2019 and 2022 installation and then install the required components.
+The project provides a basic installer script that can automatically detect any installed Visual Studio 2013, 2015, 2017, 2019, 2022 and 2026 installation and then install the required components.
 To use this script simply run '**install_script.bat**' from an elevated (i.e administrator) command prompt.
 
 ## Usage
@@ -55,6 +55,7 @@ For example the location for various Visual Studio Community Edition versions on
     3. Visual Studio 2017: C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\VC\VCTargets\BuildCustomizations
     4. Visual Studio 2019: C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\MSBuild\Microsoft\VC\v160\BuildCustomizations
     5. Visual Studio 2022: C:\Program Files\Microsoft Visual Studio\2022\Community\MSBuild\Microsoft\VC\v170\BuildCustomizations
+    6. Visual Studio 2026: C:\Program Files\Microsoft Visual Studio\18\Community\MSBuild\Microsoft\VC\v180\BuildCustomizations
 
 2. Copy these files to a convenient location and set that path in the 'Build Customisations Search Path' in the Visual Studio 'Projects and Solutions|VC++ Project Settings' item in the 'Tools|Options' menu.
 

install_script.bat

@@ -3,7 +3,7 @@ setlocal
 
 REM Defined script variables
 set NASMDL=http://www.nasm.us/pub/nasm/releasebuilds
-set NASMVERSION=2.16.03
+set NASMVERSION=3.01
 set VSWHEREDL=https://github.com/Microsoft/vswhere/releases/download
 set VSWHEREVERSION=3.1.7
 
@@ -41,7 +41,11 @@ if "%PROCESSOR_ARCHITECTURE%"=="AMD64" (
 REM Check if already running in an environment with VS setup
 if defined VCINSTALLDIR (
     if defined VisualStudioVersion (
-        if "%VisualStudioVersion%"=="17.0" (
+        if "%VisualStudioVersion%"=="18.0" (
+            echo Existing Visual Studio 2026 environment detected...
+            set MSVC_VER=18
+            goto MSVCVarsDone
+        ) else if "%VisualStudioVersion%"=="17.0" (
             echo Existing Visual Studio 2022 environment detected...
             set MSVC_VER=17
             goto MSVCVarsDone
@@ -85,6 +89,16 @@ if not exist "%SCRIPTDIR%\vswhere.exe" (
 :VSwhereDetection
 REM Use vswhere to list detected installs
 for /f "usebackq tokens=* delims=" %%i in (`"%SCRIPTDIR%\vswhere.exe" -prerelease -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath`) do (
+    for /f "delims=" %%a in ('echo %%i ^| find "18"') do (
+        if not "%%a"=="" (
+            echo Visual Studio 2026 environment detected...
+            call "%~0" "18" "%%i"
+            if not ERRORLEVEL 1 (
+                set MSVC18=1
+                set MSVCFOUND=1
+            )
+        )
+    )
     for /f "delims=" %%a in ('echo %%i ^| find "2022"') do (
         if not "%%a"=="" (
             echo Visual Studio 2022 environment detected...
@@ -234,7 +248,9 @@ if "%SYSARCH%"=="32" (
     goto Terminate
 )
 REM Call the required vcvars file in order to setup up build locations
-if "%MSVC_VER%"=="17" (
+if "%MSVC_VER%"=="18" (
+    set VCVARS=%2\VC\Auxiliary\Build\vcvars%SYSARCH%.bat
+) else if "%MSVC_VER%"=="17" (
     set VCVARS=%2\VC\Auxiliary\Build\vcvars%SYSARCH%.bat
 ) else if "%MSVC_VER%"=="16" (
     set VCVARS=%2\VC\Auxiliary\Build\vcvars%SYSARCH%.bat
@@ -266,7 +282,9 @@ if not ERRORLEVEL 1 (
 )
 set /p MSBUILDDIR=<"%SCRIPTDIR%\msbuild.txt"
 del /F /Q "%SCRIPTDIR%\msbuild.txt" >nul 2>&1
-if "%MSVC_VER%"=="17" (
+if "%MSVC_VER%"=="18" (
+    set VCTargetsPath="..\..\..\Microsoft\VC\v180\BuildCustomizations"
+) else if "%MSVC_VER%"=="17" (
     set VCTargetsPath="..\..\..\Microsoft\VC\v170\BuildCustomizations"
 ) else if "%MSVC_VER%"=="16" (
     set VCTargetsPath="..\..\Microsoft\VC\v160\BuildCustomizations"