nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Merge branch 'NetHack-3.7' into to500

Browse Source
This commit is contained in:
nhmall
2026-04-29 15:12:08 -04:00
parent ce5459884a cc00eca915
commit 30787e468f
23 changed files with 206 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dat/bogusmon.txt
+17 -3
View File
@@ -97,6 +97,22 @@ voussoir
barking spider
frog cloud
toothsayer
third eye
owlpug
pugasus
acorn
red dot
robot chicken
doozer
poison cackler
lhurgoyf
phelddagrif
tiktaalik
weremoustache
rapier tapir
choplet
pommelbug
quest sprout
# Quendor (Zork, &c.)
grue
@@ -301,6 +317,7 @@ wiki
peer
COBOL
wire shark
stray tab
# bugs
bohrbug
@@ -384,9 +401,6 @@ little green man
# Portal
weighted Companion Cube
# /b/
/b/tard
# South Park
manbearpig
dat/history
+39 -38
View File
@@ -292,45 +292,46 @@ particularly intriguing modification to help out with the game. The
NetHack Development Team sometimes makes note of the names of the worst
of these miscreants in this, the list of Dungeoneers:
Adam Aronow J. Ali Harlow Mikko Juola
Alex Kompel Janet Walz Nathan Eady
Alex Smith Janne Salmijarvi Norm Meluch
Andreas Dorn Jean-Christophe Collet Olaf Seibert
Andy Church Jeff Bailey Pasi Kallinen
Andy Swanson Jochen Erwied Pat Rankin
Andy Thomson John Kallen Patric Mueller
Ari Huttunen John Rupley Paul Winner
Bart House John S. Bien Pierre Martineau
Benson I. Margulies Johnny Lee Ralf Brown
Bill Dyer Jon W{tte Ray Chason
Boudewijn Waijers Jonathan Handler Richard Addison
Bruce Cox Joshua Delahunty Richard Beigel
Bruce Holloway Karl Garrison Richard P. Hughey
Bruce Mewborne Keizo Yamamoto Rob Menke
Carl Schelin Keith Simpson Robin Bandy
Chris Russo Ken Arnold Robin Johnson
David Cohrs Ken Arromdee Roderick Schertler
David Damerell Ken Lorber Roland McGrath
David Gentzel Ken Washikita Ron Van Iwaarden
David Hairston Kevin Darcy Ronnen Miller
Dean Luick Kevin Hugo Ross Brown
Del Lamb Kevin Sitze Sascha Wostmann
Derek S. Ray Kevin Smolkowski Scott Bigham
Deron Meranda Kevin Sweet Scott R. Turner
Dion Nicolaas Lars Huttar Sean Hunt
Dylan O'Donnell Leon Arnott Stephen Spackman
Eric Backus M. Drew Streib Stefan Thielscher
Eric Hendrickson Malcolm Ryan Stephen White
Eric R. Smith Mark Gooderum Steve Creps
Eric S. Raymond Mark Modrall Steve Linhart
Erik Andersen Marvin Bressler Steve VanDevender
Fredrik Ljungdahl Matthew Day Teemu Suikki
Frederick Roeber Merlyn LeRoy Tim Lennan
Adam Aronow Izchak Miller Mike Stephenson
Alex Kompel J. Ali Harlow Mikko Juola
Alex Smith Janet Walz Nathan Eady
Andreas Dorn Janne Salmijarvi Norm Meluch
Andy Church Jean-Christophe Collet Olaf Seibert
Andy Swanson Jeff Bailey Pasi Kallinen
Andy Thomson Jochen Erwied Pat Rankin
Ari Huttunen John Kallen Patric Mueller
Bart House John Rupley Paul Winner
Benson I. Margulies John S. Bien Pierre Martineau
Bill Dyer Johnny Lee Ralf Brown
Boudewijn Waijers Jon W{tte Ray Chason
Bruce Cox Jonathan Handler Richard Addison
Bruce Holloway Joshua Delahunty Richard Beigel
Bruce Mewborne Karl Garrison Richard P. Hughey
Carl Schelin Keizo Yamamoto Rob Menke
Chris Russo Keith Simpson Robin Bandy
David Cohrs Ken Arnold Robin Johnson
David Damerell Ken Arromdee Roderick Schertler
David Gentzel Ken Lorber Roland McGrath
David Hairston Ken Washikita Ron Van Iwaarden
Dean Luick Kevin Darcy Ronnen Miller
Del Lamb Kevin Hugo Ross Brown
Derek S. Ray Kevin Sitze Sascha Wostmann
Deron Meranda Kevin Smolkowski Scott Bigham
Dion Nicolaas Kevin Sweet Scott R. Turner
Dylan O'Donnell Lars Huttar Sean Hunt
Eric Backus Leon Arnott Stephen Spackman
Eric Hendrickson M. Drew Streib Stefan Thielscher
Eric R. Smith Malcolm Ryan Stephen White
Eric S. Raymond Mark Gooderum Steve Creps
Erik Andersen Mark Modrall Steve Linhart
Fredrik Ljungdahl Marvin Bressler Steve VanDevender
Frederick Roeber Matthew Day Teemu Suikki
G. Branden Robinson Merlyn LeRoy Tim Lennan
Gil Neiger Michael Allison Timo Hakulinen
Greg Laskin Michael Feir Tom Almy
Greg Olson Michael Hamel Tom West
Gregg Wonderly Michael Sokolov Warren Cheung
Hao-yang Wang Mike Engber Warwick Allison
Helge Hafting Mike Gallop Yitzhak Sapir
Gregg Wonderly Michael Meyer Warren Cheung
Hao-yang Wang Michael Sokolov Warwick Allison
Helge Hafting Mike Engber Yitzhak Sapir
Ingo Paschke Mike Gallop
Irina Rempt-Drijfhout Mike Passaretti
Izchak Miller Mike Stephenson
doc/Guidebook.mn
+39 -38
View File
@@ -6811,48 +6811,49 @@ miscreants in this, the list of Dungeoneers:
center;
c2 c2 c.
.\"TABLE_START
Adam Aronow J. Ali Harlow Mikko Juola
Alex Kompel Janet Walz Nathan Eady
Alex Smith Janne Salmijarvi Norm Meluch
Andreas Dorn Jean-Christophe Collet Olaf Seibert
Andy Church Jeff Bailey Pasi Kallinen
Andy Swanson Jochen Erwied Pat Rankin
Andy Thomson John Kallen Patric Mueller
Ari Huttunen John Rupley Paul Winner
Bart House John S. Bien Pierre Martineau
Benson I. Margulies Johnny Lee Ralf Brown
Bill Dyer Jon W{tte Ray Chason
Boudewijn Waijers Jonathan Handler Richard Addison
Bruce Cox Joshua Delahunty Richard Beigel
Bruce Holloway Karl Garrison Richard P. Hughey
Bruce Mewborne Keizo Yamamoto Rob Menke
Carl Schelin Keith Simpson Robin Bandy
Chris Russo Ken Arnold Robin Johnson
David Cohrs Ken Arromdee Roderick Schertler
David Damerell Ken Lorber Roland McGrath
David Gentzel Ken Washikita Ron Van Iwaarden
David Hairston Kevin Darcy Ronnen Miller
Dean Luick Kevin Hugo Ross Brown
Del Lamb Kevin Sitze Sascha Wostmann
Derek S. Ray Kevin Smolkowski Scott Bigham
Deron Meranda Kevin Sweet Scott R. Turner
Dion Nicolaas Lars Huttar Sean Hunt
Dylan O'Donnell Leon Arnott Stephen Spackman
Eric Backus M. Drew Streib Stefan Thielscher
Eric Hendrickson Malcolm Ryan Stephen White
Eric R. Smith Mark Gooderum Steve Creps
Eric S. Raymond Mark Modrall Steve Linhart
Erik Andersen Marvin Bressler Steve VanDevender
Fredrik Ljungdahl Matthew Day Teemu Suikki
Frederick Roeber Merlyn LeRoy Tim Lennan
Adam Aronow Izchak Miller Mike Stephenson
Alex Kompel J. Ali Harlow Mikko Juola
Alex Smith Janet Walz Nathan Eady
Andreas Dorn Janne Salmijarvi Norm Meluch
Andy Church Jean-Christophe Collet Olaf Seibert
Andy Swanson Jeff Bailey Pasi Kallinen
Andy Thomson Jochen Erwied Pat Rankin
Ari Huttunen John Kallen Patric Mueller
Bart House John Rupley Paul Winner
Benson I. Margulies John S. Bien Pierre Martineau
Bill Dyer Johnny Lee Ralf Brown
Boudewijn Waijers Jon W{tte Ray Chason
Bruce Cox Jonathan Handler Richard Addison
Bruce Holloway Joshua Delahunty Richard Beigel
Bruce Mewborne Karl Garrison Richard P. Hughey
Carl Schelin Keizo Yamamoto Rob Menke
Chris Russo Keith Simpson Robin Bandy
David Cohrs Ken Arnold Robin Johnson
David Damerell Ken Arromdee Roderick Schertler
David Gentzel Ken Lorber Roland McGrath
David Hairston Ken Washikita Ron Van Iwaarden
Dean Luick Kevin Darcy Ronnen Miller
Del Lamb Kevin Hugo Ross Brown
Derek S. Ray Kevin Sitze Sascha Wostmann
Deron Meranda Kevin Smolkowski Scott Bigham
Dion Nicolaas Kevin Sweet Scott R. Turner
Dylan O'Donnell Lars Huttar Sean Hunt
Eric Backus Leon Arnott Stephen Spackman
Eric Hendrickson M. Drew Streib Stefan Thielscher
Eric R. Smith Malcolm Ryan Stephen White
Eric S. Raymond Mark Gooderum Steve Creps
Erik Andersen Mark Modrall Steve Linhart
Fredrik Ljungdahl Marvin Bressler Steve VanDevender
Frederick Roeber Matthew Day Teemu Suikki
G. Branden Robinson Merlyn LeRoy Tim Lennan
Gil Neiger Michael Allison Timo Hakulinen
Greg Laskin Michael Feir Tom Almy
Greg Olson Michael Hamel Tom West
Gregg Wonderly Michael Sokolov Warren Cheung
Hao-yang Wang Mike Engber Warwick Allison
Helge Hafting Mike Gallop Yitzhak Sapir
Gregg Wonderly Michael Meyer Warren Cheung
Hao-yang Wang Michael Sokolov Warwick Allison
Helge Hafting Mike Engber Yitzhak Sapir
Ingo Paschke Mike Gallop
Irina Rempt-Drijfhout Mike Passaretti
Izchak Miller Mike Stephenson
.\"TABLE_END Do not delete this line.
.TE
.BR 1
doc/Guidebook.tex
+40 -39
View File
@@ -7555,48 +7555,49 @@ of these miscreants in this, the list of Dungeoneers:
\begin{center}
\begin{tabular}{llll}
%TABLE_START
Adam Aronow & J. Ali Harlow & Mikko Juola\\
Alex Kompel & Janet Walz & Nathan Eady\\
Alex Smith & Janne Salmij\"{a}rvi & Norm Meluch\\
Andreas Dorn & Jean-Christophe Collet & Olaf Seibert\\
Andy Church & Jeff Bailey & Pasi Kallinen\\
Andy Swanson & Jochen Erwied & Pat Rankin\\
Andy Thomson & John Kallen & Patric Mueller\\
Ari Huttunen & John Rupley & Paul Winner\\
Bart House & John S. Bien & Pierre Martineau\\
Benson I. Margulies & Johnny Lee & Ralf Brown\\
Bill Dyer & Jon W\textbraceleft tte & Ray Chason\\
Boudewijn Waijers & Jonathan Handler & Richard Addison\\
Bruce Cox & Joshua Delahunty & Richard Beigel\\
Bruce Holloway & Karl Garrison & Richard P. Hughey\\
Bruce Mewborne & Keizo Yamamoto & Rob Menke\\
Carl Schelin & Keith Simpson & Robin Bandy\\
Chris Russo & Ken Arnold & Robin Johnson\\
David Cohrs & Ken Arromdee & Roderick Schertler\\
David Damerell & Ken Lorber & Roland McGrath\\
David Gentzel & Ken Washikita & Ron Van Iwaarden\\
David Hairston & Kevin Darcy & Ronnen Miller\\
Dean Luick & Kevin Hugo & Ross Brown\\
Del Lamb & Kevin Sitze & Sascha Wostmann\\
Derek S. Ray & Kevin Smolkowski & Scott Bigham\\
Deron Meranda & Kevin Sweet & Scott R. Turner\\
Dion Nicolaas & Lars Huttar & Sean Hunt\\
Dylan O'Donnell & Leon Arnott & Stephen Spackman\\
Eric Backus & M. Drew Streib & Stefan Thielscher\\
Eric Hendrickson & Malcolm Ryan & Stephen White\\
Eric R. Smith & Mark Gooderum & Steve Creps\\
Eric S. Raymond & Mark Modrall & Steve Linhart\\
Erik Andersen & Marvin Bressler & Steve VanDevender\\
Fredrik Ljungdahl & Matthew Day & Teemu Suikki\\
Frederick Roeber & Merlyn LeRoy & Tim Lennan\\
Adam Aronow & Izchak Miller & Mike Stephenson\\
Alex Kompel & J. Ali Harlow & Mikko Juola\\
Alex Smith & Janet Walz & Nathan Eady\\
Andreas Dorn & Janne Salmij\"{a}rvi & Norm Meluch\\
Andy Church & Jean-Christophe Collet & Olaf Seibert\\
Andy Swanson & Jeff Bailey & Pasi Kallinen\\
Andy Thomson & Jochen Erwied & Pat Rankin\\
Ari Huttunen & John Kallen & Patric Mueller\\
Bart House & John Rupley & Paul Winner\\
Benson I. Margulies & John S. Bien & Pierre Martineau\\
Bill Dyer & Johnny Lee & Ralf Brown\\
Boudewijn Waijers & Jon W\{tte & Ray Chason\\
Bruce Cox & Jonathan Handler & Richard Addison\\
Bruce Holloway & Joshua Delahunty & Richard Beigel\\
Bruce Mewborne & Karl Garrison & Richard P. Hughey\\
Carl Schelin & Keizo Yamamoto & Rob Menke\\
Chris Russo & Keith Simpson & Robin Bandy\\
David Cohrs & Ken Arnold & Robin Johnson\\
David Damerell & Ken Arromdee & Roderick Schertler\\
David Gentzel & Ken Lorber & Roland McGrath\\
David Hairston & Ken Washikita & Ron Van Iwaarden\\
Dean Luick & Kevin Darcy & Ronnen Miller\\
Del Lamb & Kevin Hugo & Ross Brown\\
Derek S. Ray & Kevin Sitze & Sascha Wostmann\\
Deron Meranda & Kevin Smolkowski & Scott Bigham\\
Dion Nicolaas & Kevin Sweet & Scott R. Turner\\
Dylan O'Donnell & Lars Huttar & Sean Hunt\\
Eric Backus & Leon Arnott & Stephen Spackman\\
Eric Hendrickson & M. Drew Streib & Stefan Thielscher\\
Eric R. Smith & Malcolm Ryan & Stephen White\\
Eric S. Raymond & Mark Gooderum & Steve Creps\\
Erik Andersen & Mark Modrall & Steve Linhart\\
Fredrik Ljungdahl & Marvin Bressler & Steve VanDevender\\
Frederick Roeber & Matthew Day & Teemu Suikki\\
G. Branden Robinson & Merlyn LeRoy & Tim Lennan\\
Gil Neiger & Michael Allison & Timo Hakulinen\\
Greg Laskin & Michael Feir & Tom Almy\\
Greg Olson & Michael Hamel & Tom West\\
Gregg Wonderly & Michael Sokolov & Warren Cheung\\
Hao-yang Wang & Mike Engber & Warwick Allison\\
Helge Hafting & Mike Gallop & Yitzhak Sapir\\
Irina Rempt-Drijfhout & Mike Passaretti\\
Izchak Miller & Mike Stephenson
Gregg Wonderly & Michael Meyer & Warren Cheung\\
Hao-yang Wang & Michael Sokolov & Warwick Allison\\
Helge Hafting & Mike Engber & Yitzhak Sapir\\
Ingo Paschke & Mike Gallop\\
Irina Rempt-Drijfhout & Mike Passaretti
%TABLE_END Do not delete this line.
\end{tabular}
\end{center}
src/do_name.c
+1 -1
View File
@@ -1484,7 +1484,7 @@ static NEARDATA const char *const hliquids[] = {
"caramel sauce", "ink", "aqueous humour", "milk substitute",
"fruit juice", "glowing lava", "gastric acid", "mineral water",
"cough syrup", "quicksilver", "sweet vitriol", "grey goo", "pink slime",
"cosmic latte",
"cosmic latte", "bone oil", "custard", "lard", "vinegar", "creosote",
/* "new coke (tm)", --better not */
};
src/trap.c
+3
View File
@@ -7123,6 +7123,9 @@ trapname(
"sweet-smelling gas vent", "phone booth", "exploding runes",
"never-ending elevator", "slime pit", "warp zone", "illusory floor",
"pile of poo", "honey trap", "tourist trap",
"banana peel", "garden rake", "whoopie cushion", "box and stick trap",
"fly trap", "legal trap", "pit of snakes", "pollywog trap",
"slippery slope", "thirst trap", "suntrap",
};
static char roletrap[33]; /* [17 + 5 + 1] should suffice */
sys/windows/Makefile.nmake
+3 -3
View File
@@ -8,8 +8,8 @@
# MS Visual Studio Visual C++ compiler
#
# Visual Studio Compilers Tested:
# - Microsoft Visual Studio Community 2022 v 17.14.30
# - Microsoft Visual Studio Community 2026 v 18.5.0
# - Microsoft Visual Studio Community 2022 v 17.14.31
# - Microsoft Visual Studio Community 2026 v 18.5.2
#
#==============================================================================
# This is used for building two distinct executables of NetHack:
@@ -1188,7 +1188,7 @@ rc=Rc.exe
#
# Recently tested versions:
TESTEDVS2022 = 14.44.35225.0
TESTEDVS2026 = 14.50.35729.0
TESTEDVS2026 = 14.50.35730.0
VS20261ST = 1450000000
VS2026CUR = $(TESTEDVS2026:.=)
sys/windows/vs/NetHack/NetHack.vcxproj
+4 -1
View File
@@ -3,6 +3,9 @@
<Import Project="..\config.props" />
<Import Project="..\dirs.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<VCToolsVersion />
</PropertyGroup>
<Import Project="..\default.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<Import Project="..\NetHackProperties.props" />
@@ -329,4 +332,4 @@
<Target Name="AfterRebuild">
<MSBuild Projects="afternethack.proj" Targets="Build" Properties="Configuration=$(Configuration)" />
</Target>
</Project>
</Project>
sys/windows/vs/NetHackW/NetHackW.vcxproj
+4 -1
View File
@@ -33,6 +33,9 @@
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<VCToolsVersion />
</PropertyGroup>
<Import Project="..\dirs.props" />
<Import Project="..\default.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -406,4 +409,4 @@
<Target Name="AfterRebuild">
<MSBuild Projects="$(vsDir)NetHack\afternethack.proj" Targets="Build" Properties="Configuration=$(Configuration)" />
</Target>
</Project>
</Project>
sys/windows/vs/PDCurses/PDCurses.vcxproj
+3
View File
@@ -35,6 +35,9 @@
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<VCToolsVersion />
</PropertyGroup>
<Import Project="..\default_lib.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ItemGroup>
sys/windows/vs/PDCursesGui/pdcursesgui.vcxproj
+3
View File
@@ -35,6 +35,9 @@
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<VCToolsVersion />
</PropertyGroup>
<Import Project="..\default_lib.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ItemGroup>
sys/windows/vs/dlb/dlb.vcxproj
+3
View File
@@ -33,6 +33,9 @@
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<VCToolsVersion />
</PropertyGroup>
<Import Project="..\default.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
sys/windows/vs/hacklib/hacklib.vcxproj
+3 -3
View File
@@ -75,7 +75,7 @@
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v145</PlatformToolset>
<PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
@@ -87,7 +87,7 @@
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v145</PlatformToolset>
<PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
@@ -230,4 +230,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>
sys/windows/vs/lualib/lualib.vcxproj
+7 -7
View File
@@ -90,22 +90,22 @@
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<PlatformToolset>v143</PlatformToolset>
<PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
</PropertyGroup>
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<PlatformToolset>v143</PlatformToolset>
<PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
</PropertyGroup>
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
<PlatformToolset>v145</PlatformToolset>
<PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
</PropertyGroup>
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<PlatformToolset>v143</PlatformToolset>
<PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
</PropertyGroup>
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<PlatformToolset>v143</PlatformToolset>
<PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
</PropertyGroup>
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
<PlatformToolset>v145</PlatformToolset>
<PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -239,4 +239,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>
sys/windows/vs/makedefs/makedefs.vcxproj
+3
View File
@@ -33,6 +33,9 @@
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<VCToolsVersion />
</PropertyGroup>
<Import Project="..\default.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
sys/windows/vs/nhlua_h/nhlua_h.vcxproj
+6 -2
View File
@@ -33,6 +33,9 @@
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<VCToolsVersion />
</PropertyGroup>
<Import Project="..\default.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="PropertySheets">
@@ -50,10 +53,11 @@
<Exec Command="echo #include %22lualib.h%22 &gt;&gt; nhlua.h" WorkingDirectory="$(IncDir)" />
<Exec Command="echo #include %22lauxlib.h%22 &gt;&gt; nhlua.h" WorkingDirectory="$(IncDir)" />
<Exec Command="echo /*nhlua.h*/ &gt;&gt; nhlua.h" WorkingDirectory="$(IncDir)" />
</Target> <Target Name="AfterBuild">
</Target>
<Target Name="AfterBuild">
</Target>
<Target Name="AfterClean">
</Target>
<Target Name="AfterRebuild">
</Target>
</Project>
</Project>
sys/windows/vs/recover/recover.vcxproj
+3
View File
@@ -33,6 +33,9 @@
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<VCToolsVersion />
</PropertyGroup>
<Import Project="..\default.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<Import Project="..\NetHackProperties.props" />
sys/windows/vs/sfctool/sfctool.vcxproj
+6 -6
View File
@@ -87,39 +87,39 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
sys/windows/vs/sftags/sftags.vcxproj
+6 -6
View File
@@ -47,39 +47,39 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
sys/windows/vs/tile2bmp/tile2bmp.vcxproj
+3
View File
@@ -33,6 +33,9 @@
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<VCToolsVersion />
</PropertyGroup>
<Import Project="..\default.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
sys/windows/vs/tilemap/tilemap.vcxproj
+3
View File
@@ -33,6 +33,9 @@
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<VCToolsVersion />
</PropertyGroup>
<Import Project="..\default.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
sys/windows/vs/tiles/tiles.vcxproj
+4 -4
View File
@@ -26,22 +26,22 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Makefile</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Makefile</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Makefile</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Makefile</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
sys/windows/vs/uudecode/uudecode.vcxproj
+3
View File
@@ -33,6 +33,9 @@
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<VCToolsVersion />
</PropertyGroup>
<Import Project="..\default.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">