Skip to content

Commit

Permalink
Merge branch 'updates' into merges
Browse files Browse the repository at this point in the history
  • Loading branch information
@elunna
elunna committed Dec 7, 2024
2 parents e0b4842 + 12228ca commit 8bb831c
Show file tree
Hide file tree
Showing 30 changed files with 302 additions and 190 deletions.
18 changes: 9 additions & 9 deletions Files
View file
Original file line number Diff line number Diff line change
Expand Up @@ -428,14 +428,14 @@ vmsunix.c

sys/windows:
(files for Windows 7/8.x/10/11 version)
Install.windows Makefile.mingw32 Makefile.mingw32.depend
Makefile.nmake build-msys2.txt build-nmake.txt
build-vs.txt console.rc consoletty.c
fetch.cmd guitty.c nethack.def
nethackrc.template nhico.uu nhsetup.bat
porthelp sysconf.template win10.c
win10.h win32api.h windmain.c
windsys.c winos.h
GNUmakefile GNUmakefile.depend Install.windows
Makefile.nmake build-msys2.txt build-nmake.txt
build-vs.txt console.rc consoletty.c
fetch.cmd guitty.c nethack.def
nethackrc.template nhico.uu nhsetup.bat
porthelp sysconf.template win10.c
win10.h win32api.h windmain.c
windsys.c winos.h

sys/windows/vs:
(files for Visual Studio 2019 or 2022 Community Edition builds)
Expand Down Expand Up @@ -668,7 +668,7 @@ pet_mark.xbm rip.xpm x11tiles

src:
(files for win32 that are moved into src at compile time)
Makefile Makefile.mingw32
GNUmakefile Makefile

(files generated by 'moc' for Qt interface at compile time)
qt_kde0.moc qt_main.moc qt_map.moc qt_menu.moc qt_msg.moc
Expand Down
60 changes: 24 additions & 36 deletions azure-pipelines.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,24 @@ strategy:
imageName: 'ubuntu-latest'
toolchainName: gcc9
buildTargetName: minimal
linux_jammy_clang_all:
imageName: 'ubuntu-22.04'
linux_noble_clang_all:
imageName: 'ubuntu-24.04'
toolchainName: clang
buildTargetName: all
linux_jammy_gcc9_all:
imageName: 'ubuntu-22.04'
toolchainName: gcc9
buildTargetName: all
linux_jammy_gcc12_all:
imageName: 'ubuntu-22.04'
toolchainName: gcc12
linux_noble_gcc13_all:
imageName: 'ubuntu-24.04'
toolchainName: gcc13
buildTargetName: all
macOS_latest_clang_all:
imageName: 'macOS-latest'
toolchainName: clang
buildTargetName: all
macOS_Ventura_clang13_all:
imageName: 'macOS-13'
macOS_Sequoia_clang15_all:
imageName: 'macOS-15'
toolchainName: clang
buildTargetName: all
windows-visualstudio:
Expand All @@ -32,12 +32,12 @@ strategy:
imageName: 'windows-2019'
toolchainName: mingw
buildTargetName: all
linux_focal_cross_msdos:
imageName: 'ubuntu-20.04'
linux_noble_cross_msdos:
imageName: 'ubuntu-24.04'
toolchainName: cross
buildTargetName: msdos
linux_jammy_docs:
imageName: 'ubuntu-22.04'
linux_noble_docs:
imageName: 'ubuntu-24.04'
toolchainName: docs
buildTargetName: all
continueOnError: true
Expand All @@ -60,30 +60,15 @@ variables:

steps:
- bash: |
if [ "$(toolchain)" == "gcc7" ]
then
echo "##vso[task.setvariable variable=CC]gcc-7"
echo "##vso[task.setvariable variable=CXX]g++-7"
fi
if [ "$(toolchain)" == "gcc9" ]
then
echo "##vso[task.setvariable variable=CC]gcc-9"
echo "##vso[task.setvariable variable=CXX]g++-9"
fi
if [ "$(toolchain)" == "gcc10" ]
if [ "$(toolchain)" == "gcc13" ]
then
echo "##vso[task.setvariable variable=CC]gcc-10"
echo "##vso[task.setvariable variable=CXX]g++-10"
fi
if [ "$(toolchain)" == "gcc11" ]
then
echo "##vso[task.setvariable variable=CC]gcc-11"
echo "##vso[task.setvariable variable=CXX]g++-11"
fi
if [ "$(toolchain)" == "gcc12" ]
then
echo "##vso[task.setvariable variable=CC]gcc-12"
echo "##vso[task.setvariable variable=CXX]g++-12"
echo "##vso[task.setvariable variable=CC]gcc-13"
echo "##vso[task.setvariable variable=CXX]g++-13"
fi
if [ "$(toolchain)" == "clang" ]
then
Expand All @@ -92,8 +77,8 @@ steps:
fi
if [ "$(toolchain)" == "cross" ]
then
echo "##vso[task.setvariable variable=CC]gcc-9"
echo "##vso[task.setvariable variable=CXX]g++-9"
echo "##vso[task.setvariable variable=CC]gcc-13"
echo "##vso[task.setvariable variable=CXX]g++-13"
fi
displayName: 'Setting variables'

Expand Down Expand Up @@ -143,12 +128,14 @@ steps:
#
# 64-bit
#export CURLSRC=https://github.com/brechtsanders/winlibs_mingw/releases/download/11.2.0-9.0.0-ucrt-r5/winlibs-x86_64-posix-seh-gcc-11.2.0-mingw-w64ucrt-9.0.0-r5.zip
#export CURLSRC=https://github.com/brechtsanders/winlibs_mingw/releases/download/14.2.0posix-19.1.1-12.0.0-ucrt-r2/winlibs-x86_64-posix-seh-gcc-14.2.0-llvm-19.1.1-mingw-w64ucrt-12.0.0-r2.zip
#export CURLDST=mingw-x64.zip
#export MINGWBIN=mingw64
#export MSYSTEM=MINGW64
#
# 32-bit
export CURLSRC=https://github.com/brechtsanders/winlibs_mingw/releases/download/11.2.0-9.0.0-ucrt-r5/winlibs-i686-posix-dwarf-gcc-11.2.0-mingw-w64ucrt-9.0.0-r5.zip
#export CURLSRC=https://github.com/brechtsanders/winlibs_mingw/releases/download/11.2.0-9.0.0-ucrt-r5/winlibs-i686-posix-dwarf-gcc-11.2.0-mingw-w64ucrt-9.0.0-r5.zip
export CURLSRC=https://github.com/brechtsanders/winlibs_mingw/releases/download/14.2.0posix-19.1.1-12.0.0-ucrt-r2/winlibs-i686-posix-dwarf-gcc-14.2.0-llvm-19.1.1-mingw-w64ucrt-12.0.0-r2.zip
export CURLDST=mingw-x86.zip
export MINGWBIN=mingw32
export MSYSTEM=MINGW32
Expand All @@ -164,10 +151,10 @@ steps:
export
cd ../src
pwd
cp ../sys/windows/Makefile.mingw32* .
mingw32-make -f Makefile.mingw32 CI_COMPILER=1 GIT=1 MSYSTEM=$MSYSTEM LUA_VERSION=$LUA_VERSION clean
mingw32-make -f Makefile.mingw32 CI_COMPILER=1 GIT=1 MSYSTEM=$MSYSTEM LUA_VERSION=$LUA_VERSION depend
mingw32-make -f Makefile.mingw32 CI_COMPILER=1 GIT=1 MSYSTEM=$MSYSTEM LUA_VERSION=$LUA_VERSION
cp ../sys/windows/GNUmakefile* .
mingw32-make -f GNUmakefile CI_COMPILER=1 GIT=1 MSYSTEM=$MSYSTEM LUA_VERSION=$LUA_VERSION clean
mingw32-make -f GNUmakefile CI_COMPILER=1 GIT=1 MSYSTEM=$MSYSTEM LUA_VERSION=$LUA_VERSION depend
mingw32-make -f GNUmakefile CI_COMPILER=1 GIT=1 MSYSTEM=$MSYSTEM LUA_VERSION=$LUA_VERSION
condition: eq( variables.toolchain, 'mingw' )
workingDirectory: $(Agent.BuildDirectory)/$(netHackPath)/src
displayName: 'MinGW Build'
Expand Down Expand Up @@ -232,6 +219,7 @@ steps:
displayName: 'Building mac full build'

- bash: |
sudo apt -qq -y install libfl2
export GCCVER=gcc1220
cd sys/unix
sh setup.sh hints/linux.370
Expand Down
11 changes: 8 additions & 3 deletions dat/tower1.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,14 @@ des.monster("V",niches[3])
-- gave them titles rather than (or perhaps in addition to) specific names
-- and we use those titles here. Marking them as 'waiting' forces them to
-- start in vampire form instead of vampshifted into bat/fog/wolf form.
des.monster({ id="Vampire Lady", niches[4], name="Madame", waiting=1 })
des.monster({ id="Vampire Lady", niches[5], name="Marquise", waiting=1 })
des.monster({ id="Vampire Lady", niches[6], name="Countess", waiting=1 })
local Vgenod = nh.is_genocided("vampire");
local Vnames = { nil, nil, nil };
if (not Vgenod) then
Vnames = { "Madame", "Marquise", "Countess" };
end
des.monster({ id="Vampire Lady", niches[4], name=Vnames[1], waiting=1 })
des.monster({ id="Vampire Lady", niches[5], name=Vnames[2], waiting=1 })
des.monster({ id="Vampire Lady", niches[6], name=Vnames[3], waiting=1 })
-- The doors
des.door("closed",08,03)
des.door("closed",10,03)
Expand Down
Loading

0 comments on commit 8bb831c

Please sign in to comment.