diff --git a/sys/windows/Makefile.nmake b/sys/windows/Makefile.nmake index 2cd87415b..cc0209e22 100644 --- a/sys/windows/Makefile.nmake +++ b/sys/windows/Makefile.nmake @@ -8,7 +8,8 @@ # MS Visual Studio Visual C++ compiler # # Visual Studio Compilers Tested: -# - Microsoft Visual Studio 2022 Community Edition v 17.14.18 +# - Microsoft Visual Studio Community 2022 v 17.14.20 +# - Microsoft Visual Studio Community 2026 v 18.0.0 # #============================================================================== # This is used for building two distinct executables of NetHack: @@ -1177,7 +1178,7 @@ rc=Rc.exe # is too old or untested. # # Recently tested versions: -TESTEDVS2022 = 14.44.35217.0 +TESTEDVS2022 = 14.44.35220.0 # Other versions: TESTEDVS2026 = 14.50.35717.0 diff --git a/sys/windows/build-nmake.txt b/sys/windows/build-nmake.txt index 16c5fce52..a917eb3ad 100644 --- a/sys/windows/build-nmake.txt +++ b/sys/windows/build-nmake.txt @@ -2,8 +2,8 @@ Building NetHack using the Visual Studio nmake from the command line Prerequisite Requirements: - o Visual Studio Community Edition - A copy of Microsoft Visual Studio Community Edition needs to + o Visual Studio Community + A copy of Microsoft Visual Studio Community needs to be installed on your machine. See: https://visualstudio.microsoft.com/vs/community/ o Lua @@ -54,7 +54,7 @@ You can use one of the following build environments: /-----------------------------------------------------------\ | Building From the Command Line Using nmake from one of the | -| Visual Studio Community Editions | +| Visual Studio Community versions | \-----------------------------------------------------------/ Building diff --git a/sys/windows/build-vs.txt b/sys/windows/build-vs.txt index 2585c0308..90c12c3e1 100644 --- a/sys/windows/build-vs.txt +++ b/sys/windows/build-vs.txt @@ -2,8 +2,8 @@ Building NetHack using the Visual Studio IDE Prerequisite Requirements: - o Visual Studio Community Edition - A copy of Microsoft Visual Studio Community Edition needs to + o Visual Studio Community + A copy of a version of Microsoft Visual Studio Community needs to be installed on your machine. See: https://visualstudio.microsoft.com/vs/community/ o Lua @@ -57,7 +57,7 @@ versions: | Building And Running Using Visual Studio 2022 or greater | \-----------------------------------------------------------/ -When using Visual Studio Community Edition, load the provided solution +When using a version of Visual Studio Community, load the provided solution file within the IDE, build the solution. The Visual Studio NetHack solution file can be found here: diff --git a/sys/windows/vs/NetHack/NetHack.vcxproj b/sys/windows/vs/NetHack/NetHack.vcxproj index 7b28b0837..1ce8af4cd 100644 --- a/sys/windows/vs/NetHack/NetHack.vcxproj +++ b/sys/windows/vs/NetHack/NetHack.vcxproj @@ -1,13 +1,7 @@ - + - - {609BC774-C6F8-4B2B-AA7D-5B3D0EA95751} - Win32Proj - NetHack - 10.0 - @@ -15,6 +9,12 @@ + + {609BC774-C6F8-4B2B-AA7D-5B3D0EA95751} + Win32Proj + NetHack + 10.0 + $(BinDir) diff --git a/sys/windows/vs/NetHackProperties.props b/sys/windows/vs/NetHackProperties.props index 0e5f10889..1bda6a0f0 100644 --- a/sys/windows/vs/NetHackProperties.props +++ b/sys/windows/vs/NetHackProperties.props @@ -1,5 +1,5 @@ - + 3 diff --git a/sys/windows/vs/PDCurses/PDCurses.vcxproj b/sys/windows/vs/PDCurses/PDCurses.vcxproj index ab75f18db..90550816c 100644 --- a/sys/windows/vs/PDCurses/PDCurses.vcxproj +++ b/sys/windows/vs/PDCurses/PDCurses.vcxproj @@ -1,5 +1,5 @@ - + diff --git a/sys/windows/vs/hacklib/hacklib.vcxproj b/sys/windows/vs/hacklib/hacklib.vcxproj index 9ac94ffb1..5876a277b 100644 --- a/sys/windows/vs/hacklib/hacklib.vcxproj +++ b/sys/windows/vs/hacklib/hacklib.vcxproj @@ -6,6 +6,12 @@ + + Win32Proj + {096FD6BB-256A-4E68-9B09-2ACA7C606FF3} + hacklib + 10.0 + Debug @@ -43,13 +49,6 @@ - - 17.0 - Win32Proj - {096FD6BB-256A-4E68-9B09-2ACA7C606FF3} - hacklib - 10.0 - StaticLibrary @@ -67,15 +66,15 @@ StaticLibrary true - v143 Unicode + v143 StaticLibrary false - v143 true Unicode + v143 diff --git a/sys/windows/vs/lualib/lualib.vcxproj b/sys/windows/vs/lualib/lualib.vcxproj index 185f94b9d..d18f8a5ac 100644 --- a/sys/windows/vs/lualib/lualib.vcxproj +++ b/sys/windows/vs/lualib/lualib.vcxproj @@ -6,6 +6,12 @@ + + Win32Proj + {B6B3CC8A-75FD-479C-AB1C-D80FFF0F5037} + lualib + 10.0 + Debug @@ -69,13 +75,6 @@ - - 17.0 - Win32Proj - {B6B3CC8A-75FD-479C-AB1C-D80FFF0F5037} - lualib - 10.0 - StaticLibrary @@ -93,15 +92,15 @@ StaticLibrary true - v143 Unicode + v143 StaticLibrary false - v143 true Unicode + v143