Browse Source

change references from winnt to windows

rename sys/winnt to sys/windows
move vs (visual studio) folder out of win/win32 and into sys/windows
rename include/ntconf.h to include/windconf.h
rename winnt.c to windsys.c
place visual studio projects into individual subfolders.

This will hopefully resolve GitHub issue #484 as well.
NetHack-3.7
nhmall 4 months ago
parent
commit
0a10bd632d
  1. 2
      azure-pipelines.yml
  2. 22
      include/extern.h
  3. 2
      include/global.h
  4. 12
      include/windconf.h
  5. 4
      outdated/.travis.yml
  6. 2
      outdated/include/wceconf.h
  7. 14
      outdated/sys/wince/bootstrp.mak
  8. 2
      sys/msdos/Makefile.GCC
  9. 2
      sys/unix/Makefile.src
  10. 4
      sys/unix/NetHack.xcodeproj/project.pbxproj
  11. 2
      sys/vms/Install.vms
  12. 2
      sys/vms/Makefile.src
  13. 2
      sys/windows/.gitattributes
  14. 0
      sys/windows/.gitignore
  15. 0
      sys/windows/.nethackrc.template
  16. 26
      sys/windows/Install.windows
  17. 28
      sys/windows/Makefile.gcc
  18. 32
      sys/windows/Makefile.msc
  19. 0
      sys/windows/console.rc
  20. 26
      sys/windows/consoletty.c
  21. 0
      sys/windows/nethack.def
  22. 0
      sys/windows/nh340key.c
  23. 0
      sys/windows/nhdefkey.c
  24. 0
      sys/windows/nhico.uu
  25. 0
      sys/windows/nhraykey.c
  26. 10
      sys/windows/nhsetup.bat
  27. 0
      sys/windows/ntsound.c
  28. 0
      sys/windows/porthelp
  29. 0
      sys/windows/stub-pdcscrn.c
  30. 6
      sys/windows/stubs.c
  31. 0
      sys/windows/sysconf.template
  32. 0
      sys/windows/travis-gcc.sh
  33. 0
      sys/windows/vs/.gitattributes
  34. 5
      sys/windows/vs/.gitignore
  35. 0
      sys/windows/vs/Images/BadgeLogo.scale-100.png
  36. 0
      sys/windows/vs/Images/BadgeLogo.scale-125.png
  37. 0
      sys/windows/vs/Images/BadgeLogo.scale-150.png
  38. 0
      sys/windows/vs/Images/BadgeLogo.scale-200.png
  39. 0
      sys/windows/vs/Images/BadgeLogo.scale-400.png
  40. 0
      sys/windows/vs/Images/LargeTile.scale-100.png
  41. 0
      sys/windows/vs/Images/LargeTile.scale-125.png
  42. 0
      sys/windows/vs/Images/LargeTile.scale-150.png
  43. 0
      sys/windows/vs/Images/LargeTile.scale-200.png
  44. 0
      sys/windows/vs/Images/LargeTile.scale-400.png
  45. 0
      sys/windows/vs/Images/LockScreenLogo.scale-200.png
  46. 0
      sys/windows/vs/Images/SmallTile.scale-100.png
  47. 0
      sys/windows/vs/Images/SmallTile.scale-125.png
  48. 0
      sys/windows/vs/Images/SmallTile.scale-150.png
  49. 0
      sys/windows/vs/Images/SmallTile.scale-200.png
  50. 0
      sys/windows/vs/Images/SmallTile.scale-400.png
  51. 0
      sys/windows/vs/Images/SplashScreen.scale-100.png
  52. 0
      sys/windows/vs/Images/SplashScreen.scale-125.png
  53. 0
      sys/windows/vs/Images/SplashScreen.scale-150.png
  54. 0
      sys/windows/vs/Images/SplashScreen.scale-200.png
  55. 0
      sys/windows/vs/Images/SplashScreen.scale-400.png
  56. 0
      sys/windows/vs/Images/Square150x150Logo.scale-100.png
  57. 0
      sys/windows/vs/Images/Square150x150Logo.scale-125.png
  58. 0
      sys/windows/vs/Images/Square150x150Logo.scale-150.png
  59. 0
      sys/windows/vs/Images/Square150x150Logo.scale-200.png
  60. 0
      sys/windows/vs/Images/Square150x150Logo.scale-400.png
  61. 0
      sys/windows/vs/Images/Square44x44Logo.altform-unplated_targetsize-16.png
  62. 0
      sys/windows/vs/Images/Square44x44Logo.altform-unplated_targetsize-256.png
  63. 0
      sys/windows/vs/Images/Square44x44Logo.altform-unplated_targetsize-32.png
  64. 0
      sys/windows/vs/Images/Square44x44Logo.altform-unplated_targetsize-48.png
  65. 0
      sys/windows/vs/Images/Square44x44Logo.scale-100.png
  66. 0
      sys/windows/vs/Images/Square44x44Logo.scale-125.png
  67. 0
      sys/windows/vs/Images/Square44x44Logo.scale-150.png
  68. 0
      sys/windows/vs/Images/Square44x44Logo.scale-200.png
  69. 0
      sys/windows/vs/Images/Square44x44Logo.scale-400.png
  70. 0
      sys/windows/vs/Images/Square44x44Logo.targetsize-16.png
  71. 0
      sys/windows/vs/Images/Square44x44Logo.targetsize-24.png
  72. 0
      sys/windows/vs/Images/Square44x44Logo.targetsize-24_altform-unplated.png
  73. 0
      sys/windows/vs/Images/Square44x44Logo.targetsize-256.png
  74. 0
      sys/windows/vs/Images/Square44x44Logo.targetsize-32.png
  75. 0
      sys/windows/vs/Images/Square44x44Logo.targetsize-48.png
  76. 0
      sys/windows/vs/Images/StoreLogo.backup.png
  77. 0
      sys/windows/vs/Images/StoreLogo.scale-100.png
  78. 0
      sys/windows/vs/Images/StoreLogo.scale-125.png
  79. 0
      sys/windows/vs/Images/StoreLogo.scale-150.png
  80. 0
      sys/windows/vs/Images/StoreLogo.scale-200.png
  81. 0
      sys/windows/vs/Images/StoreLogo.scale-400.png
  82. 0
      sys/windows/vs/Images/Wide310x150Logo.scale-100.png
  83. 0
      sys/windows/vs/Images/Wide310x150Logo.scale-125.png
  84. 0
      sys/windows/vs/Images/Wide310x150Logo.scale-150.png
  85. 0
      sys/windows/vs/Images/Wide310x150Logo.scale-200.png
  86. 0
      sys/windows/vs/Images/Wide310x150Logo.scale-400.png
  87. 24
      sys/windows/vs/NetHack.sln
  88. 28
      sys/windows/vs/NetHack/NetHack.vcxproj
  89. 7
      sys/windows/vs/NetHack/afternethack.proj
  90. 0
      sys/windows/vs/NetHackPackage.appxmanifest
  91. 21
      sys/windows/vs/NetHackPackage.wapproj
  92. 29
      sys/windows/vs/NetHackPackage/NetHackPackage.appxmanifest
  93. 141
      sys/windows/vs/NetHackPackage/NetHackPackage.wapproj
  94. 0
      sys/windows/vs/NetHackPackage/Package.StoreAssociation.xml
  95. 0
      sys/windows/vs/NetHackProperties.props
  96. 52
      sys/windows/vs/NetHackW/NetHackW.vcxproj
  97. 8
      sys/windows/vs/PDCurses/PDCurses.vcxproj
  98. 373
      sys/windows/vs/Package.StoreAssociation.xml
  99. 0
      sys/windows/vs/ScreenShot.PNG
  100. 0
      sys/windows/vs/build.bat

2
azure-pipelines.yml

@ -132,7 +132,7 @@ steps:
export PDCURSES_TOP=../submodules/pdcurses
export LUA_VERSION=5.4.3
export TRAVIS_COMPILER=1
cp ../sys/winnt/Makefile.gcc ./Makefile
cp ../sys/windows/Makefile.gcc ./Makefile
mingw32-make LUA_VERSION=$LUA_VERSION install
condition: eq( variables.toolchain, 'mingw' )
workingDirectory: $(Agent.BuildDirectory)/$(netHackPath)/src

22
include/extern.h

@ -1539,7 +1539,7 @@ extern void mplayer_talk(struct monst *);
#if defined(MICRO) || defined(WIN32)
/* ### msdos.c,os2.c,tos.c,winnt.c ### */
/* ### msdos.c,os2.c,tos.c,windows.c ### */
#ifndef WIN32
extern int tgetch(void);
@ -1565,7 +1565,7 @@ extern void chdrive(char *);
extern void disable_ctrlP(void);
extern void enable_ctrlP(void);
#endif
#if defined(MICRO) && !defined(WINNT)
#if defined(MICRO) && !defined(WIN32)
extern void get_scr_size(void);
#ifndef TOS
extern void gotoxy(int, int);
@ -1699,19 +1699,19 @@ extern const char *regex_error_desc(struct nhregex *);
extern boolean regex_match(const char *, struct nhregex *);
extern void regex_free(struct nhregex *);
/* ### nttty.c ### */
/* ### consoletty.c ### */
#ifdef WIN32
extern void get_scr_size(void);
extern int nttty_kbhit(void);
extern void nttty_open(int);
extern void nttty_rubout(void);
extern int consoletty_kbhit(void);
extern void consoletty_open(int);
extern void consoletty_rubout(void);
extern int tgetch(void);
extern int ntposkey(int *, int *, int *);
extern int console_poskey(int *, int *, int *);
extern void set_output_mode(int);
extern void synch_cursor(void);
extern void nethack_enter_nttty(void);
extern void nttty_exit(void);
extern void nethack_enter_consoletty(void);
extern void consoletty_exit(void);
#endif /* WIN32 */
/* ### o_init.c ### */
@ -3061,10 +3061,10 @@ extern char *decode_mixed(char *, const char *);
extern void genl_putmixed(winid, int, const char *);
extern boolean menuitem_invert_test(int, unsigned, boolean);
/* ### winnt.c ### */
/* ### windows.c ### */
#ifdef WIN32
extern void nethack_enter_winnt(void);
extern void nethack_enter_windows(void);
#endif
/* ### wizard.c ### */

2
include/global.h

@ -162,7 +162,7 @@ extern struct cross_target_s cross_target;
#endif
#ifdef WIN32
#include "ntconf.h"
#include "windconf.h"
#endif
#include "warnings.h"

12
include/ntconf.h → include/windconf.h

@ -1,9 +1,9 @@
/* NetHack 3.7 ntconf.h $NHDT-Date: 1596498552 2020/08/03 23:49:12 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.89 $ */
/* NetHack 3.7 windconf.h $NHDT-Date: 1596498552 2020/08/03 23:49:12 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.89 $ */
/* Copyright (c) NetHack PC Development Team 1993, 1994. */
/* NetHack may be freely redistributed. See license for details. */
#ifndef NTCONF_H
#define NTCONF_H
#ifndef WINDCONF_H
#define WINDCONF_H
/* #define SHELL */ /* nt use of pcsys routines caused a hang */
@ -223,7 +223,7 @@ extern const char *alllevels, *allbones;
#define getuid() 1
#define getlogin() ((char *) 0)
extern void win32_abort(void);
extern void nttty_preference_update(const char *);
extern void consoletty_preference_update(const char *);
extern void toggle_mouse_support(void);
extern void map_subkeyvalue(char *);
#if defined(WIN32CON)
@ -273,7 +273,7 @@ extern int set_win32_option(const char *, const char *);
extern int alternative_palette(char *);
#endif
#define nethack_enter(argc, argv) nethack_enter_winnt()
#define nethack_enter(argc, argv) nethack_enter_windows()
extern void nethack_exit(int) NORETURN;
extern boolean file_exists(const char *);
extern boolean file_newer(const char *, const char *);
@ -290,4 +290,4 @@ extern void nt_assert_failed(const char *, const char *, int);
#define nhassert(expression) (void)((!!(expression)) || \
(nt_assert_failed(#expression, __FILE__, __LINE__), 0))
#endif /* NTCONF_H */
#endif /* WINDCONF_H */

4
outdated/.travis.yml

@ -130,11 +130,11 @@ matrix:
- export ADD_CURSES=Y
- export PDCURSES_TOP=../lib/pdcurses
- export LUA_VERSION=5.4.3
- sh sys/winnt/travis-gcc.sh
- sh sys/windows/travis-gcc.sh
- test -d "lib/lua-$LUA_VERSION/src" || exit 0
- test -d "lib/pdcurses" || exit 0
- cd src
- cp ../sys/winnt/Makefile.gcc ./Makefile
- cp ../sys/windows/Makefile.gcc ./Makefile
- mingw32-make LUA_VERSION=$LUA_VERSION install
- name: msdos-linux-focal-djgpp-crosscompile
os: linux

2
outdated/include/wceconf.h

@ -180,7 +180,7 @@ extern char hackdir[];
#define getlogin() ((char *) 0)
extern void win32_abort(void);
#ifdef WIN32CON
extern void nttty_preference_update(const char *);
extern void consoletty_preference_update(const char *);
extern void toggle_mouse_support(void);
#endif

14
outdated/sys/wince/bootstrp.mak

@ -24,7 +24,7 @@ DOC = ..\doc # NetHack documentation files
UTIL = ..\util # Utility source
SRC = ..\src # Main source
SSYS = ..\sys\share # Shared system files
NTSYS = ..\sys\winnt # NT Win32 specific files
NTSYS = ..\sys\windows # NT Win32 specific files
TTY = ..\win\tty # window port files (tty)
WIN32 = ..\win\win32 # window port files (WINCE)
WSHR = ..\win\share # Tile support files
@ -77,7 +77,7 @@ LEVCFLAGS= -c -nologo -DWINVER=0x0400 -DWIN32 -D_WIN32 \
$(CC) $(CFLAGSU) -Fo$@ $<
#==========================================
# Rules for files in sys\winnt
# Rules for files in sys\windows
#==========================================
{$(NTSYS)}.c{$(OBJ)}.o:
@ -175,7 +175,7 @@ CONFIG_H = $(INCL)\config.h $(INCL)\config1.h $(INCL)\tradstdc.h \
$(INCL)\system.h $(INCL)\unixconf.h $(INCL)\os2conf.h \
$(INCL)\micro.h $(INCL)\pcconf.h $(INCL)\tosconf.h \
$(INCL)\amiconf.h $(INCL)\macconf.h $(INCL)\beconf.h \
$(INCL)\ntconf.h $(INCL)\wceconf.h
$(INCL)\windconf.h $(INCL)\wceconf.h
HACK_H = $(INCL)\hack.h $(CONFIG_H) $(INCL)\align.h \
$(INCL)\dungeon.h $(INCL)\monsym.h $(INCL)\mkroom.h \
@ -495,10 +495,10 @@ $(DAT)\dungeon: $(UTIL)\makedefs.exe $(DAT)\dungeon.def
# NT dependencies
#
#
#$(O)nttty.o: $(HACK_H) $(TILE_H) $(INCL)\win32api.h $(NTSYS)\nttty.c
# $(CC) $(CFLAGSU) -I$(WSHR) -Fo$@ $(NTSYS)\nttty.c
#$(O)winnt.o: $(HACK_H) $(INCL)\win32api.h $(NTSYS)\winnt.c
# $(CC) $(CFLAGSU) -Fo$@ $(NTSYS)\winnt.c
#$(O)consoletty.o: $(HACK_H) $(TILE_H) $(INCL)\win32api.h $(NTSYS)\consoletty.c
# $(CC) $(CFLAGSU) -I$(WSHR) -Fo$@ $(NTSYS)\consoletty.c
#$(O)windsys.o: $(HACK_H) $(INCL)\win32api.h $(NTSYS)\windsys.c
# $(CC) $(CFLAGSU) -Fo$@ $(NTSYS)\windsys.c
#$(O)ntsound.o: $(HACK_H) $(NTSYS)\ntsound.c
# $(CC) $(CFLAGSU) -Fo$@ $(NTSYS)\ntsound.c

2
sys/msdos/Makefile.GCC

@ -577,7 +577,7 @@ endif
@$(subst /,\,copy $(SSHR)/NetHack.cnf $(GAMEDIR)/defaults.nh)
-@$(subst /,\,touch $(GAMEDIR)/record)
@$(subst /,\,copy $(DOC)/guideb*.txt $(GAMEDIR))
@$(subst /,\,copy ../sys/winnt/sysconf $(GAMEDIR))
@$(subst /,\,copy ../sys/windows/sysconf $(GAMEDIR))
@$(subst /,\,if not exist $(GAMEDIR)/sysconf touch $(GAMEDIR)/sysconf)
@$(subst /,\,if exist $(DOC)/nethack.txt copy $(DOC)/nethack.txt $(GAMEDIR))
ifdef CWSDPMI

2
sys/unix/Makefile.src

@ -793,7 +793,7 @@ $(CONFIG_H): ../include/config.h ../include/config1.h ../include/patchlevel.h \
../include/tradstdc.h ../include/global.h ../include/warnings.h \
../include/coord.h ../include/vmsconf.h ../include/system.h \
../include/nhlua.h ../include/unixconf.h ../include/pcconf.h \
../include/ntconf.h ../include/fnamesiz.h
../include/windconf.h ../include/fnamesiz.h
touch $(CONFIG_H)
# hack.h timestamp
$(HACK_H): ../include/hack.h $(CONFIG_H) ../include/lint.h ../include/align.h \

4
sys/unix/NetHack.xcodeproj/project.pbxproj

@ -263,7 +263,7 @@
3186A39521A4B0FC0052BF02 /* obj.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = obj.h; path = ../../include/obj.h; sourceTree = "<group>"; };
3186A39721A4B0FC0052BF02 /* rm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = rm.h; path = ../../include/rm.h; sourceTree = "<group>"; };
3186A39A21A4B0FD0052BF02 /* wintty.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = wintty.h; path = ../../include/wintty.h; sourceTree = "<group>"; };
3186A39B21A4B0FD0052BF02 /* ntconf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ntconf.h; path = ../../include/ntconf.h; sourceTree = "<group>"; };
3186A39B21A4B0FD0052BF02 /* windconf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = windconf.h; path = ../../include/windconf.h; sourceTree = "<group>"; };
3186A39C21A4B0FD0052BF02 /* mkroom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mkroom.h; path = ../../include/mkroom.h; sourceTree = "<group>"; };
3186A39E21A4B0FD0052BF02 /* quest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = quest.h; path = ../../include/quest.h; sourceTree = "<group>"; };
3186A3A021A4B0FD0052BF02 /* dgn_file.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dgn_file.h; path = ../../include/dgn_file.h; sourceTree = "<group>"; };
@ -684,7 +684,7 @@
3186A38F21A4B0FC0052BF02 /* monflag.h */,
3186A3BB21A4B0FD0052BF02 /* monst.h */,
3186A38421A4B0FB0052BF02 /* monsym.h */,
3186A39B21A4B0FD0052BF02 /* ntconf.h */,
3186A39B21A4B0FD0052BF02 /* windconf.h */,
3186A39521A4B0FC0052BF02 /* obj.h */,
3186A3A821A4B0FD0052BF02 /* objclass.h */,
3186A38B21A4B0FC0052BF02 /* onames.h */,

2
sys/vms/Install.vms

@ -42,7 +42,7 @@
[.sys .wince] -- Windows CE
[.sys .wince .ceinc] -- more WinCE
[.sys .wince .ceinc .sys] -- ditto
[.sys .winnt] -- Windows NT
[.sys .windows] -- MS Windows
[.win .curses] - window routines for curses interface
[.win .gem] -- window routines for Atari/GEM
[.win .gnome] -- window routines for Unix/GNOME

2
sys/vms/Makefile.src

@ -386,7 +386,7 @@ spotless : clean
# config.h timestamp
$(CONFIG_H) : $(INC)config.h $(INC)config1.h $(INC)tradstdc.h $(INC)global.h \
$(INC)coord.h $(INC)vmsconf.h $(INC)system.h $(INC)unixconf.h \
$(INC)micro.h $(INC)pcconf.h $(INC)ntconf.h
$(INC)micro.h $(INC)pcconf.h $(INC)windconf.h
$(TOUCH) $(CONFIG_H)
# hack.h timestamp
$(HACK_H) : $(INC)hack.h $(CONFIG_H) $(INC)align.h \

2
sys/winnt/.gitattributes → sys/windows/.gitattributes

@ -1,4 +1,4 @@
Install.nt NHSUBST
Install.windows NHSUBST
Makefile.* NHSUBST
defaults.nh NHSUBST
sysconf NHSUBST

0
sys/winnt/.gitignore → sys/windows/.gitignore

0
sys/winnt/.nethackrc.template → sys/windows/.nethackrc.template

26
sys/winnt/Install.nt → sys/windows/Install.windows

@ -1,4 +1,4 @@
Copyright (c) NetHack Development Team 1990-2020
Copyright (c) NetHack Development Team 1990-2021
NetHack may be freely redistributed. See license for details.
==============================================================
Instructions for compiling and installing
@ -41,15 +41,15 @@ version. You can use one of the following build environments:
(NetHack-top)
|
+-----+-----+------+------+-----+----------+---------~---------+
| | | | | | | |
util dat doc include src sys win lib (external)
| | |
+----+ +------+ +-----------+
| | | | | |
share winnt tty win32 Lua-5.4.3 pdcurses
|
vs
+-----+-----+------+------+-----+-------------+--------~------+
| | | | | | | |
util dat doc include src sys win lib (external)
| | |
+------+ +------+ +-----------+
| | | | | |
share windows tty win32 Lua-5.4.3 pdcurses
|
vs
/--------------------------------------------------------\
| Building And Running Using Visual Studio 2017 or 2019 |
@ -115,10 +115,10 @@ to proceeding with steps 1 through 5 above.
-- Beginning of prerequisite step --
The first step in building either version of NetHack via Makefile is to
execute sys\winnt\nhsetup.bat to move some files to their required locations.
execute sys\windows\nhsetup.bat to move some files to their required locations.
From the command prompt:
cd sys\winnt
cd sys\windows
nhsetup
From a Windows explorer window:
@ -222,7 +222,7 @@ Setting Up
3. Make sure all the necessary files are in the appropriate directory
structure. You should have a main NetHack top directory with
subdirectories dat, doc, include, src, sys\share, sys\winnt,
subdirectories dat, doc, include, src, sys\share, sys\windows,
win\tty, util.
If you are including the optional Curses window port into your

28
sys/winnt/Makefile.gcc → sys/windows/Makefile.gcc

@ -27,7 +27,7 @@
# .y yacc (such as bison)
# .l lex (such as flex)
#
# If you have any questions read the sys/winnt/Install.nt file included
# If you have any questions read the sys/windows/Install.windows file included
# with the distribution.
#==============================================================================
# DECISIONS SECTION
@ -198,7 +198,7 @@ DOC =../doc
UTIL =../util
SRC =../src
SSYS =../sys/share
MSWSYS =../sys/winnt
MSWSYS =../sys/windows
TTY =../win/tty
MSWIN =../win/win32
WCURSES =../win/curses
@ -352,7 +352,7 @@ else
CURSESOBJ=
endif
SOBJ = $(O)windmain.o $(O)winnt.o $(O)win10.o \
SOBJ = $(O)windmain.o $(O)windsyso $(O)win10.o \
$(O)safeproc.o $(O)nhlan.o $(SOUND)
OBJS = $(VOBJ01) $(VOBJ02) $(VOBJ03) $(VOBJ04) $(VOBJ05) \
@ -495,7 +495,7 @@ CONFIG_H = $(INCL)/config.h $(INCL)/patchlevel.h \
$(INCL)/config1.h $(INCL)/tradstdc.h \
$(INCL)/global.h $(INCL)/fnamesiz.h $(INCL)/coord.h \
$(INCL)/vmsconf.h $(INCL)/system.h $(INCL)/unixconf.h \
$(INCL)/micro.h $(INCL)/pcconf.h $(INCL)/ntconf.h
$(INCL)/micro.h $(INCL)/pcconf.h $(INCL)/windconf.h
HACK_H = $(INCL)/hack.h $(CONFIG_H) $(INCL)/align.h $(INCL)/context.h \
$(INCL)/dungeon.h $(INCL)/monsym.h $(INCL)/mkroom.h \
@ -532,7 +532,7 @@ CURSDEF=
CURSESLIB=
endif
INCLDIR=-I../include -I../sys/winnt $(LUAINCL)
INCLDIR=-I../include -I../sys/windows $(LUAINCL)
#==========================================
#==========================================
@ -653,7 +653,7 @@ $(OBJ)/%.o : $(SSYS)/%.cpp
$(cxx) $(CXXFLAGS) -std=c++11 -o$@ $<
#==========================================
# Rules for files in sys/winnt
# Rules for files in sys/windows
#==========================================
$(OBJ)/%.o : $(MSWSYS)/%.c
@ -796,7 +796,7 @@ endif
#
$(subst /,\,echo install done > $@)
# copy $(MSWSYS)/winnt.hlp $(GAMEDIR)
# copy $(MSWSYS)/windsyshlp $(GAMEDIR)
recover: $(U)recover.exe
$(subst /,\,if exist $(U)recover.exe copy $(U)recover.exe $(GAMEDIR))
@ -839,18 +839,18 @@ gamedir.tag:
test -d $(GAMEDIR) || mkdir $(W_GAMEDIR)
test -d $(GAMEDIR) && echo directory created > $@
$(GAMEDIR)/NetHack.exe : gamedir.tag $(PDCLIB) $(O)tile.o $(O)nttty.o $(O)guistub.o \
$(GAMEDIR)/NetHack.exe : gamedir.tag $(PDCLIB) $(O)tile.o $(O)consoletty.o $(O)guistub.o \
$(ALLOBJ) $(TTYOBJ) $(GUIOBJ) $(O)conres.o $(KEYDLLS) \
$(LUATARGETS)
@echo Linking $@...
$(link) $(lflags) -o$@ $(ALLOBJ) $(TTYOBJ) $(O)nttty.o $(O)tile.o \
$(link) $(lflags) -o$@ $(ALLOBJ) $(TTYOBJ) $(O)consoletty.o $(O)tile.o \
$(O)guistub.o $(O)conres.o $(PDCLIB) $(LUALIB) $(conlibs) -static -lstdc++
$(subst /,\,@if exist $(O)install.tag del $(O)install.tag)
# NetHackW
# full tty linkage libs:
# libs: $(LIBS) $(guilibs) $(COMCTRL)
# objs: $(GAMEOBJ) $(GUIOBJ) $(TTYOBJ) $(O)tile.o $(O)nttty.o
# objs: $(GAMEOBJ) $(GUIOBJ) $(TTYOBJ) $(O)tile.o $(O)consoletty.o
# otherwise:
# libs: $(LIBS) $(guilibs) $(COMCTRL)
# objs: $(GAMEOBJ) $(GUIOBJ) $(O)tile.o $(O)ttystub.o
@ -1322,10 +1322,10 @@ endif
# NT dependencies
#
$(O)nttty.o: $(HACK_H) $(TILE_H) $(MSWSYS)/win32api.h $(MSWSYS)/nttty.c
$(cc) $(CFLAGS) -I$(WSHR) -o$@ $(MSWSYS)/nttty.c
$(O)winnt.o: $(HACK_H) $(MSWSYS)/win32api.h $(MSWSYS)/winnt.c
$(cc) $(CFLAGS) -o$@ $(MSWSYS)/winnt.c
$(O)consoletty.o: $(HACK_H) $(TILE_H) $(MSWSYS)/win32api.h $(MSWSYS)/consoletty.c
$(cc) $(CFLAGS) -I$(WSHR) -o$@ $(MSWSYS)/consoletty.c
$(O)windsyso: $(HACK_H) $(MSWSYS)/win32api.h $(MSWSYS)/windsysc
$(cc) $(CFLAGS) -o$@ $(MSWSYS)/windsysc
$(O)ntsound.o: $(HACK_H) $(MSWSYS)/ntsound.c
$(cc) $(CFLAGS) -o$@ $(MSWSYS)/ntsound.c

32
sys/winnt/Makefile.msc → sys/windows/Makefile.msc

@ -53,7 +53,7 @@
# zlib: https://www.zlib.net/
#
# If you have any questions about building NetHack for the Windows platform
# please read sys/winnt/Install.nt file included in the distribution.
# please read sys/windows/Install.windows file included in the distribution.
#
#==============================================================================
# DECISIONS SECTION
@ -184,7 +184,7 @@ DOC = ..\doc # NetHack documentation files
UTIL = ..\util # Utility source
SRC = ..\src # Main source
SSYS = ..\sys\share # Shared system files
MSWSYS = ..\sys\winnt # mswin specific files
MSWSYS = ..\sys\windows # MS windows specific files
TTY = ..\win\tty # window port files (tty)
MSWIN = ..\win\win32 # window port files (win32)
WCURSES = ..\win\curses # window port files (curses)
@ -339,7 +339,7 @@ CURSESOBJ= $(O)cursdial.o $(O)cursinit.o $(O)cursinvt.o $(O)cursmain.o \
$(O)cursmesg.o $(O)cursmisc.o $(O)cursstat.o $(O)curswins.o
!ENDIF
SOBJ = $(O)windmain.o $(O)winnt.o $(O)win10.o \
SOBJ = $(O)windmain.o $(O)windsys.o $(O)win10.o \
$(O)safeproc.o $(O)nhlan.o $(SOUND)
OBJS = $(MDLIB) \
@ -489,7 +489,7 @@ CONFIG_H = $(INCL)\config.h $(INCL)\patchlevel.h \
$(INCL)\global.h $(INCL)\fnamesiz.h $(INCL)\coord.h \
$(INCL)\vmsconf.h $(INCL)\system.h $(INCL)\nhlua.h \
$(INCL)\unixconf.h $(INCL)\micro.h $(INCL)\pcconf.h \
$(INCL)\ntconf.h
$(INCL)\windconf.h
HACK_H = $(INCL)\hack.h $(CONFIG_H) $(INCL)\lint.h $(INCL)\align.h \
$(INCL)\dungeon.h $(INCL)\monsym.h $(INCL)\mkroom.h \
@ -723,7 +723,7 @@ conlibs = $(baselibs)
guilibs = $(winlibs)
#
INCLDIR= /I..\include /I..\sys\winnt $(LUAINCL)
INCLDIR= /I..\include /I..\sys\windows $(LUAINCL)
#==========================================
# Util builds
@ -771,7 +771,7 @@ DLB =
@$(cc) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) /EHsc -Fo$@ $<
#==========================================
# Rules for files in sys\winnt
# Rules for files in sys\windows
#==========================================
{$(MSWSYS)}.c{$(OBJ)}.o:
@ -904,13 +904,13 @@ GAMEOBJ=$(GAMEOBJ:^ =^
# NetHack
# full gui linkage libs:
# libs: $(LIBS) $(conlibs) $(guilibs) $(COMCTRL)
# objs: $(GAMEOBJ) $(TTYOBJ) $(O)nttty.o $(O)tile.o $(GUIOBJ)
# objs: $(GAMEOBJ) $(TTYOBJ) $(O)consoletty.o $(O)tile.o $(GUIOBJ)
# otherwise:
# libs: $(LIBS) $(conlibs)
# objs: $(GAMEOBJ) $(TTYOBJ) $(O)tile.o $(O)guistub.o
$(GAMEDIR)\NetHack.exe : $(O)gamedir.tag $(O)tile.o $(O)nttty.o $(O)guistub.o \
$(GAMEDIR)\NetHack.exe : $(O)gamedir.tag $(O)tile.o $(O)consoletty.o $(O)guistub.o \
$(ALLOBJ) $(TTYOBJ) $(O)console.res $(KEYDLLS) \
$(LUATARGETS) $(PDCLIB)
@if not exist $(GAMEDIR)\*.* mkdir $(GAMEDIR)
@ -920,7 +920,7 @@ $(GAMEDIR)\NetHack.exe : $(O)gamedir.tag $(O)tile.o $(O)nttty.o $(O)guistub.o \
$(conlibs) $(BCRYPT) -out:$@ @<<$(@B).lnk
$(GAMEOBJ)
$(TTYOBJ)
$(O)nttty.o
$(O)consoletty.o
$(O)tile.o
$(O)guistub.o
$(O)console.res
@ -930,7 +930,7 @@ $(GAMEDIR)\NetHack.exe : $(O)gamedir.tag $(O)tile.o $(O)nttty.o $(O)guistub.o \
# NetHackW
# full tty linkage libs:
# libs: $(LIBS) $(PDCLIB) $(LUALIB) $(guilibs) $(COMCTRL)
# objs: $(GAMEOBJ) $(GUIOBJ) $(TTYOBJ) $(O)tile.o $(O)nttty.o
# objs: $(GAMEOBJ) $(GUIOBJ) $(TTYOBJ) $(O)tile.o $(O)consoletty.o
# otherwise:
# libs: $(LIBS) $(PDCLIB) $(LUALIB) $(guilibs) $(COMCTRL)
# objs: $(GAMEOBJ) $(GUIOBJ) $(O)tile.o $(O)ttystub.o
@ -1034,7 +1034,7 @@ $(O)install.tag: $(DAT)\data $(DAT)\rumors $(DAT)\oracles \
-if not exist $(GAMEDIR)\record. goto>$(GAMEDIR)\record.
echo install done > $@
# copy $(MSWSYS)\winnt.hlp $(GAMEDIR)
# copy $(MSWSYS)\windsyshlp $(GAMEDIR)
recover: $(U)recover.exe
if exist $(U)recover.exe copy $(U)recover.exe $(GAMEDIR)
@ -1128,7 +1128,7 @@ $(MSWSYS)\NetHack.ico : $(U)uudecode.exe $(MSWSYS)\nhico.uu
$(MSWIN)\NetHack.ico : $(U)uudecode.exe $(MSWSYS)\nhico.uu
chdir $(MSWIN)
..\..\util\uudecode.exe ../../sys/winnt/nhico.uu
..\..\util\uudecode.exe ../../sys/windows/nhico.uu
chdir ..\..\src
$(MSWIN)\mnsel.bmp: $(U)uudecode.exe $(MSWIN)\mnsel.uu
@ -1454,12 +1454,12 @@ $(O)lapi.o: $(LUASRC)\lapi.c
@$(cc) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -wd4244 -wd4701 -wd4702 -Fo$@ $(LUASRC)\lapi.c
#===================================================================
# sys/winnt dependencies
# sys/windows dependencies
#===================================================================
$(O)nttty.o: $(MSWSYS)\nttty.c $(WINDHDR) $(HACK_H) $(TILE_H)
$(O)win10.o: $(MSWSYS)\winnt.c $(WINDHDR) $(HACK_H)
$(O)winnt.o: $(MSWSYS)\winnt.c $(WINDHDR) $(HACK_H)
$(O)consoletty.o: $(MSWSYS)\consoletty.c $(WINDHDR) $(HACK_H) $(TILE_H)
$(O)win10.o: $(MSWSYS)\win10.c $(WINDHDR) $(HACK_H)
$(O)windsys.o: $(MSWSYS)\windsys.c $(WINDHDR) $(HACK_H)
$(O)ntsound.o: $(MSWSYS)\ntsound.c $(WINDHDR) $(HACK_H)
$(O)windmain.o: $(MSWSYS)\windmain.c $(WINDHDR) $(HACK_H)

0
sys/winnt/console.rc → sys/windows/console.rc

26
sys/winnt/nttty.c → sys/windows/consoletty.c

@ -1,8 +1,8 @@
/* NetHack 3.7 nttty.c $NHDT-Date: 1596498316 2020/08/03 23:45:16 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.117 $ */
/* NetHack 3.7 consoletty.c $NHDT-Date: 1596498316 2020/08/03 23:45:16 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.117 $ */
/* Copyright (c) NetHack PC Development Team 1993 */
/* NetHack may be freely redistributed. See license for details. */
/* tty.c - (Windows NT) version */
/* tty.c - (Windows console) version */
/*
* Initial Creation M. Allison 1993/01/31
@ -388,14 +388,14 @@ CtrlHandler(DWORD ctrltype)
/* called by pcmain() and process_options() */
void
nttty_open(int mode)
consoletty_open(int mode)
{
DWORD cmode;
/* Initialize the function pointer that points to
* the kbhit() equivalent, in this TTY case nttty_kbhit()
* the kbhit() equivalent, in this TTY case consoletty_kbhit()
*/
nt_kbhit = nttty_kbhit;
nt_kbhit = consoletty_kbhit;
if (!SetConsoleCtrlHandler((PHANDLER_ROUTINE) CtrlHandler, TRUE)) {
/* Unable to set control handler */
@ -409,7 +409,7 @@ nttty_open(int mode)
}
void
nttty_exit()
consoletty_exit()
{
/* go back to using the safe routines */
safe_routines();
@ -440,7 +440,7 @@ process_keystroke(
}
int
nttty_kbhit()
consoletty_kbhit()
{
return keyboard_handler.pNHkbhit(console.hConIn, &ir);
}
@ -468,7 +468,7 @@ tgetch()
}
int
ntposkey(int *x, int *y, int *mod)
console_poskey(int *x, int *y, int *mod)
{
int ch;
coord cc = { 0, 0 };
@ -522,7 +522,7 @@ really_move_cursor()
if (GetConsoleTitle(oldtitle, BUFSZ)) {
oldtitle[39] = '\0';
}
Sprintf(newtitle, "%-55s tty=(%02d,%02d) nttty=(%02d,%02d)", oldtitle,
Sprintf(newtitle, "%-55s tty=(%02d,%02d) consoletty=(%02d,%02d)", oldtitle,
ttyDisplay->curx, ttyDisplay->cury,
console.cursor.X, console.cursor.Y);
(void) SetConsoleTitle(newtitle);
@ -960,7 +960,7 @@ toggle_mouse_support(void)
/* handle tty options updates here */
void
nttty_preference_update(const char* pref)
consoletty_preference_update(const char* pref)
{
if (stricmp(pref, "mouse_support") == 0) {
#ifndef NO_MOUSE_ALLOWED
@ -1138,7 +1138,7 @@ void set_altkeyhandler(const char * inName)
/* fatal error */
/*VARARGS1*/
void nttty_error
void consoletty_error
VA_DECL(const char *, s)
{
char buf[BUFSZ];
@ -1822,7 +1822,7 @@ void early_raw_print(const char *s)
}
#endif
/* nethack_enter_nttty() is the first thing that is called from main
/* nethack_enter_consoletty() is the first thing that is called from main
* once the tty port is confirmed.
*
* We initialize all console state to support rendering to the console
@ -1847,7 +1847,7 @@ void early_raw_print(const char *s)
*
*/
void nethack_enter_nttty()
void nethack_enter_consoletty()
{
#if 0
/* set up state needed by early_raw_print() */

0
sys/winnt/nethack.def → sys/windows/nethack.def

0
sys/winnt/nh340key.c → sys/windows/nh340key.c

0
sys/winnt/nhdefkey.c → sys/windows/nhdefkey.c

0
sys/winnt/nhico.uu → sys/windows/nhico.uu

0
sys/winnt/nhraykey.c → sys/windows/nhraykey.c

10
sys/winnt/nhsetup.bat → sys/windows/nhsetup.bat

@ -1,7 +1,7 @@
@REM NetHack 3.7 nhsetup.bat $NHDT-Date: 1596498315 2020/08/03 23:45:15 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.40 $ */
@REM Copyright (c) NetHack PC Development Team 1993-2019
@REM NetHack may be freely redistributed. See license for details.
@REM Win32 setup batch file, see Install.nt for details
@REM Win32 setup batch file, see Install.windows for details
@REM
@echo off
pushd %~dp0
@ -25,7 +25,7 @@ if not exist ..\..\include\hack.h goto :err_dir
if not exist ..\..\src\hack.c goto :err_dir
if not exist ..\..\dat\wizard1.lua goto :err_dir
if not exist ..\..\util\makedefs.c goto :err_dir
if not exist ..\..\sys\winnt\winnt.c goto :err_dir
if not exist ..\..\sys\windows\windsys.c goto :err_dir
echo Directories look ok.
:movemakes
@ -104,19 +104,19 @@ goto :done
:err_win
echo Some of the files needed to build graphical NetHack
echo for Windows are not in the expected places.
echo Check "Install.nt" for a list of the steps required
echo Check "Install.windows" for a list of the steps required
echo to build NetHack.
goto :fini
:err_dir
echo Your directories are not set up properly, please re-read the
echo documentation and sys/winnt/Install.nt.
echo documentation and sys/windows/Install.windows.
goto :fini
:done
echo done!
echo.
echo Proceed with the next step documented in Install.nt
echo Proceed with the next step documented in Install.windows
echo.
:fini

0
sys/winnt/ntsound.c → sys/windows/ntsound.c

0
sys/winnt/porthelp → sys/windows/porthelp

0
sys/winnt/stub-pdcscrn.c → sys/windows/stub-pdcscrn.c

6
sys/winnt/stubs.c → sys/windows/stubs.c

@ -73,7 +73,7 @@ win_tty_init(int dir)
}
void
nttty_open(int mode)
consoletty_open(int mode)
{
return;
}
@ -148,7 +148,7 @@ VA_DECL(const char *, fmt)
}
/*VARARGS1*/
void nttty_error
void consoletty_error
VA_DECL(const char *, s)
{
VA_START(s);
@ -172,7 +172,7 @@ more(void)
}
void
nethack_enter_nttty(void)
nethack_enter_consoletty(void)
{
return;
}

0
sys/winnt/sysconf.template → sys/windows/sysconf.template

0
sys/winnt/travis-gcc.sh → sys/windows/travis-gcc.sh

0
win/win32/vs/.gitattributes → sys/windows/vs/.gitattributes

5
win/win32/vs/.gitignore → sys/windows/vs/.gitignore

@ -10,3 +10,8 @@ report.xml
*.appxbundle
NetHackPackage_StoreKey.pfx
NetHackPackage_TemporaryKey.pfx
NetHackPackage.assets.cache
NetHackPackage.wapproj.user
NetHackPackage/obj/
NetHackW.vcxproj.user
obj/

0
win/win32/vs/Images/BadgeLogo.scale-100.png → sys/windows/vs/Images/BadgeLogo.scale-100.png

Before

Width: 24  |  Height: 24  |  Size: 238 B

After

Width: 24  |  Height: 24  |  Size: 238 B

0
win/win32/vs/Images/BadgeLogo.scale-125.png → sys/windows/vs/Images/BadgeLogo.scale-125.png

Before

Width: 30  |  Height: 30  |  Size: 300 B

After

Width: 30  |  Height: 30  |  Size: 300 B

0
win/win32/vs/Images/BadgeLogo.scale-150.png → sys/windows/vs/Images/BadgeLogo.scale-150.png

Before

Width: 36  |  Height: 36  |  Size: 370 B

After

Width: 36  |  Height: 36  |  Size: 370 B

0
win/win32/vs/Images/BadgeLogo.scale-200.png → sys/windows/vs/Images/BadgeLogo.scale-200.png

Before

Width: 48  |  Height: 48  |  Size: 520 B

After

Width: 48  |  Height: 48  |  Size: 520 B

0
win/win32/vs/Images/BadgeLogo.scale-400.png → sys/windows/vs/Images/BadgeLogo.scale-400.png

Before

Width: 96  |  Height: 96  |  Size: 770 B

After

Width: 96  |  Height: 96  |  Size: 770 B

0
win/win32/vs/Images/LargeTile.scale-100.png → sys/windows/vs/Images/LargeTile.scale-100.png

Before

Width: 310  |  Height: 310  |  Size: 14 KiB

After

Width: 310  |  Height: 310  |  Size: 14 KiB

0
win/win32/vs/Images/LargeTile.scale-125.png → sys/windows/vs/Images/LargeTile.scale-125.png

Before

Width: 388  |  Height: 388  |  Size: 12 KiB

After

Width: 388  |  Height: 388  |  Size: 12 KiB

0
win/win32/vs/Images/LargeTile.scale-150.png → sys/windows/vs/Images/LargeTile.scale-150.png

Before

Width: 465  |  Height: 465  |  Size: 20 KiB

After

Width: 465  |  Height: 465  |  Size: 20 KiB

0
win/win32/vs/Images/LargeTile.scale-200.png → sys/windows/vs/Images/LargeTile.scale-200.png

Before

Width: 620  |  Height: 620  |  Size: 22 KiB

After

Width: 620  |  Height: 620  |  Size: 22 KiB

0
win/win32/vs/Images/LargeTile.scale-400.png → sys/windows/vs/Images/LargeTile.scale-400.png

Before

Width: 1240  |  Height: 1240  |  Size: 46 KiB

After

Width: 1240  |  Height: 1240  |  Size: 46 KiB

0
win/win32/vs/Images/LockScreenLogo.scale-200.png → sys/windows/vs/Images/LockScreenLogo.scale-200.png

Before

Width: 48  |  Height: 48  |  Size: 1.4 KiB

After

Width: 48  |  Height: 48  |  Size: 1.4 KiB

0
win/win32/vs/Images/SmallTile.scale-100.png → sys/windows/vs/Images/SmallTile.scale-100.png

Before

Width: 71  |  Height: 71  |  Size: 3.3 KiB

After

Width: 71  |  Height: 71  |  Size: 3.3 KiB

0
win/win32/vs/Images/SmallTile.scale-125.png → sys/windows/vs/Images/SmallTile.scale-125.png

Before

Width: 89  |  Height: 89  |  Size: 4.7 KiB

After

Width: 89  |  Height: 89  |  Size: 4.7 KiB

0
win/win32/vs/Images/SmallTile.scale-150.png → sys/windows/vs/Images/SmallTile.scale-150.png

Before

Width: 107  |  Height: 107  |  Size: 6.0 KiB

After

Width: 107  |  Height: 107  |  Size: 6.0 KiB

0
win/win32/vs/Images/SmallTile.scale-200.png → sys/windows/vs/Images/SmallTile.scale-200.png

Before

Width: 142  |  Height: 142  |  Size: 8.6 KiB

After

Width: 142  |  Height: 142  |  Size: 8.6 KiB

0
win/win32/vs/Images/SmallTile.scale-400.png → sys/windows/vs/Images/SmallTile.scale-400.png

Before

Width: 284  |  Height: 284  |  Size: 17 KiB

After

Width: 284  |  Height: 284  |  Size: 17 KiB

0
win/win32/vs/Images/SplashScreen.scale-100.png → sys/windows/vs/Images/SplashScreen.scale-100.png

Before

Width: 620  |  Height: 300  |  Size: 14 KiB

After

Width: 620  |  Height: 300  |  Size: 14 KiB

0
win/win32/vs/Images/SplashScreen.scale-125.png → sys/windows/vs/Images/SplashScreen.scale-125.png

Before

Width: 775  |  Height: 375  |  Size: 18 KiB

After

Width: 775  |  Height: 375  |  Size: 18 KiB

0
win/win32/vs/Images/SplashScreen.scale-150.png → sys/windows/vs/Images/SplashScreen.scale-150.png

Before

Width: 930  |  Height: 450  |  Size: 21 KiB

After

Width: 930  |  Height: 450  |  Size: 21 KiB

0
win/win32/vs/Images/SplashScreen.scale-200.png → sys/windows/vs/Images/SplashScreen.scale-200.png

Before

Width: 1240  |  Height: 600  |  Size: 24 KiB

After

Width: 1240  |  Height: 600  |  Size: 24 KiB

0
win/win32/vs/Images/SplashScreen.scale-400.png → sys/windows/vs/Images/SplashScreen.scale-400.png

Before

Width: 2480  |  Height: 1200  |  Size: 50 KiB

After

Width: 2480  |  Height: 1200  |  Size: 50 KiB

0
win/win32/vs/Images/Square150x150Logo.scale-100.png → sys/windows/vs/Images/Square150x150Logo.scale-100.png

Before

Width: 150  |  Height: 150  |  Size: 5.9 KiB

After

Width: 150  |  Height: 150  |  Size: 5.9 KiB

0
win/win32/vs/Images/Square150x150Logo.scale-125.png → sys/windows/vs/Images/Square150x150Logo.scale-125.png

Before

Width: 188  |  Height: 188  |  Size: 7.9 KiB

After

Width: 188  |  Height: 188  |  Size: 7.9 KiB

0
win/win32/vs/Images/Square150x150Logo.scale-150.png → sys/windows/vs/Images/Square150x150Logo.scale-150.png

Before

Width: 225  |  Height: 225  |  Size: 10 KiB

After

Width: 225  |  Height: 225  |  Size: 10 KiB

0
win/win32/vs/Images/Square150x150Logo.scale-200.png → sys/windows/vs/Images/Square150x150Logo.scale-200.png

Before

Width: 300  |  Height: 300  |  Size: 13 KiB

After

Width: 300  |  Height: 300  |  Size: 13 KiB

0
win/win32/vs/Images/Square150x150Logo.scale-400.png → sys/windows/vs/Images/Square150x150Logo.scale-400.png

Before

Width: 600  |  Height: 600  |  Size: 22 KiB

After

Width: 600  |  Height: 600  |  Size: 22 KiB

0
win/win32/vs/Images/Square44x44Logo.altform-unplated_targetsize-16.png → sys/windows/vs/Images/Square44x44Logo.altform-unplated_targetsize-16.png

Before

Width: 16  |  Height: 16  |  Size: 954 B

After

Width: 16  |  Height: 16  |  Size: 954 B

0
win/win32/vs/Images/Square44x44Logo.altform-unplated_targetsize-256.png → sys/windows/vs/Images/Square44x44Logo.altform-unplated_targetsize-256.png

Before

Width: 256  |  Height: 256  |  Size: 2.0 KiB

After

Width: 256  |  Height: 256  |  Size: 2.0 KiB

0
win/win32/vs/Images/Square44x44Logo.altform-unplated_targetsize-32.png → sys/windows/vs/Images/Square44x44Logo.altform-unplated_targetsize-32.png

Before

Width: 32  |  Height: 32  |  Size: 2.7 KiB

After

Width: 32  |  Height: 32  |  Size: 2.7 KiB

0
win/win32/vs/Images/Square44x44Logo.altform-unplated_targetsize-48.png → sys/windows/vs/Images/Square44x44Logo.altform-unplated_targetsize-48.png

Before

Width: 48  |  Height: 48  |  Size: 4.7 KiB

After

Width: 48  |  Height: 48  |  Size: 4.7 KiB

0
win/win32/vs/Images/Square44x44Logo.scale-100.png → sys/windows/vs/Images/Square44x44Logo.scale-100.png

Before

Width: 44  |  Height: 44  |  Size: 2.8 KiB

After

Width: 44  |  Height: 44  |  Size: 2.8 KiB

0
win/win32/vs/Images/Square44x44Logo.scale-125.png → sys/windows/vs/Images/Square44x44Logo.scale-125.png

Before

Width: 55  |  Height: 55  |  Size: 3.9 KiB

After

Width: 55  |  Height: 55  |  Size: 3.9 KiB

0
win/win32/vs/Images/Square44x44Logo.scale-150.png → sys/windows/vs/Images/Square44x44Logo.scale-150.png

Before

Width: 66  |  Height: 66  |  Size: 5.3 KiB

After

Width: 66  |  Height: 66  |  Size: 5.3 KiB

0
win/win32/vs/Images/Square44x44Logo.scale-200.png → sys/windows/vs/Images/Square44x44Logo.scale-200.png

Before

Width: 88  |  Height: 88  |  Size: 7.5 KiB

After

Width: 88  |  Height: 88  |  Size: 7.5 KiB

0
win/win32/vs/Images/Square44x44Logo.scale-400.png → sys/windows/vs/Images/Square44x44Logo.scale-400.png

Before

Width: 176  |  Height: 176  |  Size: 15 KiB

After

Width: 176  |  Height: 176  |  Size: 15 KiB

0
win/win32/vs/Images/Square44x44Logo.targetsize-16.png → sys/windows/vs/Images/Square44x44Logo.targetsize-16.png

Before

Width: 16  |  Height: 16  |  Size: 667 B

After

Width: 16  |  Height: 16  |  Size: 667 B

0
win/win32/vs/Images/Square44x44Logo.targetsize-24.png → sys/windows/vs/Images/Square44x44Logo.targetsize-24.png

Before

Width: 24  |  Height: 24  |  Size: 1.2 KiB

After

Width: 24  |  Height: 24  |  Size: 1.2 KiB

0
win/win32/vs/Images/Square44x44Logo.targetsize-24_altform-unplated.png → sys/windows/vs/Images/Square44x44Logo.targetsize-24_altform-unplated.png

Before

Width: 24  |  Height: 24  |  Size: 1.7 KiB

After

Width: 24  |  Height: 24  |  Size: 1.7 KiB

0
win/win32/vs/Images/Square44x44Logo.targetsize-256.png → sys/windows/vs/Images/Square44x44Logo.targetsize-256.png

Before

Width: 256  |  Height: 256  |  Size: 13 KiB

After

Width: 256  |  Height: 256  |  Size: 13 KiB

0
win/win32/vs/Images/Square44x44Logo.targetsize-32.png → sys/windows/vs/Images/Square44x44Logo.targetsize-32.png

Before

Width: 32  |  Height: 32  |  Size: 1.8 KiB

After

Width: 32  |  Height: 32  |  Size: 1.8 KiB

0
win/win32/vs/Images/Square44x44Logo.targetsize-48.png → sys/windows/vs/Images/Square44x44Logo.targetsize-48.png

Before

Width: 48  |  Height: 48  |  Size: 3.2 KiB

After

Width: 48  |  Height: 48  |  Size: 3.2 KiB

0
win/win32/vs/Images/StoreLogo.backup.png → sys/windows/vs/Images/StoreLogo.backup.png

Before

Width: 50  |  Height: 50  |  Size: 1.4 KiB

After

Width: 50  |  Height: 50  |  Size: 1.4 KiB

0
win/win32/vs/Images/StoreLogo.scale-100.png → sys/windows/vs/Images/StoreLogo.scale-100.png

Before

Width: 50  |  Height: 50  |  Size: 5.1 KiB

After

Width: 50  |  Height: 50  |  Size: 5.1 KiB

0
win/win32/vs/Images/StoreLogo.scale-125.png → sys/windows/vs/Images/StoreLogo.scale-125.png

Before

Width: 63  |  Height: 63  |  Size: 7.0 KiB

After

Width: 63  |  Height: 63  |  Size: 7.0 KiB

0
win/win32/vs/Images/StoreLogo.scale-150.png → sys/windows/vs/Images/StoreLogo.scale-150.png

Before

Width: 75  |  Height: 75  |  Size: 8.5 KiB

After

Width: 75  |  Height: 75  |  Size: 8.5 KiB

0
win/win32/vs/Images/StoreLogo.scale-200.png → sys/windows/vs/Images/StoreLogo.scale-200.png

Before

Width: 100  |  Height: 100  |  Size: 11 KiB

After

Width: 100  |  Height: 100  |  Size: 11 KiB

0
win/win32/vs/Images/StoreLogo.scale-400.png → sys/windows/vs/Images/StoreLogo.scale-400.png

Before

Width: 200  |  Height: 200  |  Size: 17 KiB

After

Width: 200  |  Height: 200  |  Size: 17 KiB

0
win/win32/vs/Images/Wide310x150Logo.scale-100.png → sys/windows/vs/Images/Wide310x150Logo.scale-100.png

Before

Width: 310  |  Height: 150  |  Size: 6.3 KiB

After

Width: 310  |  Height: 150  |  Size: 6.3 KiB

0
win/win32/vs/Images/Wide310x150Logo.scale-125.png → sys/windows/vs/Images/Wide310x150Logo.scale-125.png

Before

Width: 388  |  Height: 188  |  Size: 8.5 KiB

After

Width: 388  |  Height: 188  |  Size: 8.5 KiB

0
win/win32/vs/Images/Wide310x150Logo.scale-150.png → sys/windows/vs/Images/Wide310x150Logo.scale-150.png

Before

Width: 465  |  Height: 225  |  Size: 11 KiB

After

Width: 465  |  Height: 225  |  Size: 11 KiB

0
win/win32/vs/Images/Wide310x150Logo.scale-200.png → sys/windows/vs/Images/Wide310x150Logo.scale-200.png

Before

Width: 620  |  Height: 300  |  Size: 39 KiB

After

Width: 620  |  Height: 300  |  Size: 39 KiB

0
win/win32/vs/Images/Wide310x150Logo.scale-400.png → sys/windows/vs/Images/Wide310x150Logo.scale-400.png

Before

Width: 1240  |  Height: 600  |  Size: 24 KiB

After

Width: 1240  |  Height: 600  |  Size: 24 KiB

24
win/win32/vs/NetHack.sln → sys/windows/vs/NetHack.sln

@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26730.12
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NetHackW", "NetHackW.vcxproj", "{CEC5D360-8804-454F-8591-002184C23499}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NetHackW", "NetHackW\NetHackW.vcxproj", "{CEC5D360-8804-454F-8591-002184C23499}"
ProjectSection(ProjectDependencies) = postProject
{93F10526-209E-41D7-BBEA-775787876895} = {93F10526-209E-41D7-BBEA-775787876895}
{63F9B82B-F589-4082-ABE5-D4F0682050AB} = {63F9B82B-F589-4082-ABE5-D4F0682050AB}
@ -12,32 +12,32 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NetHackW", "NetHackW.vcxpro
{0303A585-3F83-4BB7-AF6B-1E12C8FB54AC} = {0303A585-3F83-4BB7-AF6B-1E12C8FB54AC}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dlb", "dlb.vcxproj", "{0303A585-3F83-4BB7-AF6B-1E12C8FB54AC}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dlb", "dlb\dlb.vcxproj", "{0303A585-3F83-4BB7-AF6B-1E12C8FB54AC}"
ProjectSection(ProjectDependencies) = postProject
{63F9B82B-F589-4082-ABE5-D4F0682050AB} = {63F9B82B-F589-4082-ABE5-D4F0682050AB}
{BA3DD34C-04B7-40D0-B373-9329AA9E8945} = {BA3DD34C-04B7-40D0-B373-9329AA9E8945}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "makedefs", "makedefs.vcxproj", "{BA3DD34C-04B7-40D0-B373-9329AA9E8945}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "makedefs", "makedefs\makedefs.vcxproj", "{BA3DD34C-04B7-40D0-B373-9329AA9E8945}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "recover", "recover.vcxproj", "{2F35F228-6733-4FE5-9B46-B3AA10D4BC2E}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "recover", "recover\recover.vcxproj", "{2F35F228-6733-4FE5-9B46-B3AA10D4BC2E}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tile2bmp", "tile2bmp.vcxproj", "{642BC75D-ABAF-403E-8224-7C725FD4CB42}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tile2bmp", "tile2bmp\tile2bmp.vcxproj", "{642BC75D-ABAF-403E-8224-7C725FD4CB42}"
ProjectSection(ProjectDependencies) = postProject
{BA3DD34C-04B7-40D0-B373-9329AA9E8945} = {BA3DD34C-04B7-40D0-B373-9329AA9E8945}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tilemap", "tilemap.vcxproj", "{93F10526-209E-41D7-BBEA-775787876895}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tilemap", "tilemap\tilemap.vcxproj", "{93F10526-209E-41D7-BBEA-775787876895}"
ProjectSection(ProjectDependencies) = postProject
{BA3DD34C-04B7-40D0-B373-9329AA9E8945} = {BA3DD34C-04B7-40D0-B373-9329AA9E8945}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "uudecode", "uudecode.vcxproj", "{63F9B82B-F589-4082-ABE5-D4F0682050AB}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "uudecode", "uudecode\uudecode.vcxproj", "{63F9B82B-F589-4082-ABE5-D4F0682050AB}"
ProjectSection(ProjectDependencies) = postProject
{BA3DD34C-04B7-40D0-B373-9329AA9E8945} = {BA3DD34C-04B7-40D0-B373-9329AA9E8945}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NetHack", "NetHack.vcxproj", "{609BC774-C6F8-4B2B-AA7D-5B3D0EA95751}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NetHack", "NetHack\NetHack.vcxproj", "{609BC774-C6F8-4B2B-AA7D-5B3D0EA95751}"
ProjectSection(ProjectDependencies) = postProject
{63F9B82B-F589-4082-ABE5-D4F0682050AB} = {63F9B82B-F589-4082-ABE5-D4F0682050AB}
{BA3DD34C-04B7-40D0-B373-9329AA9E8945} = {BA3DD34C-04B7-40D0-B373-9329AA9E8945}
@ -45,22 +45,22 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NetHack", "NetHack.vcxproj"
{0303A585-3F83-4BB7-AF6B-1E12C8FB54AC} = {0303A585-3F83-4BB7-AF6B-1E12C8FB54AC}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nhdefkey", "nhdefkey.vcxproj", "{6813477F-64B6-4B97-B230-438D0D233385}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nhdefkey", "nhdefkey\nhdefkey.vcxproj", "{6813477F-64B6-4B97-B230-438D0D233385}"
ProjectSection(ProjectDependencies) = postProject
{BA3DD34C-04B7-40D0-B373-9329AA9E8945} = {BA3DD34C-04B7-40D0-B373-9329AA9E8945}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nh340key", "nh340key.vcxproj", "{BE04E242-A1E9-4593-B95B-057F37330B76}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nh340key", "nh340key\nh340key.vcxproj", "{BE04E242-A1E9-4593-B95B-057F37330B76}"
ProjectSection(ProjectDependencies) = postProject
{BA3DD34C-04B7-40D0-B373-9329AA9E8945} = {BA3DD34C-04B7-40D0-B373-9329AA9E8945}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nhraykey", "nhraykey.vcxproj", "{2E1F4BB3-3BD7-43AD-8E64-D3B8A2F5D7B2}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nhraykey", "nhraykey\nhraykey.vcxproj", "{2E1F4BB3-3BD7-43AD-8E64-D3B8A2F5D7B2}"
ProjectSection(ProjectDependencies) = postProject
{BA3DD34C-04B7-40D0-B373-9329AA9E8945} = {BA3DD34C-04B7-40D0-B373-9329AA9E8945}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PDCurses", "PDCurses.vcxproj", "{BAA70D0F-3EC7-4D10-91F0-974F1F49308B}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PDCurses", "PDCurses\PDCurses.vcxproj", "{BAA70D0F-3EC7-4D10-91F0-974F1F49308B}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{477BF231-48E0-4312-AA12-9D8576215489}"
ProjectSection(SolutionItems) = preProject

28
win/win32/vs/NetHack.vcxproj → sys/windows/vs/NetHack/NetHack.vcxproj

@ -1,19 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="config.props" />
<Import Project="..\config.props" />
<Import Project="..\dirs.props" />
<PropertyGroup Label="Globals">
<ProjectGuid>{609BC774-C6F8-4B2B-AA7D-5B3D0EA95751}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>NetHack</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<Import Project="default.props" />
<Import Project="$(vsDir)default.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<Import Project="NetHackProperties.props" />
<Import Project="console.props" />
<Import Project="common.props" />
<Import Project="dirs.props" />
<Import Project="files.props" />
<Import Project="$(vsDir)NetHackProperties.props" />
<Import Project="$(vsDir)console.props" />
<Import Project="$(vsDir)common.props" />
<Import Project="$(vsDir)files.props" />
<PropertyGroup>
<OutDir>$(BinDir)</OutDir>
</PropertyGroup>
@ -34,7 +34,7 @@
<InlineFunctionExpansion>Default</InlineFunctionExpansion>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<OmitFramePointers>true</OmitFramePointers>
<AdditionalIncludeDirectories>$(WinWin32Dir);$(IncDir);$(SysWinntDir);$(SysShareDir);$(WinShareDir);$(LuaDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(WinWin32Dir);$(IncDir);$(SysWindDir);$(SysShareDir);$(WinShareDir);$(LuaDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>TILES;WIN32CON;DLB;MSWIN_GRAPHICS;SAFEPROCS;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
@ -164,13 +164,13 @@
<ClCompile Include="$(SysShareDir)cppregex.cpp" />
<ClCompile Include="$(SysShareDir)nhlan.c" />
<ClCompile Include="$(SysShareDir)random.c" />
<ClCompile Include="$(SysWinntDir)ntsound.c" />
<ClCompile Include="$(SysWinntDir)nttty.c" />