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.

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 76785f4c282e2c0352f76924ff2e0e453d85cdf0..10b0c8d7a9b88311e1ec10f7652675307e193999 100644 (file)
--- a/azure-pipelines.yml
+++ b/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

diff --git a/include/extern.h b/include/extern.h
index cd293ce98d5c763b41c8fbe5d86c3fdce66765d5..8805a01f55096a6061fa3eaa16f4b089fc0bf9ef 100644 (file)
--- a/include/extern.h
+++ b/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 ### */

diff --git a/include/global.h b/include/global.h
index 5b6e7e3ace986ab4971ecb46448f7bd61de634ab..a0501850b36c807800fbeb2bb9cb13497b91b5f7 100644 (file)
--- a/include/global.h
+++ b/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"

diff --git a/include/ntconf.h b/include/windconf.h
similarity index 96%
rename from include/ntconf.h
rename to include/windconf.h
index 79172047033a90008c036838a4e536043ced08ad..07b6e06516d7bb317c9b624131fb4f520250303a 100644 (file)
--- a/include/ntconf.h
+++ b/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 */

diff --git a/outdated/.travis.yml b/outdated/.travis.yml
index 222b7ba9b8391121f0d61ae1f5a8455efda6aa63..90e33f3be89f9b8a8d1b459aeaeabdf9948f93ae 100644 (file)
--- a/outdated/.travis.yml
+++ b/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

diff --git a/outdated/include/wceconf.h b/outdated/include/wceconf.h
index 043aa4849c4333ce175f0c27afda27b6b25c1402..4dadc0f096a228f5700d5fe159a73644442f4697 100644 (file)
--- a/outdated/include/wceconf.h
+++ b/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
 

diff --git a/outdated/sys/wince/bootstrp.mak b/outdated/sys/wince/bootstrp.mak
index 9bd043571c2d1e348068867a73fd06f828111844..26f203ac26695dd19eaf16263a8ebc41e0b74571 100644 (file)
--- a/outdated/sys/wince/bootstrp.mak
+++ b/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
 

diff --git a/sys/msdos/Makefile.GCC b/sys/msdos/Makefile.GCC
index ffabf95a4ce0f261811b26053908b501a26c8fc9..5c7e74b166938114ae29c786f92968bc9460a52b 100644 (file)
--- a/sys/msdos/Makefile.GCC
+++ b/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

diff --git a/sys/unix/Makefile.src b/sys/unix/Makefile.src
index b1aa1d5fc8280430c06bca617dcde043a6523227..e93c5e208974e5ef2d7b0ff3cedce38d80137be5 100644 (file)
--- a/sys/unix/Makefile.src
+++ b/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 \

diff --git a/sys/unix/NetHack.xcodeproj/project.pbxproj b/sys/unix/NetHack.xcodeproj/project.pbxproj
index f6ca4494ec550a4f99918897062ef5b81ad616fd..30ec66d84f146b2e5a9e3db0757ff7b25b42cbe9 100644 (file)
--- a/sys/unix/NetHack.xcodeproj/project.pbxproj
+++ b/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 */,

diff --git a/sys/vms/Install.vms b/sys/vms/Install.vms
index 3bd3b5a13e4817b41a557f0c2522187a3ae2585d..2c16a5e18810e4130d4e2316e28e0c3ce20012a2 100644 (file)
--- a/sys/vms/Install.vms
+++ b/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

diff --git a/sys/vms/Makefile.src b/sys/vms/Makefile.src
index 080cb5ef6161d729eddecfb6a80c88f67694a1e5..1060c43ffab6618643fcb76e82ac216ed984ff7e 100644 (file)
--- a/sys/vms/Makefile.src
+++ b/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 \

diff --git a/sys/winnt/.gitattributes b/sys/windows/.gitattributes
similarity index 91%
rename from sys/winnt/.gitattributes
rename to sys/windows/.gitattributes
index d52abfcb56894186ed9bae563b34db224c3fb718..44a8b1e17ab66785ccb168eb46aaef63602b2108 100644 (file)
--- a/sys/winnt/.gitattributes
+++ b/sys/windows/.gitattributes
@@ -1,4 +1,4 @@
-Install.nt NHSUBST
+Install.windows NHSUBST
 Makefile.* NHSUBST
 defaults.nh NHSUBST
 sysconf NHSUBST

diff --git a/sys/winnt/.gitignore b/sys/windows/.gitignore
similarity index 100%
rename from sys/winnt/.gitignore
rename to sys/windows/.gitignore

diff --git a/sys/winnt/.nethackrc.template b/sys/windows/.nethackrc.template
similarity index 100%
rename from sys/winnt/.nethackrc.template
rename to sys/windows/.nethackrc.template

diff --git a/sys/winnt/Install.nt b/sys/windows/Install.windows
similarity index 94%
rename from sys/winnt/Install.nt
rename to sys/windows/Install.windows
index 4bc4d29bea4cd55edead436126c3cd8d2655e49a..c7b0ff133d514289a9ff93cc2b5c4432e61a25af 100644 (file)
--- a/sys/winnt/Install.nt
+++ b/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

diff --git a/sys/winnt/Makefile.gcc b/sys/windows/Makefile.gcc
similarity index 98%
rename from sys/winnt/Makefile.gcc
rename to sys/windows/Makefile.gcc
index aefea272be97204a67ae1e7d84b644ab646499cf..4532a9c73873d7c934f10734964ddc6bf2d25a6b 100644 (file)
--- a/sys/winnt/Makefile.gcc
+++ b/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
 

diff --git a/sys/winnt/Makefile.msc b/sys/windows/Makefile.msc
similarity index 98%
rename from sys/winnt/Makefile.msc
rename to sys/windows/Makefile.msc
index 8751c7fade24cca5fe810ad5877d0a1249a4e3e5..dfd049ad94be1e11a01395a9413245137f8ec5c6 100644 (file)
--- a/sys/winnt/Makefile.msc
+++ b/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)
 

diff --git a/sys/winnt/console.rc b/sys/windows/console.rc
similarity index 100%
rename from sys/winnt/console.rc
rename to sys/windows/console.rc

diff --git a/sys/winnt/nttty.c b/sys/windows/consoletty.c
similarity index 98%
rename from sys/winnt/nttty.c
rename to sys/windows/consoletty.c
index 2245dd048b57902b7263e57df6f8fbc0b2d51d68..c27409e6eb2dd4e299bbd1e37d6a0dbdee72910c 100644 (file)
--- a/sys/winnt/nttty.c
+++ b/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() */

diff --git a/sys/winnt/nethack.def b/sys/windows/nethack.def
similarity index 100%
rename from sys/winnt/nethack.def
rename to sys/windows/nethack.def

diff --git a/sys/winnt/nh340key.c b/sys/windows/nh340key.c
similarity index 100%
rename from sys/winnt/nh340key.c
rename to sys/windows/nh340key.c

diff --git a/sys/winnt/nhdefkey.c b/sys/windows/nhdefkey.c
similarity index 100%
rename from sys/winnt/nhdefkey.c
rename to sys/windows/nhdefkey.c

diff --git a/sys/winnt/nhico.uu b/sys/windows/nhico.uu
similarity index 100%
rename from sys/winnt/nhico.uu
rename to sys/windows/nhico.uu

diff --git a/sys/winnt/nhraykey.c b/sys/windows/nhraykey.c
similarity index 100%
rename from sys/winnt/nhraykey.c
rename to sys/windows/nhraykey.c

diff --git a/sys/winnt/nhsetup.bat b/sys/windows/nhsetup.bat
similarity index 92%
rename from sys/winnt/nhsetup.bat
rename to sys/windows/nhsetup.bat
index 7f65ac88fb845a6a85704397bd132fc9696b29b9..40e3fba197dd5bcf647d667be8f771bac44b4014 100755 (executable)
--- a/sys/winnt/nhsetup.bat
+++ b/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

diff --git a/sys/winnt/ntsound.c b/sys/windows/ntsound.c
similarity index 100%
rename from sys/winnt/ntsound.c
rename to sys/windows/ntsound.c

diff --git a/sys/winnt/porthelp b/sys/windows/porthelp
similarity index 100%
rename from sys/winnt/porthelp
rename to sys/windows/porthelp

diff --git a/sys/winnt/stub-pdcscrn.c b/sys/windows/stub-pdcscrn.c
similarity index 100%
rename from sys/winnt/stub-pdcscrn.c
rename to sys/windows/stub-pdcscrn.c

diff --git a/sys/winnt/stubs.c b/sys/windows/stubs.c
similarity index 97%
rename from sys/winnt/stubs.c
rename to sys/windows/stubs.c
index ea9413a81be30c67fe2b8ab716e58683a4256a54..0830a746832aea21a86fceb24a283ef246d0d170 100644 (file)
--- a/sys/winnt/stubs.c
+++ b/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;
 }

diff --git a/sys/winnt/sysconf.template b/sys/windows/sysconf.template
similarity index 100%
rename from sys/winnt/sysconf.template
rename to sys/windows/sysconf.template

diff --git a/sys/winnt/travis-gcc.sh b/sys/windows/travis-gcc.sh
similarity index 100%
rename from sys/winnt/travis-gcc.sh
rename to sys/windows/travis-gcc.sh

diff --git a/win/win32/vs/.gitattributes b/sys/windows/vs/.gitattributes
similarity index 100%
rename from win/win32/vs/.gitattributes
rename to sys/windows/vs/.gitattributes

diff --git a/win/win32/vs/.gitignore b/sys/windows/vs/.gitignore
similarity index 62%
rename from win/win32/vs/.gitignore
rename to sys/windows/vs/.gitignore
index c4775b3c5d3e0a63bcc2a5b3ccd563b1452d0ce0..ced2d32bd7881be4667bbf8fdb755c99e9f09d69 100644 (file)
--- a/win/win32/vs/.gitignore
+++ b/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/

diff --git a/win/win32/vs/Images/BadgeLogo.scale-100.png b/sys/windows/vs/Images/BadgeLogo.scale-100.png
similarity index 100%
rename from win/win32/vs/Images/BadgeLogo.scale-100.png
rename to sys/windows/vs/Images/BadgeLogo.scale-100.png

diff --git a/win/win32/vs/Images/BadgeLogo.scale-125.png b/sys/windows/vs/Images/BadgeLogo.scale-125.png
similarity index 100%
rename from win/win32/vs/Images/BadgeLogo.scale-125.png
rename to sys/windows/vs/Images/BadgeLogo.scale-125.png

diff --git a/win/win32/vs/Images/BadgeLogo.scale-150.png b/sys/windows/vs/Images/BadgeLogo.scale-150.png
similarity index 100%
rename from win/win32/vs/Images/BadgeLogo.scale-150.png
rename to sys/windows/vs/Images/BadgeLogo.scale-150.png

diff --git a/win/win32/vs/Images/BadgeLogo.scale-200.png b/sys/windows/vs/Images/BadgeLogo.scale-200.png
similarity index 100%
rename from win/win32/vs/Images/BadgeLogo.scale-200.png
rename to sys/windows/vs/Images/BadgeLogo.scale-200.png

diff --git a/win/win32/vs/Images/BadgeLogo.scale-400.png b/sys/windows/vs/Images/BadgeLogo.scale-400.png
similarity index 100%
rename from win/win32/vs/Images/BadgeLogo.scale-400.png
rename to sys/windows/vs/Images/BadgeLogo.scale-400.png

diff --git a/win/win32/vs/Images/LargeTile.scale-100.png b/sys/windows/vs/Images/LargeTile.scale-100.png
similarity index 100%
rename from win/win32/vs/Images/LargeTile.scale-100.png
rename to sys/windows/vs/Images/LargeTile.scale-100.png

diff --git a/win/win32/vs/Images/LargeTile.scale-125.png b/sys/windows/vs/Images/LargeTile.scale-125.png
similarity index 100%
rename from win/win32/vs/Images/LargeTile.scale-125.png
rename to sys/windows/vs/Images/LargeTile.scale-125.png

diff --git a/win/win32/vs/Images/LargeTile.scale-150.png b/sys/windows/vs/Images/LargeTile.scale-150.png
similarity index 100%
rename from win/win32/vs/Images/LargeTile.scale-150.png
rename to sys/windows/vs/Images/LargeTile.scale-150.png

diff --git a/win/win32/vs/Images/LargeTile.scale-200.png b/sys/windows/vs/Images/LargeTile.scale-200.png
similarity index 100%
rename from win/win32/vs/Images/LargeTile.scale-200.png
rename to sys/windows/vs/Images/LargeTile.scale-200.png

diff --git a/win/win32/vs/Images/LargeTile.scale-400.png b/sys/windows/vs/Images/LargeTile.scale-400.png
similarity index 100%
rename from win/win32/vs/Images/LargeTile.scale-400.png
rename to sys/windows/vs/Images/LargeTile.scale-400.png

diff --git a/win/win32/vs/Images/LockScreenLogo.scale-200.png b/sys/windows/vs/Images/LockScreenLogo.scale-200.png
similarity index 100%
rename from win/win32/vs/Images/LockScreenLogo.scale-200.png
rename to sys/windows/vs/Images/LockScreenLogo.scale-200.png

diff --git a/win/win32/vs/Images/SmallTile.scale-100.png b/sys/windows/vs/Images/SmallTile.scale-100.png
similarity index 100%
rename from win/win32/vs/Images/SmallTile.scale-100.png
rename to sys/windows/vs/Images/SmallTile.scale-100.png

diff --git a/win/win32/vs/Images/SmallTile.scale-125.png b/sys/windows/vs/Images/SmallTile.scale-125.png
similarity index 100%
rename from win/win32/vs/Images/SmallTile.scale-125.png
rename to sys/windows/vs/Images/SmallTile.scale-125.png

diff --git a/win/win32/vs/Images/SmallTile.scale-150.png b/sys/windows/vs/Images/SmallTile.scale-150.png
similarity index 100%
rename from win/win32/vs/Images/SmallTile.scale-150.png
rename to sys/windows/vs/Images/SmallTile.scale-150.png

diff --git a/win/win32/vs/Images/SmallTile.scale-200.png b/sys/windows/vs/Images/SmallTile.scale-200.png
similarity index 100%
rename from win/win32/vs/Images/SmallTile.scale-200.png
rename to sys/windows/vs/Images/SmallTile.scale-200.png

diff --git a/win/win32/vs/Images/SmallTile.scale-400.png b/sys/windows/vs/Images/SmallTile.scale-400.png
similarity index 100%
rename from win/win32/vs/Images/SmallTile.scale-400.png
rename to sys/windows/vs/Images/SmallTile.scale-400.png

diff --git a/win/win32/vs/Images/SplashScreen.scale-100.png b/sys/windows/vs/Images/SplashScreen.scale-100.png
similarity index 100%
rename from win/win32/vs/Images/SplashScreen.scale-100.png
rename to sys/windows/vs/Images/SplashScreen.scale-100.png

diff --git a/win/win32/vs/Images/SplashScreen.scale-125.png b/sys/windows/vs/Images/SplashScreen.scale-125.png
similarity index 100%
rename from win/win32/vs/Images/SplashScreen.scale-125.png
rename to sys/windows/vs/Images/SplashScreen.scale-125.png

diff --git a/win/win32/vs/Images/SplashScreen.scale-150.png b/sys/windows/vs/Images/SplashScreen.scale-150.png
similarity index 100%
rename from win/win32/vs/Images/SplashScreen.scale-150.png
rename to sys/windows/vs/Images/SplashScreen.scale-150.png

diff --git a/win/win32/vs/Images/SplashScreen.scale-200.png b/sys/windows/vs/Images/SplashScreen.scale-200.png
similarity index 100%
rename from win/win32/vs/Images/SplashScreen.scale-200.png
rename to sys/windows/vs/Images/SplashScreen.scale-200.png

diff --git a/win/win32/vs/Images/SplashScreen.scale-400.png b/sys/windows/vs/Images/SplashScreen.scale-400.png
similarity index 100%
rename from win/win32/vs/Images/SplashScreen.scale-400.png
rename to sys/windows/vs/Images/SplashScreen.scale-400.png

diff --git a/win/win32/vs/Images/Square150x150Logo.scale-100.png b/sys/windows/vs/Images/Square150x150Logo.scale-100.png
similarity index 100%
rename from win/win32/vs/Images/Square150x150Logo.scale-100.png
rename to sys/windows/vs/Images/Square150x150Logo.scale-100.png

diff --git a/win/win32/vs/Images/Square150x150Logo.scale-125.png b/sys/windows/vs/Images/Square150x150Logo.scale-125.png
similarity index 100%
rename from win/win32/vs/Images/Square150x150Logo.scale-125.png
rename to sys/windows/vs/Images/Square150x150Logo.scale-125.png

diff --git a/win/win32/vs/Images/Square150x150Logo.scale-150.png b/sys/windows/vs/Images/Square150x150Logo.scale-150.png
similarity index 100%
rename from win/win32/vs/Images/Square150x150Logo.scale-150.png
rename to sys/windows/vs/Images/Square150x150Logo.scale-150.png

diff --git a/win/win32/vs/Images/Square150x150Logo.scale-200.png b/sys/windows/vs/Images/Square150x150Logo.scale-200.png
similarity index 100%
rename from win/win32/vs/Images/Square150x150Logo.scale-200.png
rename to sys/windows/vs/Images/Square150x150Logo.scale-200.png

diff --git a/win/win32/vs/Images/Square150x150Logo.scale-400.png b/sys/windows/vs/Images/Square150x150Logo.scale-400.png
similarity index 100%
rename from win/win32/vs/Images/Square150x150Logo.scale-400.png
rename to sys/windows/vs/Images/Square150x150Logo.scale-400.png

diff --git a/win/win32/vs/Images/Square44x44Logo.altform-unplated_targetsize-16.png b/sys/windows/vs/Images/Square44x44Logo.altform-unplated_targetsize-16.png
similarity index 100%
rename from win/win32/vs/Images/Square44x44Logo.altform-unplated_targetsize-16.png
rename to sys/windows/vs/Images/Square44x44Logo.altform-unplated_targetsize-16.png

diff --git a/win/win32/vs/Images/Square44x44Logo.altform-unplated_targetsize-256.png b/sys/windows/vs/Images/Square44x44Logo.altform-unplated_targetsize-256.png
similarity index 100%
rename from win/win32/vs/Images/Square44x44Logo.altform-unplated_targetsize-256.png
rename to sys/windows/vs/Images/Square44x44Logo.altform-unplated_targetsize-256.png

diff --git a/win/win32/vs/Images/Square44x44Logo.altform-unplated_targetsize-32.png b/sys/windows/vs/Images/Square44x44Logo.altform-unplated_targetsize-32.png
similarity index 100%
rename from win/win32/vs/Images/Square44x44Logo.altform-unplated_targetsize-32.png
rename to sys/windows/vs/Images/Square44x44Logo.altform-unplated_targetsize-32.png

diff --git a/win/win32/vs/Images/Square44x44Logo.altform-unplated_targetsize-48.png b/sys/windows/vs/Images/Square44x44Logo.altform-unplated_targetsize-48.png
similarity index 100%
rename from win/win32/vs/Images/Square44x44Logo.altform-unplated_targetsize-48.png
rename to sys/windows/vs/Images/Square44x44Logo.altform-unplated_targetsize-48.png

diff --git a/win/win32/vs/Images/Square44x44Logo.scale-100.png b/sys/windows/vs/Images/Square44x44Logo.scale-100.png
similarity index 100%
rename from win/win32/vs/Images/Square44x44Logo.scale-100.png
rename to sys/windows/vs/Images/Square44x44Logo.scale-100.png

diff --git a/win/win32/vs/Images/Square44x44Logo.scale-125.png b/sys/windows/vs/Images/Square44x44Logo.scale-125.png
similarity index 100%
rename from win/win32/vs/Images/Square44x44Logo.scale-125.png
rename to sys/windows/vs/Images/Square44x44Logo.scale-125.png

diff --git a/win/win32/vs/Images/Square44x44Logo.scale-150.png b/sys/windows/vs/Images/Square44x44Logo.scale-150.png
similarity index 100%
rename from win/win32/vs/Images/Square44x44Logo.scale-150.png
rename to sys/windows/vs/Images/Square44x44Logo.scale-150.png

diff --git a/win/win32/vs/Images/Square44x44Logo.scale-200.png b/sys/windows/vs/Images/Square44x44Logo.scale-200.png
similarity index 100%
rename from win/win32/vs/Images/Square44x44Logo.scale-200.png
rename to sys/windows/vs/Images/Square44x44Logo.scale-200.png

diff --git a/win/win32/vs/Images/Square44x44Logo.scale-400.png b/sys/windows/vs/Images/Square44x44Logo.scale-400.png
similarity index 100%
rename from win/win32/vs/Images/Square44x44Logo.scale-400.png
rename to sys/windows/vs/Images/Square44x44Logo.scale-400.png

diff --git a/win/win32/vs/Images/Square44x44Logo.targetsize-16.png b/sys/windows/vs/Images/Square44x44Logo.targetsize-16.png
similarity index 100%
rename from win/win32/vs/Images/Square44x44Logo.targetsize-16.png
rename to sys/windows/vs/Images/Square44x44Logo.targetsize-16.png

diff --git a/win/win32/vs/Images/Square44x44Logo.targetsize-24.png b/sys/windows/vs/Images/Square44x44Logo.targetsize-24.png
similarity index 100%
rename from win/win32/vs/Images/Square44x44Logo.targetsize-24.png
rename to sys/windows/vs/Images/Square44x44Logo.targetsize-24.png

diff --git a/win/win32/vs/Images/Square44x44Logo.targetsize-24_altform-unplated.png b/sys/windows/vs/Images/Square44x44Logo.targetsize-24_altform-unplated.png
similarity index 100%
rename from win/win32/vs/Images/Square44x44Logo.targetsize-24_altform-unplated.png
rename to sys/windows/vs/Images/Square44x44Logo.targetsize-24_altform-unplated.png

diff --git a/win/win32/vs/Images/Square44x44Logo.targetsize-256.png b/sys/windows/vs/Images/Square44x44Logo.targetsize-256.png
similarity index 100%
rename from win/win32/vs/Images/Square44x44Logo.targetsize-256.png
rename to sys/windows/vs/Images/Square44x44Logo.targetsize-256.png

diff --git a/win/win32/vs/Images/Square44x44Logo.targetsize-32.png b/sys/windows/vs/Images/Square44x44Logo.targetsize-32.png
similarity index 100%
rename from win/win32/vs/Images/Square44x44Logo.targetsize-32.png
rename to sys/windows/vs/Images/Square44x44Logo.targetsize-32.png

diff --git a/win/win32/vs/Images/Square44x44Logo.targetsize-48.png b/sys/windows/vs/Images/Square44x44Logo.targetsize-48.png
similarity index 100%
rename from win/win32/vs/Images/Square44x44Logo.targetsize-48.png
rename to sys/windows/vs/Images/Square44x44Logo.targetsize-48.png

diff --git a/win/win32/vs/Images/StoreLogo.backup.png b/sys/windows/vs/Images/StoreLogo.backup.png
similarity index 100%
rename from win/win32/vs/Images/StoreLogo.backup.png
rename to sys/windows/vs/Images/StoreLogo.backup.png

diff --git a/win/win32/vs/Images/StoreLogo.scale-100.png b/sys/windows/vs/Images/StoreLogo.scale-100.png
similarity index 100%
rename from win/win32/vs/Images/StoreLogo.scale-100.png
rename to sys/windows/vs/Images/StoreLogo.scale-100.png

diff --git a/win/win32/vs/Images/StoreLogo.scale-125.png b/sys/windows/vs/Images/StoreLogo.scale-125.png
similarity index 100%
rename from win/win32/vs/Images/StoreLogo.scale-125.png
rename to sys/windows/vs/Images/StoreLogo.scale-125.png

diff --git a/win/win32/vs/Images/StoreLogo.scale-150.png b/sys/windows/vs/Images/StoreLogo.scale-150.png
similarity index 100%
rename from win/win32/vs/Images/StoreLogo.scale-150.png
rename to sys/windows/vs/Images/StoreLogo.scale-150.png

diff --git a/win/win32/vs/Images/StoreLogo.scale-200.png b/sys/windows/vs/Images/StoreLogo.scale-200.png
similarity index 100%
rename from win/win32/vs/Images/StoreLogo.scale-200.png
rename to sys/windows/vs/Images/StoreLogo.scale-200.png

diff --git a/win/win32/vs/Images/StoreLogo.scale-400.png b/sys/windows/vs/Images/StoreLogo.scale-400.png
similarity index 100%
rename from win/win32/vs/Images/StoreLogo.scale-400.png
rename to sys/windows/vs/Images/StoreLogo.scale-400.png

diff --git a/win/win32/vs/Images/Wide310x150Logo.scale-100.png b/sys/windows/vs/Images/Wide310x150Logo.scale-100.png
similarity index 100%
rename from win/win32/vs/Images/Wide310x150Logo.scale-100.png
rename to sys/windows/vs/Images/Wide310x150Logo.scale-100.png

diff --git a/win/win32/vs/Images/Wide310x150Logo.scale-125.png b/sys/windows/vs/Images/Wide310x150Logo.scale-125.png
similarity index 100%
rename from win/win32/vs/Images/Wide310x150Logo.scale-125.png
rename to sys/windows/vs/Images/Wide310x150Logo.scale-125.png

diff --git a/win/win32/vs/Images/Wide310x150Logo.scale-150.png b/sys/windows/vs/Images/Wide310x150Logo.scale-150.png
similarity index 100%
rename from win/win32/vs/Images/Wide310x150Logo.scale-150.png
rename to sys/windows/vs/Images/Wide310x150Logo.scale-150.png

diff --git a/win/win32/vs/Images/Wide310x150Logo.scale-200.png b/sys/windows/vs/Images/Wide310x150Logo.scale-200.png
similarity index 100%
rename from win/win32/vs/Images/Wide310x150Logo.scale-200.png
rename to sys/windows/vs/Images/Wide310x150Logo.scale-200.png

diff --git a/win/win32/vs/Images/Wide310x150Logo.scale-400.png b/sys/windows/vs/Images/Wide310x150Logo.scale-400.png
similarity index 100%
rename from win/win32/vs/Images/Wide310x150Logo.scale-400.png
rename to sys/windows/vs/Images/Wide310x150Logo.scale-400.png

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

diff --git a/win/win32/vs/NetHack.vcxproj b/sys/windows/vs/NetHack/NetHack.vcxproj
similarity index 92%
rename from win/win32/vs/NetHack.vcxproj
rename to sys/windows/vs/NetHack/NetHack.vcxproj
index 651ff2f7b061f4bebaea9e0ddf111757b89b7af6..1f3997246c6e0b8b0c6d900c56b572391d276076 100644 (file)
--- a/win/win32/vs/NetHack.vcxproj
+++ b/sys/windows/vs/NetHack/NetHack.vcxproj
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <Import Project="config.props" />\r
+  <Import Project="..\config.props" />\r
+  <Import Project="..\dirs.props" />\r
   <PropertyGroup Label="Globals">\r
     <ProjectGuid>{609BC774-C6F8-4B2B-AA7D-5B3D0EA95751}</ProjectGuid>\r
     <Keyword>Win32Proj</Keyword>\r
     <RootNamespace>NetHack</RootNamespace>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
-  <Import Project="default.props" />\r
+  <Import Project="$(vsDir)default.props" />\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
-  <Import Project="NetHackProperties.props" />\r
-  <Import Project="console.props" />\r
-  <Import Project="common.props" />\r
-  <Import Project="dirs.props" />\r
-  <Import Project="files.props" />\r
+  <Import Project="$(vsDir)NetHackProperties.props" />\r
+  <Import Project="$(vsDir)console.props" />\r
+  <Import Project="$(vsDir)common.props" />\r
+  <Import Project="$(vsDir)files.props" />\r
   <PropertyGroup>\r
     <OutDir>$(BinDir)</OutDir>\r
   </PropertyGroup>\r
@@ -34,7 +34,7 @@
       <InlineFunctionExpansion>Default</InlineFunctionExpansion>\r
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>\r
       <OmitFramePointers>true</OmitFramePointers>\r
-      <AdditionalIncludeDirectories>$(WinWin32Dir);$(IncDir);$(SysWinntDir);$(SysShareDir);$(WinShareDir);$(LuaDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>$(WinWin32Dir);$(IncDir);$(SysWindDir);$(SysShareDir);$(WinShareDir);$(LuaDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>TILES;WIN32CON;DLB;MSWIN_GRAPHICS;SAFEPROCS;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
     </ClCompile>\r
     <Link>\r
@@ -164,13 +164,13 @@
     <ClCompile Include="$(SysShareDir)cppregex.cpp" />\r
     <ClCompile Include="$(SysShareDir)nhlan.c" />\r
     <ClCompile Include="$(SysShareDir)random.c" />\r
-    <ClCompile Include="$(SysWinntDir)ntsound.c" />\r
-    <ClCompile Include="$(SysWinntDir)nttty.c" />\r
-    <ClCompile Include="$(SysWinntDir)stubs.c">\r
+    <ClCompile Include="$(SysWindDir)ntsound.c" />\r
+    <ClCompile Include="$(SysWindDir)consoletty.c" />\r
+    <ClCompile Include="$(SysWindDir)stubs.c">\r
       <PreprocessorDefinitions>GUISTUB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
     </ClCompile>\r
-    <ClCompile Include="$(SysWinntDir)windmain.c" />\r
-    <ClCompile Include="$(SysWinntDir)winnt.c" />\r
+    <ClCompile Include="$(SysWindDir)windmain.c" />\r
+    <ClCompile Include="$(SysWindDir)windsys.c" />\r
     <ClCompile Include="$(WinShareDir)safeproc.c" />\r
     <ClCompile Include="$(WinTtyDir)getline.c" />\r
     <ClCompile Include="$(WinTtyDir)topl.c" />\r
@@ -216,7 +216,7 @@
     <ClInclude Include="$(IncDir)monst.h" />\r
     <ClInclude Include="$(IncDir)monsym.h" />\r
     <ClInclude Include="$(IncDir)nhlua.h" />\r
-    <ClInclude Include="$(IncDir)ntconf.h" />\r
+    <ClInclude Include="$(IncDir)windconf.h" />\r
     <ClInclude Include="$(IncDir)obj.h" />\r
     <ClInclude Include="$(IncDir)objclass.h" />\r
     <ClInclude Include="$(IncDir)onames.h" />\r

diff --git a/win/win32/vs/afternethack.proj b/sys/windows/vs/NetHack/afternethack.proj
similarity index 61%
rename from win/win32/vs/afternethack.proj
rename to sys/windows/vs/NetHack/afternethack.proj
index ca39fddfcbbf6ef469e923f3327c47ce1b798ae2..00bba9ce3cb6635159b08c769d994772ba01cbaf 100644 (file)
--- a/win/win32/vs/afternethack.proj
+++ b/sys/windows/vs/NetHack/afternethack.proj
@@ -1,11 +1,10 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="dirs.props"/>
-  <Import Project="files.props"/>
+  <Import Project="..\dirs.props" />
   <!-- TODO not copying record -->
   <Target Name="Build"
-       Inputs="$(SysWinntDir).nethackrc.template;$(DocDir)Guidebook.txt;$(DatDir)license;$(SysWinntDir)sysconf.template;$(DocDir)nethack.txt;$(DatDir)symbols;$(WinWin32Dir)record;$(DatDir)opthelp"
+       Inputs="$(SysWindDir).nethackrc.template;$(DocDir)Guidebook.txt;$(DatDir)license;$(SysWindDir)sysconf.template;$(DocDir)nethack.txt;$(DatDir)symbols;$(WinWin32Dir)record;$(DatDir)opthelp"
        Outputs="$(BinDir).nethackrc.template;$(BinDir)Guidebook.txt;$(BinDir)license;$(BinDir)sysconf.template;$(BinDir)symbols.template;$(BinDir)record;$(BinDir)opthelp">
-    <Copy SourceFiles="$(SysWinntDir).nethackrc.template;$(DocDir)Guidebook.txt;$(DatDir)license;$(SysWinntDir)sysconf.template;$(DocDir)nethack.txt;$(DatDir)symbols;$(WinWin32Dir)record;$(DatDir)opthelp"
+    <Copy SourceFiles="$(SysWindDir).nethackrc.template;$(DocDir)Guidebook.txt;$(DatDir)license;$(SysWindDir)sysconf.template;$(DocDir)nethack.txt;$(DatDir)symbols;$(WinWin32Dir)record;$(DatDir)opthelp"
              DestinationFiles="$(BinDir).nethackrc.template;$(BinDir)Guidebook.txt;$(BinDir)license;$(BinDir)sysconf.template;$(BinDir)nethack.txt;$(BinDir)symbols.template;$(BinDir)record;$(BinDir)opthelp" />
   </Target>
   <Target Name="Clean">

diff --git a/win/win32/vs/NetHackPackage.appxmanifest b/sys/windows/vs/NetHackPackage.appxmanifest
similarity index 100%
rename from win/win32/vs/NetHackPackage.appxmanifest
rename to sys/windows/vs/NetHackPackage.appxmanifest

diff --git a/win/win32/vs/NetHackPackage.wapproj b/sys/windows/vs/NetHackPackage.wapproj
similarity index 89%
rename from win/win32/vs/NetHackPackage.wapproj
rename to sys/windows/vs/NetHackPackage.wapproj
index 514baa2518e4476295a65bb0c09193c94784c8aa..8a53a8f1d8d302c3ee66de8ba4d631457fcf0688 100644 (file)
--- a/win/win32/vs/NetHackPackage.wapproj
+++ b/sys/windows/vs/NetHackPackage.wapproj
@@ -26,7 +26,6 @@
   </PropertyGroup>
   <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" />
   <Import Project="NetHackProperties.props" />
-  <Import Project="dirs.props" />
   <PropertyGroup>
     <OutDir>$(BinDir)</OutDir>
   </PropertyGroup>
@@ -36,7 +35,7 @@
     <TargetPlatformMinVersion>10.0.15063.0</TargetPlatformMinVersion>
     <DefaultLanguage>en-US</DefaultLanguage>
     <PackageCertificateKeyFile>NetHackPackage_StoreKey.pfx</PackageCertificateKeyFile>
-    <EntryPointProjectUniqueName>NetHackW.vcxproj</EntryPointProjectUniqueName>
+    <EntryPointProjectUniqueName>NetHackW\NetHackW.vcxproj</EntryPointProjectUniqueName>
     <PackageCertificateThumbprint>19591BE8832D6EFED75019EACE7C4CA42ABC90D4</PackageCertificateThumbprint>
     <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
     <AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
@@ -113,25 +112,25 @@
     <Content Include="Images\Wide310x150Logo.scale-125.png" />
     <Content Include="Images\Wide310x150Logo.scale-150.png" />
     <Content Include="Images\Wide310x150Logo.scale-200.png" />
-    <Content Include="$(BinDir).nethackrc.template">
+    <Content Include="..\..\..\binary\$(Configuration)\$(Platform)\.nethackrc.template">
       <Link>NetHackW\.nethackrc.template</Link>
     </Content>
-    <Content Include="$(BinDir)Guidebook.txt">
+    <Content Include="..\..\..\binary\$(Configuration)\$(Platform)\Guidebook.txt">
       <Link>NetHackW\Guidebook.txt</Link>
     </Content>
-    <Content Include="$(BinDir)license">
+    <Content Include="..\..\..\binary\$(Configuration)\$(Platform)\license">
       <Link>NetHackW\license</Link>
     </Content>
-    <Content Include="$(BinDir)nhdat$(VERSION_MAJOR)$(VERSION_MINOR)$(PATCHLEVEL)">
+    <Content Include="..\..\..\binary\$(Configuration)\$(Platform)\nhdat$(VERSION_MAJOR)$(VERSION_MINOR)$(PATCHLEVEL)">
       <Link>NetHackW\nhdat$(VERSION_MAJOR)$(VERSION_MINOR)$(PATCHLEVEL)</Link>
     </Content>
-    <Content Include="$(BinDir)opthelp">
+    <Content Include="..\..\..\binary\$(Configuration)\$(Platform)\opthelp">
       <Link>NetHackW\opthelp</Link>
     </Content>
-    <Content Include="$(BinDir)symbols.template">
+    <Content Include="..\..\..\binary\$(Configuration)\$(Platform)\symbols.template">
       <Link>NetHackW\symbols.template</Link>
     </Content>
-    <Content Include="$(BinDir)sysconf.template">
+    <Content Include="..\..\..\binary\$(Configuration)\$(Platform)\sysconf.template">
       <Link>NetHackW\sysconf.template</Link>
     </Content>
     <Content Include="Images\Wide310x150Logo.scale-400.png" />
@@ -139,7 +138,7 @@
     <None Include="Package.StoreAssociation.xml" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="NetHackW.vcxproj" />
+    <ProjectReference Include="NetHackW\NetHackW.vcxproj" />
   </ItemGroup>
   <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
-</Project>
\ No newline at end of file
+</Project>

diff --git a/sys/windows/vs/NetHackPackage/NetHackPackage.appxmanifest b/sys/windows/vs/NetHackPackage/NetHackPackage.appxmanifest
new file mode 100644 (file)
index 0000000..54140a4
--- /dev/null
+++ b/sys/windows/vs/NetHackPackage/NetHackPackage.appxmanifest
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities" IgnorableNamespaces="uap mp rescap">
+  <Identity Name="30485NetHackDevTeam.NetHack3.6" Publisher="CN=8BDC628A-FAAA-4EBA-8B5B-EB61BA93BA1F" Version="363.0.28.0" />
+  <Properties>
+    <DisplayName>NetHack 3.7</DisplayName>
+    <PublisherDisplayName>NetHack DevTeam</PublisherDisplayName>
+    <Logo>Images\StoreLogo.png</Logo>
+  </Properties>
+  <Dependencies>
+    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />
+    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.14393.0" MaxVersionTested="10.0.14393.0" />
+  </Dependencies>
+  <Resources>
+    <Resource Language="x-generate" />
+  </Resources>
+  <Applications>
+    <Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="$targetentrypoint$">
+      <uap:VisualElements DisplayName="NetHack 3.7" Description="NetHack 3.7" BackgroundColor="transparent" Square150x150Logo="Images\Square150x150Logo.png" Square44x44Logo="Images\Square44x44Logo.png">
+        <uap:DefaultTile Wide310x150Logo="Images\Wide310x150Logo.png" Square310x310Logo="Images\LargeTile.png" Square71x71Logo="Images\SmallTile.png">
+        </uap:DefaultTile>
+        <uap:SplashScreen Image="Images\SplashScreen.png" />
+      </uap:VisualElements>
+    </Application>
+  </Applications>
+  <Capabilities>
+    <Capability Name="internetClient" />
+    <rescap:Capability Name="runFullTrust" />
+  </Capabilities>
+</Package>

diff --git a/sys/windows/vs/NetHackPackage/NetHackPackage.wapproj b/sys/windows/vs/NetHackPackage/NetHackPackage.wapproj
new file mode 100644 (file)
index 0000000..75a9096
--- /dev/null
+++ b/sys/windows/vs/NetHackPackage/NetHackPackage.wapproj
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Condition="'$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '15.0'">
+    <VisualStudioVersion>15.0</VisualStudioVersion>
+  </PropertyGroup>
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup>
+    <WapProjPath Condition="'$(WapProjPath)'==''">$(MSBuildExtensionsPath)\Microsoft\DesktopBridge\</WapProjPath>
+  </PropertyGroup>
+  <Import Project="..\dirs.props" />
+  <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" />
+  <Import Project="$(vsDir)NetHackProperties.props" />
+  <PropertyGroup>
+    <OutDir>$(BinDir)</OutDir>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ProjectGuid>6838ec9d-f25d-4779-9cd7-2edb61e49429</ProjectGuid>
+    <TargetPlatformVersion>10.0.17763.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.15063.0</TargetPlatformMinVersion>
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <PackageCertificateKeyFile>NetHackPackage_StoreKey.pfx</PackageCertificateKeyFile>
+    <PackageCertificateThumbprint>19591BE8832D6EFED75019EACE7C4CA42ABC90D4</PackageCertificateThumbprint>
+    <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
+    <AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
+    <AppxBundlePlatforms>x86</AppxBundlePlatforms>
+    <AppInstallerUpdateFrequency>1</AppInstallerUpdateFrequency>
+    <AppInstallerCheckForUpdateFrequency>OnApplicationRun</AppInstallerCheckForUpdateFrequency>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <ItemGroup>
+    <AppxManifest Include="NetHackPackage.appxmanifest">
+      <SubType>Designer</SubType>
+    </AppxManifest>
+    <None Include="NetHackPackage_TemporaryKey.pfx" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="$(ImageDir)BadgeLogo.scale-100.png" />
+    <Content Include="$(ImageDir)BadgeLogo.scale-125.png" />
+    <Content Include="$(ImageDir)BadgeLogo.scale-150.png" />
+    <Content Include="$(ImageDir)BadgeLogo.scale-200.png" />
+    <Content Include="$(ImageDir)BadgeLogo.scale-400.png" />
+    <Content Include="$(ImageDir)LargeTile.scale-100.png" />
+    <Content Include="$(ImageDir)LargeTile.scale-125.png" />
+    <Content Include="$(ImageDir)LargeTile.scale-150.png" />
+    <Content Include="$(ImageDir)LargeTile.scale-200.png" />
+    <Content Include="$(ImageDir)LargeTile.scale-400.png" />
+    <Content Include="$(ImageDir)LockScreenLogo.scale-200.png" />
+    <Content Include="$(ImageDir)SmallTile.scale-100.png" />
+    <Content Include="$(ImageDir)SmallTile.scale-125.png" />
+    <Content Include="$(ImageDir)SmallTile.scale-150.png" />
+    <Content Include="$(ImageDir)SmallTile.scale-200.png" />
+    <Content Include="$(ImageDir)SmallTile.scale-400.png" />
+    <Content Include="$(ImageDir)SplashScreen.scale-100.png" />
+    <Content Include="$(ImageDir)SplashScreen.scale-125.png" />
+    <Content Include="$(ImageDir)SplashScreen.scale-150.png" />
+    <Content Include="$(ImageDir)SplashScreen.scale-200.png" />
+    <Content Include="$(ImageDir)SplashScreen.scale-400.png" />
+    <Content Include="$(ImageDir)Square150x150Logo.scale-100.png" />
+    <Content Include="$(ImageDir)Square150x150Logo.scale-125.png" />
+    <Content Include="$(ImageDir)Square150x150Logo.scale-150.png" />
+    <Content Include="$(ImageDir)Square150x150Logo.scale-200.png" />
+    <Content Include="$(ImageDir)Square150x150Logo.scale-400.png" />
+    <Content Include="$(ImageDir)Square44x44Logo.altform-unplated_targetsize-16.png" />
+    <Content Include="$(ImageDir)Square44x44Logo.altform-unplated_targetsize-256.png" />
+    <Content Include="$(ImageDir)Square44x44Logo.altform-unplated_targetsize-32.png" />
+    <Content Include="$(ImageDir)Square44x44Logo.altform-unplated_targetsize-48.png" />
+    <Content Include="$(ImageDir)Square44x44Logo.scale-100.png" />
+    <Content Include="$(ImageDir)Square44x44Logo.scale-125.png" />
+    <Content Include="$(ImageDir)Square44x44Logo.scale-150.png" />
+    <Content Include="$(ImageDir)Square44x44Logo.scale-200.png" />
+    <Content Include="$(ImageDir)Square44x44Logo.scale-400.png" />
+    <Content Include="$(ImageDir)Square44x44Logo.targetsize-16.png" />
+    <Content Include="$(ImageDir)Square44x44Logo.targetsize-24.png" />
+    <Content Include="$(ImageDir)Square44x44Logo.targetsize-24_altform-unplated.png" />
+    <Content Include="$(ImageDir)Square44x44Logo.targetsize-256.png" />
+    <Content Include="$(ImageDir)Square44x44Logo.targetsize-32.png" />
+    <Content Include="$(ImageDir)Square44x44Logo.targetsize-48.png" />
+    <Content Include="$(ImageDir)StoreLogo.scale-100.png" />
+    <Content Include="$(ImageDir)StoreLogo.scale-125.png" />
+    <Content Include="$(ImageDir)StoreLogo.scale-150.png" />
+    <Content Include="$(ImageDir)StoreLogo.scale-200.png" />
+    <Content Include="$(ImageDir)StoreLogo.scale-400.png" />
+    <Content Include="$(ImageDir)Wide310x150Logo.scale-100.png" />
+    <Content Include="$(ImageDir)Wide310x150Logo.scale-125.png" />
+    <Content Include="$(ImageDir)Wide310x150Logo.scale-150.png" />
+    <Content Include="$(ImageDir)Wide310x150Logo.scale-200.png" />
+    <Content Include="$(BinDir).nethackrc.template">
+      <Link>$(vsDir)NetHackW\.nethackrc.template</Link>
+    </Content>
+    <Content Include="$(BinDir)Guidebook.txt">
+      <Link>$(vsDir)NetHackW\Guidebook.txt</Link>
+    </Content>
+    <Content Include="$(BinDir)license">
+      <Link>$(vsDir)NetHackW\license</Link>
+    </Content>
+    <Content Include="$(BinDir)nhdat$(VERSION_MAJOR)$(VERSION_MINOR)$(PATCHLEVEL)">
+      <Link>$(vsDir)NetHackW\nhdat$(VERSION_MAJOR)$(VERSION_MINOR)$(PATCHLEVEL)</Link>
+    </Content>
+    <Content Include="$(BinDir)opthelp">
+      <Link>$(vsDir)NetHackW\opthelp</Link>
+    </Content>
+    <Content Include="$(BinDir)symbols.template">
+      <Link>$(vsDir)NetHackW\symbols.template</Link>
+    </Content>
+    <Content Include="$(BinDir)sysconf.template">
+      <Link>$(vsDir)NetHackW\sysconf.template</Link>
+    </Content>
+    <Content Include="$(ImageDir)Wide310x150Logo.scale-400.png" />
+    <None Include="NetHackPackage_StoreKey.pfx" />
+    <None Include="Package.StoreAssociation.xml" />
+  </ItemGroup>
+  <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
+</Project>
\ No newline at end of file

diff --git a/win/win32/vs/Package.StoreAssociation.xml b/sys/windows/vs/NetHackPackage/Package.StoreAssociation.xml
similarity index 100%
rename from win/win32/vs/Package.StoreAssociation.xml
rename to sys/windows/vs/NetHackPackage/Package.StoreAssociation.xml

diff --git a/win/win32/vs/NetHackProperties.props b/sys/windows/vs/NetHackProperties.props
similarity index 100%
rename from win/win32/vs/NetHackProperties.props
rename to sys/windows/vs/NetHackProperties.props

diff --git a/win/win32/vs/NetHackW.vcxproj b/sys/windows/vs/NetHackW/NetHackW.vcxproj
similarity index 87%
rename from win/win32/vs/NetHackW.vcxproj
rename to sys/windows/vs/NetHackW/NetHackW.vcxproj
index 6526fb8eb9ea7761c075dae93c090b5f665f817f..a628983a1cceb3c5966f8b1090faef881509d16c 100644 (file)
--- a/win/win32/vs/NetHackW.vcxproj
+++ b/sys/windows/vs/NetHackW/NetHackW.vcxproj
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <Import Project="config.props" />\r
+  <Import Project="..\config.props" />\r
   <PropertyGroup Label="Globals">\r
     <ProjectGuid>{CEC5D360-8804-454F-8591-002184C23499}</ProjectGuid>\r
     <RootNamespace>NetHackW</RootNamespace>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
-  <Import Project="default.props" />\r
+  <Import Project="..\dirs.props" />\r
+  <Import Project="$(vsDir)default.props" />\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
-  <Import Project="NetHackProperties.props" />\r
-  <Import Project="common.props" />\r
-  <Import Project="dirs.props" />\r
-  <Import Project="files.props" />\r
+  <Import Project="$(vsDir)NetHackProperties.props" />\r
+  <Import Project="$(vsDir)common.props" />\r
+  <Import Project="$(vsDir)files.props" />\r
   <PropertyGroup>\r
     <OutDir>$(BinDir)</OutDir>\r
   </PropertyGroup>\r
@@ -20,7 +20,7 @@
       <AdditionalOptions>/Gs /Oi- /w44774 %(AdditionalOptions)</AdditionalOptions>\r
       <Optimization>Disabled</Optimization>\r
       <OmitFramePointers>true</OmitFramePointers>\r
-      <AdditionalIncludeDirectories>$(WinWin32Dir);$(IncDir);$(SysWinntDir);$(SysShareDir);$(WinShareDir);$(LuaDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>$(WinWin32Dir);$(IncDir);$(SysWindDir);$(SysShareDir);$(WinShareDir);$(LuaDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>TILES;_WINDOWS;DLB;MSWIN_GRAPHICS;SAFEPROCS;NOTTYGRAPHICS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
     </ClCompile>\r
     <ResourceCompile>\r
@@ -158,13 +158,13 @@
     <ClCompile Include="$(SysShareDir)cppregex.cpp" />\r
     <ClCompile Include="$(SysShareDir)nhlan.c" />\r
     <ClCompile Include="$(SysShareDir)random.c" />\r
-    <ClCompile Include="$(SysWinntDir)ntsound.c" />\r
-    <ClCompile Include="$(SysWinntDir)stubs.c">\r
+    <ClCompile Include="$(SysWindDir)ntsound.c" />\r
+    <ClCompile Include="$(SysWindDir)stubs.c">\r
       <PreprocessorDefinitions>TTYSTUB;</PreprocessorDefinitions>\r
     </ClCompile>\r
-    <ClCompile Include="$(SysWinntDir)windmain.c" />\r
-    <ClCompile Include="$(SysWinntDir)winnt.c" />\r
-    <ClCompile Include="$(SysWinntDir)win10.c" />\r
+    <ClCompile Include="$(SysWindDir)windmain.c" />\r
+    <ClCompile Include="$(SysWindDir)windsys.c" />\r
+    <ClCompile Include="$(SysWindDir)win10.c" />\r
     <ClCompile Include="$(WinShareDir)safeproc.c" />\r
     <ClCompile Include="$(WinWin32Dir)mhaskyn.c" />\r
     <ClCompile Include="$(WinWin32Dir)mhdlg.c" />\r
@@ -241,7 +241,7 @@
     <ClInclude Include="$(IncDir)monst.h" />\r
     <ClInclude Include="$(IncDir)monsym.h" />\r
     <ClInclude Include="$(IncDir)nhlua.h" />\r
-    <ClInclude Include="$(IncDir)ntconf.h" />\r
+    <ClInclude Include="$(IncDir)windconf.h" />\r
     <ClInclude Include="$(IncDir)obj.h" />\r
     <ClInclude Include="$(IncDir)objclass.h" />\r
     <ClInclude Include="$(IncDir)onames.h" />\r
@@ -279,30 +279,30 @@
     <ClInclude Include="$(IncDir)xwindowp.h" />\r
     <ClInclude Include="$(IncDir)you.h" />\r
     <ClInclude Include="$(IncDir)youprop.h" />\r
-    <ClInclude Include="..\resource.h" />\r
+    <ClInclude Include="$(vsDir)resource.h" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <Image Include="..\mnsel.bmp" />\r
-    <Image Include="..\mnselcnt.bmp" />\r
-    <Image Include="..\mnunsel.bmp" />\r
-    <Image Include="..\NETHACK.ICO" />\r
-    <Image Include="..\petmark.bmp" />\r
-    <Image Include="..\pilemark.bmp" />\r
-    <Image Include="..\rip.bmp" />\r
-    <Image Include="..\splash.bmp" />\r
-    <Image Include="..\tiles.bmp" />\r
+    <Image Include="$(WinWin32Dir)mnsel.bmp" />\r
+    <Image Include="$(WinWin32Dir)mnselcnt.bmp" />\r
+    <Image Include="$(WinWin32Dir)mnunsel.bmp" />\r
+    <Image Include="$(WinWin32Dir)NETHACK.ICO" />\r
+    <Image Include="$(WinWin32Dir)petmark.bmp" />\r
+    <Image Include="$(WinWin32Dir)pilemark.bmp" />\r
+    <Image Include="$(WinWin32Dir)rip.bmp" />\r
+    <Image Include="$(WinWin32Dir)splash.bmp" />\r
+    <Image Include="$(WinWin32Dir)tiles.bmp" />\r
   </ItemGroup>\r
   <ItemGroup>\r
     <None Include="cpp.hint" />\r
   </ItemGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <Target Name="AfterBuild">\r
-    <MSBuild Projects="afternethack.proj" Targets="Build" Properties="Configuration=$(Configuration)" />\r
+    <MSBuild Projects="$(vsDir)NetHack\afternethack.proj" Targets="Build" Properties="Configuration=$(Configuration)" />\r
   </Target>\r
   <Target Name="AfterClean">\r
-    <MSBuild Projects="afternethack.proj" Targets="Clean" Properties="Configuration=$(Configuration)" />\r
+    <MSBuild Projects="$(vsDir)NetHack\afternethack.proj" Targets="Clean" Properties="Configuration=$(Configuration)" />\r
   </Target>\r
   <Target Name="AfterRebuild">\r
-    <MSBuild Projects="afternethack.proj" Targets="Build" Properties="Configuration=$(Configuration)" />\r
+    <MSBuild Projects="$(vsDir)NetHack\afternethack.proj" Targets="Build" Properties="Configuration=$(Configuration)" />\r
   </Target>\r
 </Project>\r

diff --git a/win/win32/vs/PDCurses.vcxproj b/sys/windows/vs/PDCurses/PDCurses.vcxproj
similarity index 96%
rename from win/win32/vs/PDCurses.vcxproj
rename to sys/windows/vs/PDCurses/PDCurses.vcxproj
index 1365917caf956c7184bc9554fa320ee6c37f0b3a..837506b89f520a19b0e3274533566e61ecd4349f 100644 (file)
--- a/win/win32/vs/PDCurses.vcxproj
+++ b/sys/windows/vs/PDCurses/PDCurses.vcxproj
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <Import Project="config.props" />\r
+  <Import Project="..\dirs.props" />\r
+  <Import Project="$(vsDir)config.props" />\r
   <PropertyGroup Label="Globals">\r
     <ProjectGuid>{BAA70D0F-3EC7-4D10-91F0-974F1F49308B}</ProjectGuid>\r
     <Keyword>Win32Proj</Keyword>\r
     <RootNamespace>PDCurses</RootNamespace>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
-  <Import Project="default_lib.props" />\r
+  <Import Project="$(vsDir)default_lib.props" />\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
-  <Import Project="dirs.props" />\r
   <ItemGroup>\r
     <ClCompile Condition="Exists('$(PDCURSES)')" Include="$(PDCURSES)\pdcurses\addch.c" />\r
     <ClCompile Condition="Exists('$(PDCURSES)')" Include="$(PDCURSES)\pdcurses\addchstr.c" />\r
@@ -115,4 +115,4 @@
     </Link>\r
   </ItemDefinitionGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
-</Project>
\ No newline at end of file
+</Project>\r

diff --git a/sys/windows/vs/Package.StoreAssociation.xml b/sys/windows/vs/Package.StoreAssociation.xml
new file mode 100644 (file)
index 0000000..24422d2
--- /dev/null
+++ b/sys/windows/vs/Package.StoreAssociation.xml
@@ -0,0 +1,373 @@
+<?xml version="1.0" encoding="utf-8"?>
+<StoreAssociation xmlns="http://schemas.microsoft.com/appx/2010/storeassociation">
+  <Publisher>CN=8BDC628A-FAAA-4EBA-8B5B-EB61BA93BA1F</Publisher>
+  <PublisherDisplayName>NetHack DevTeam</PublisherDisplayName>
+  <DeveloperAccountType>AAD</DeveloperAccountType>
+  <GeneratePackageHash>http://www.w3.org/2001/04/xmlenc#sha256</GeneratePackageHash>
+  <SupportedLocales>
+    <Language Code="af" InMinimumRequirementSet="true" />
+    <Language Code="af-za" InMinimumRequirementSet="true" />
+    <Language Code="am" InMinimumRequirementSet="true" />
+    <Language Code="am-et" InMinimumRequirementSet="true" />
+    <Language Code="ar" InMinimumRequirementSet="true" />
+    <Language Code="ar-ae" InMinimumRequirementSet="true" />
+    <Language Code="ar-bh" InMinimumRequirementSet="true" />
+    <Language Code="ar-dz" InMinimumRequirementSet="true" />
+    <Language Code="ar-eg" InMinimumRequirementSet="true" />
+    <Language Code="ar-iq" InMinimumRequirementSet="true" />
+    <Language Code="ar-jo" InMinimumRequirementSet="true" />
+    <Language Code="ar-kw" InMinimumRequirementSet="true" />
+    <Language Code="ar-lb" InMinimumRequirementSet="true" />
+    <Language Code="ar-ly" InMinimumRequirementSet="true" />
+    <Language Code="ar-ma" InMinimumRequirementSet="true" />
+    <Language Code="ar-om" InMinimumRequirementSet="true" />
+    <Language Code="ar-qa" InMinimumRequirementSet="true" />
+    <Language Code="ar-sa" InMinimumRequirementSet="true" />
+    <Language Code="ar-sy" InMinimumRequirementSet="true" />
+    <Language Code="ar-tn" InMinimumRequirementSet="true" />
+    <Language Code="ar-ye" InMinimumRequirementSet="true" />
+    <Language Code="as" InMinimumRequirementSet="true" />
+    <Language Code="as-in" InMinimumRequirementSet="true" />
+    <Language Code="az" InMinimumRequirementSet="true" />
+    <Language Code="az-arab" InMinimumRequirementSet="true" />
+    <Language Code="az-arab-az" InMinimumRequirementSet="true" />
+    <Language Code="az-cyrl" InMinimumRequirementSet="true" />
+    <Language Code="az-cyrl-az" InMinimumRequirementSet="true" />
+    <Language Code="az-latn" InMinimumRequirementSet="true" />
+    <Language Code="az-latn-az" InMinimumRequirementSet="true" />
+    <Language Code="be" InMinimumRequirementSet="true" />
+    <Language Code="be-by" InMinimumRequirementSet="true" />
+    <Language Code="bg" InMinimumRequirementSet="true" />
+    <Language Code="bg-bg" InMinimumRequirementSet="true" />
+    <Language Code="bn" InMinimumRequirementSet="true" />
+    <Language Code="bn-bd" InMinimumRequirementSet="true" />
+    <Language Code="bn-in" InMinimumRequirementSet="true" />
+    <Language Code="bs" InMinimumRequirementSet="true" />
+    <Language Code="bs-cyrl" InMinimumRequirementSet="true" />
+    <Language Code="bs-cyrl-ba" InMinimumRequirementSet="true" />
+    <Language Code="bs-latn" InMinimumRequirementSet="true" />
+    <Language Code="bs-latn-ba" InMinimumRequirementSet="true" />
+    <Language Code="ca" InMinimumRequirementSet="true" />
+    <Language Code="ca-es" InMinimumRequirementSet="true" />
+    <Language Code="ca-es-valencia" InMinimumRequirementSet="true" />
+    <Language Code="chr-cher" InMinimumRequirementSet="true" />
+    <Language Code="chr-cher-us" InMinimumRequirementSet="true" />
+    <Language Code="chr-latn" InMinimumRequirementSet="true" />
+    <Language Code="cs" InMinimumRequirementSet="true" />
+    <Language Code="cs-cz" InMinimumRequirementSet="true" />
+    <Language Code="cy" InMinimumRequirementSet="true" />
+    <Language Code="cy-gb" InMinimumRequirementSet="true" />
+    <Language Code="da" InMinimumRequirementSet="true" />
+    <Language Code="da-dk" InMinimumRequirementSet="true" />
+    <Language Code="de" InMinimumRequirementSet="true" />
+    <Language Code="de-at" InMinimumRequirementSet="true" />
+    <Language Code="de-ch" InMinimumRequirementSet="true" />
+    <Language Code="de-de" InMinimumRequirementSet="true" />
+    <Language Code="de-li" InMinimumRequirementSet="true" />
+    <Language Code="de-lu" InMinimumRequirementSet="true" />
+    <Language Code="el" InMinimumRequirementSet="true" />
+    <Language Code="el-gr" InMinimumRequirementSet="true" />
+    <Language Code="en" InMinimumRequirementSet="true" />
+    <Language Code="en-011" InMinimumRequirementSet="true" />
+    <Language Code="en-014" InMinimumRequirementSet="true" />
+    <Language Code="en-018" InMinimumRequirementSet="true" />
+    <Language Code="en-021" InMinimumRequirementSet="true" />
+    <Language Code="en-029" InMinimumRequirementSet="true" />
+    <Language Code="en-053" InMinimumRequirementSet="true" />
+    <Language Code="en-au" InMinimumRequirementSet="true" />
+    <Language Code="en-bz" InMinimumRequirementSet="true" />
+    <Language Code="en-ca" InMinimumRequirementSet="true" />
+    <Language Code="en-gb" InMinimumRequirementSet="true" />
+    <Language Code="en-hk" InMinimumRequirementSet="true" />
+    <Language Code="en-id" InMinimumRequirementSet="true" />
+    <Language Code="en-ie" InMinimumRequirementSet="true" />
+    <Language Code="en-in" InMinimumRequirementSet="true" />
+    <Language Code="en-jm" InMinimumRequirementSet="true" />
+    <Language Code="en-kz" InMinimumRequirementSet="true" />
+    <Language Code="en-mt" InMinimumRequirementSet="true" />
+    <Language Code="en-my" InMinimumRequirementSet="true" />
+    <Language Code="en-nz" InMinimumRequirementSet="true" />
+    <Language Code="en-ph" InMinimumRequirementSet="true" />
+    <Language Code="en-pk" InMinimumRequirementSet="true" />
+    <Language Code="en-sg" InMinimumRequirementSet="true" />
+    <Language Code="en-tt" InMinimumRequirementSet="true" />
+    <Language Code="en-us" InMinimumRequirementSet="true" />
+    <Language Code="en-vn" InMinimumRequirementSet="true" />
+    <Language Code="en-za" InMinimumRequirementSet="true" />
+    <Language Code="en-zw" InMinimumRequirementSet="true" />
+    <Language Code="es" InMinimumRequirementSet="true" />
+    <Language Code="es-019" InMinimumRequirementSet="true" />
+    <Language Code="es-419" InMinimumRequirementSet="true" />
+    <Language Code="es-ar" InMinimumRequirementSet="true" />
+    <Language Code="es-bo" InMinimumRequirementSet="true" />
+    <Language Code="es-cl" InMinimumRequirementSet="true" />
+    <Language Code="es-co" InMinimumRequirementSet="true" />
+    <Language Code="es-cr" InMinimumRequirementSet="true" />
+    <Language Code="es-do" InMinimumRequirementSet="true" />
+    <Language Code="es-ec" InMinimumRequirementSet="true" />
+    <Language Code="es-es" InMinimumRequirementSet="true" />
+    <Language Code="es-gt" InMinimumRequirementSet="true" />
+    <Language Code="es-hn" InMinimumRequirementSet="true" />
+    <Language Code="es-mx" InMinimumRequirementSet="true" />
+    <Language Code="es-ni" InMinimumRequirementSet="true" />
+    <Language Code="es-pa" InMinimumRequirementSet="true" />
+    <Language Code="es-pe" InMinimumRequirementSet="true" />
+    <Language Code="es-pr" InMinimumRequirementSet="true" />
+    <Language Code="es-py" InMinimumRequirementSet="true" />
+    <Language Code="es-sv" InMinimumRequirementSet="true" />
+    <Language Code="es-us" InMinimumRequirementSet="true" />
+    <Language Code="es-uy" InMinimumRequirementSet="true" />
+    <Language Code="es-ve" InMinimumRequirementSet="true" />
+    <Language Code="et" InMinimumRequirementSet="true" />
+    <Language Code="et-ee" InMinimumRequirementSet="true" />
+    <Language Code="eu" InMinimumRequirementSet="true" />
+    <Language Code="eu-es" InMinimumRequirementSet="true" />
+    <Language Code="fa" InMinimumRequirementSet="true" />
+    <Language Code="fa-ir" InMinimumRequirementSet="true" />
+    <Language Code="fi" InMinimumRequirementSet="true" />
+    <Language Code="fi-fi" InMinimumRequirementSet="true" />
+    <Language Code="fil" InMinimumRequirementSet="true" />
+    <Language Code="fil-latn" InMinimumRequirementSet="true" />
+    <Language Code="fil-ph" InMinimumRequirementSet="true" />
+    <Language Code="fr" InMinimumRequirementSet="true" />
+    <Language Code="fr-011" InMinimumRequirementSet="true" />
+    <Language Code="fr-015" InMinimumRequirementSet="true" />
+    <Language Code="fr-021" InMinimumRequirementSet="true" />
+    <Language Code="fr-029" InMinimumRequirementSet="true" />
+    <Language Code="fr-155" InMinimumRequirementSet="true" />
+    <Language Code="fr-be" InMinimumRequirementSet="true" />
+    <Language Code="fr-ca" InMinimumRequirementSet="true" />
+    <Language Code="fr-cd" InMinimumRequirementSet="true" />
+    <Language Code="fr-ch" InMinimumRequirementSet="true" />
+    <Language Code="fr-ci" InMinimumRequirementSet="true" />
+    <Language Code="fr-cm" InMinimumRequirementSet="true" />
+    <Language Code="fr-fr" InMinimumRequirementSet="true" />
+    <Language Code="fr-ht" InMinimumRequirementSet="true" />
+    <Language Code="fr-lu" InMinimumRequirementSet="true" />
+    <Language Code="fr-ma" InMinimumRequirementSet="true" />
+    <Language Code="fr-mc" InMinimumRequirementSet="true" />
+    <Language Code="fr-ml" InMinimumRequirementSet="true" />
+    <Language Code="fr-re" InMinimumRequirementSet="true" />
+    <Language Code="frc-latn" InMinimumRequirementSet="true" />
+    <Language Code="frp-latn" InMinimumRequirementSet="true" />
+    <Language Code="ga" InMinimumRequirementSet="true" />
+    <Language Code="ga-ie" InMinimumRequirementSet="true" />
+    <Language Code="gd-gb" InMinimumRequirementSet="true" />
+    <Language Code="gd-latn" InMinimumRequirementSet="true" />
+    <Language Code="gl" InMinimumRequirementSet="true" />
+    <Language Code="gl-es" InMinimumRequirementSet="true" />
+    <Language Code="gu" InMinimumRequirementSet="true" />
+    <Language Code="gu-in" InMinimumRequirementSet="true" />
+    <Language Code="ha" InMinimumRequirementSet="true" />
+    <Language Code="ha-latn" InMinimumRequirementSet="true" />
+    <Language Code="ha-latn-ng" InMinimumRequirementSet="true" />
+    <Language Code="he" InMinimumRequirementSet="true" />
+    <Language Code="he-il" InMinimumRequirementSet="true" />
+    <Language Code="hi" InMinimumRequirementSet="true" />
+    <Language Code="hi-in" InMinimumRequirementSet="true" />
+    <Language Code="hr" InMinimumRequirementSet="true" />
+    <Language Code="hr-ba" InMinimumRequirementSet="true" />
+    <Language Code="hr-hr" InMinimumRequirementSet="true" />
+    <Language Code="hu" InMinimumRequirementSet="true" />
+    <Language Code="hu-hu" InMinimumRequirementSet="true" />
+    <Language Code="hy" InMinimumRequirementSet="true" />
+    <Language Code="hy-am" InMinimumRequirementSet="true" />
+    <Language Code="id" InMinimumRequirementSet="true" />
+    <Language Code="id-id" InMinimumRequirementSet="true" />
+    <Language Code="ig-latn" InMinimumRequirementSet="true" />
+    <Language Code="ig-ng" InMinimumRequirementSet="true" />
+    <Language Code="is" InMinimumRequirementSet="true" />
+    <Language Code="is-is" InMinimumRequirementSet="true" />
+    <Language Code="it" InMinimumRequirementSet="true" />
+    <Language Code="it-ch" InMinimumRequirementSet="true" />
+    <Language Code="it-it" InMinimumRequirementSet="true" />
+    <Language Code="iu-cans" InMinimumRequirementSet="true" />
+    <Language Code="iu-latn" InMinimumRequirementSet="true" />
+    <Language Code="iu-latn-ca" InMinimumRequirementSet="true" />
+    <Language Code="ja" InMinimumRequirementSet="true" />
+    <Language Code="ja-jp" InMinimumRequirementSet="true" />
+    <Language Code="ka" InMinimumRequirementSet="true" />
+    <Language Code="ka-ge" InMinimumRequirementSet="true" />
+    <Language Code="kk" InMinimumRequirementSet="true" />
+    <Language Code="kk-kz" InMinimumRequirementSet="true" />
+    <Language Code="km" InMinimumRequirementSet="true" />
+    <Language Code="km-kh" InMinimumRequirementSet="true" />
+    <Language Code="kn" InMinimumRequirementSet="true" />
+    <Language Code="kn-in" InMinimumRequirementSet="true" />
+    <Language Code="ko" InMinimumRequirementSet="true" />
+    <Language Code="ko-kr" InMinimumRequirementSet="true" />
+    <Language Code="kok" InMinimumRequirementSet="true" />
+    <Language Code="kok-in" InMinimumRequirementSet="true" />
+    <Language Code="ku-arab" InMinimumRequirementSet="true" />
+    <Language Code="ku-arab-iq" InMinimumRequirementSet="true" />
+    <Language Code="ky-cyrl" InMinimumRequirementSet="true" />
+    <Language Code="ky-kg" InMinimumRequirementSet="true" />
+    <Language Code="lb" InMinimumRequirementSet="true" />
+    <Language Code="lb-lu" InMinimumRequirementSet="true" />
+    <Language Code="lo" InMinimumRequirementSet="true" />
+    <Language Code="lo-la" InMinimumRequirementSet="true" />
+    <Language Code="lt" InMinimumRequirementSet="true" />
+    <Language Code="lt-lt" InMinimumRequirementSet="true" />
+    <Language Code="lv" InMinimumRequirementSet="true" />
+    <Language Code="lv-lv" InMinimumRequirementSet="true" />
+    <Language Code="mi" InMinimumRequirementSet="true" />
+    <Language Code="mi-latn" InMinimumRequirementSet="true" />
+    <Language Code="mi-nz" InMinimumRequirementSet="true" />
+    <Language Code="mk" InMinimumRequirementSet="true" />
+    <Language Code="mk-mk" InMinimumRequirementSet="true" />
+    <Language Code="ml" InMinimumRequirementSet="true" />
+    <Language Code="ml-in" InMinimumRequirementSet="true" />
+    <Language Code="mn-cyrl" InMinimumRequirementSet="true" />
+    <Language Code="mn-mn" InMinimumRequirementSet="true" />
+    <Language Code="mn-mong" InMinimumRequirementSet="true" />
+    <Language Code="mn-phag" InMinimumRequirementSet="true" />
+    <Language Code="mr" InMinimumRequirementSet="true" />
+    <Language Code="mr-in" InMinimumRequirementSet="true" />
+    <Language Code="ms" InMinimumRequirementSet="true" />
+    <Language Code="ms-bn" InMinimumRequirementSet="true" />
+    <Language Code="ms-my" InMinimumRequirementSet="true" />
+    <Language Code="mt" InMinimumRequirementSet="true" />
+    <Language Code="mt-mt" InMinimumRequirementSet="true" />
+    <Language Code="nb" InMinimumRequirementSet="true" />
+    <Language Code="nb-no" InMinimumRequirementSet="true" />
+    <Language Code="ne" InMinimumRequirementSet="true" />
+    <Language Code="ne-np" InMinimumRequirementSet="true" />
+    <Language Code="nl" InMinimumRequirementSet="true" />
+    <Language Code="nl-be" InMinimumRequirementSet="true" />
+    <Language Code="nl-nl" InMinimumRequirementSet="true" />
+    <Language Code="nn" InMinimumRequirementSet="true" />
+    <Language Code="nn-no" InMinimumRequirementSet="true" />
+    <Language Code="no" InMinimumRequirementSet="true" />
+    <Language Code="no-no" InMinimumRequirementSet="true" />
+    <Language Code="nso" InMinimumRequirementSet="true" />
+    <Language Code="nso-za" InMinimumRequirementSet="true" />
+    <Language Code="om" InMinimumRequirementSet="false" />
+    <Language Code="om-et" InMinimumRequirementSet="false" />
+    <Language Code="or" InMinimumRequirementSet="true" />
+    <Language Code="or-in" InMinimumRequirementSet="true" />
+    <Language Code="pa" InMinimumRequirementSet="true" />
+    <Language Code="pa-arab" InMinimumRequirementSet="true" />
+    <Language Code="pa-arab-pk" InMinimumRequirementSet="true" />
+    <Language Code="pa-deva" InMinimumRequirementSet="true" />
+    <Language Code="pa-in" InMinimumRequirementSet="true" />
+    <Language Code="pl" InMinimumRequirementSet="true" />
+    <Language Code="pl-pl" InMinimumRequirementSet="true" />
+    <Language Code="prs" InMinimumRequirementSet="true" />
+    <Language Code="prs-af" InMinimumRequirementSet="true" />
+    <Language Code="prs-arab" InMinimumRequirementSet="true" />
+    <Language Code="pt" InMinimumRequirementSet="true" />
+    <Language Code="pt-br" InMinimumRequirementSet="true" />
+    <Language Code="pt-pt" InMinimumRequirementSet="true" />
+    <Language Code="quc-latn" InMinimumRequirementSet="true" />
+    <Language Code="qut-gt" InMinimumRequirementSet="true" />
+    <Language Code="qut-latn" InMinimumRequirementSet="true" />
+    <Language Code="quz" InMinimumRequirementSet="true" />
+    <Language Code="quz-bo" InMinimumRequirementSet="true" />
+    <Language Code="quz-ec" InMinimumRequirementSet="true" />
+    <Language Code="quz-pe" InMinimumRequirementSet="true" />
+    <Language Code="ro" InMinimumRequirementSet="true" />
+    <Language Code="ro-ro" InMinimumRequirementSet="true" />
+    <Language Code="ru" InMinimumRequirementSet="true" />
+    <Language Code="ru-ru" InMinimumRequirementSet="true" />
+    <Language Code="rw" InMinimumRequirementSet="true" />
+    <Language Code="rw-rw" InMinimumRequirementSet="true" />
+    <Language Code="sd-arab" InMinimumRequirementSet="true" />
+    <Language Code="sd-arab-pk" InMinimumRequirementSet="true" />
+    <Language Code="sd-deva" InMinimumRequirementSet="true" />
+    <Language Code="si" InMinimumRequirementSet="true" />
+    <Language Code="si-lk" InMinimumRequirementSet="true" />
+    <Language Code="sk" InMinimumRequirementSet="true" />
+    <Language Code="sk-sk" InMinimumRequirementSet="true" />
+    <Language Code="sl" InMinimumRequirementSet="true" />
+    <Language Code="sl-si" InMinimumRequirementSet="true" />
+    <Language Code="sq" InMinimumRequirementSet="true" />
+    <Language Code="sq-al" InMinimumRequirementSet="true" />
+    <Language Code="sr" InMinimumRequirementSet="true" />
+    <Language Code="sr-cyrl" InMinimumRequirementSet="true" />
+    <Language Code="sr-cyrl-ba" InMinimumRequirementSet="true" />
+    <Language Code="sr-cyrl-cs" InMinimumRequirementSet="true" />
+    <Language Code="sr-cyrl-me" InMinimumRequirementSet="true" />
+    <Language Code="sr-cyrl-rs" InMinimumRequirementSet="true" />
+    <Language Code="sr-latn" InMinimumRequirementSet="true" />
+    <Language Code="sr-latn-ba" InMinimumRequirementSet="true" />
+    <Language Code="sr-latn-cs" InMinimumRequirementSet="true" />
+    <Language Code="sr-latn-me" InMinimumRequirementSet="true" />
+    <Language Code="sr-latn-rs" InMinimumRequirementSet="true" />
+    <Language Code="sv" InMinimumRequirementSet="true" />
+    <Language Code="sv-fi" InMinimumRequirementSet="true" />
+    <Language Code="sv-se" InMinimumRequirementSet="true" />
+    <Language Code="sw" InMinimumRequirementSet="true" />
+    <Language Code="sw-ke" InMinimumRequirementSet="true" />
+    <Language Code="ta" InMinimumRequirementSet="true" />
+    <Language Code="ta-in" InMinimumRequirementSet="true" />
+    <Language Code="te" InMinimumRequirementSet="true" />
+    <Language Code="te-in" InMinimumRequirementSet="true" />
+    <Language Code="tg-arab" InMinimumRequirementSet="true" />
+    <Language Code="tg-cyrl" InMinimumRequirementSet="true" />
+    <Language Code="tg-cyrl-tj" InMinimumRequirementSet="true" />
+    <Language Code="tg-latn" InMinimumRequirementSet="true" />
+    <Language Code="th" InMinimumRequirementSet="true" />
+    <Language Code="th-th" InMinimumRequirementSet="true" />
+    <Language Code="ti" InMinimumRequirementSet="true" />
+    <Language Code="ti-et" InMinimumRequirementSet="true" />
+    <Language Code="tk-cyrl" InMinimumRequirementSet="true" />
+    <Language Code="tk-cyrl-tr" InMinimumRequirementSet="true" />
+    <Language Code="tk-latn" InMinimumRequirementSet="true" />
+    <Language Code="tk-latn-tr" InMinimumRequirementSet="true" />
+    <Language Code="tk-tm" InMinimumRequirementSet="true" />
+    <Language Code="tn" InMinimumRequirementSet="true" />
+    <Language Code="tn-bw" InMinimumRequirementSet="true" />
+    <Language Code="tn-za" InMinimumRequirementSet="true" />
+    <Language Code="tr" InMinimumRequirementSet="true" />
+    <Language Code="tr-tr" InMinimumRequirementSet="true" />
+    <Language Code="tt-arab" InMinimumRequirementSet="true" />
+    <Language Code="tt-cyrl" InMinimumRequirementSet="true" />
+    <Language Code="tt-latn" InMinimumRequirementSet="true" />
+    <Language Code="tt-ru" InMinimumRequirementSet="true" />
+    <Language Code="ug-arab" InMinimumRequirementSet="true" />
+    <Language Code="ug-cn" InMinimumRequirementSet="true" />
+    <Language Code="ug-cyrl" InMinimumRequirementSet="true" />
+    <Language Code="ug-latn" InMinimumRequirementSet="true" />
+    <Language Code="uk" InMinimumRequirementSet="true" />
+    <Language Code="uk-ua" InMinimumRequirementSet="true" />
+    <Language Code="ur" InMinimumRequirementSet="true" />
+    <Language Code="ur-pk" InMinimumRequirementSet="true" />
+    <Language Code="uz" InMinimumRequirementSet="true" />
+    <Language Code="uz-cyrl" InMinimumRequirementSet="true" />
+    <Language Code="uz-latn" InMinimumRequirementSet="true" />
+    <Language Code="uz-latn-uz" InMinimumRequirementSet="true" />
+    <Language Code="vi" InMinimumRequirementSet="true" />
+    <Language Code="vi-vn" InMinimumRequirementSet="true" />
+    <Language Code="wo" InMinimumRequirementSet="true" />
+    <Language Code="wo-sn" InMinimumRequirementSet="true" />
+    <Language Code="xh" InMinimumRequirementSet="true" />
+    <Language Code="xh-za" InMinimumRequirementSet="true" />
+    <Language Code="yo-latn" InMinimumRequirementSet="true" />
+    <Language Code="yo-ng" InMinimumRequirementSet="true" />
+    <Language Code="zh" InMinimumRequirementSet="true" />
+    <Language Code="zh-cn" InMinimumRequirementSet="true" />
+    <Language Code="zh-hans" InMinimumRequirementSet="true" />
+    <Language Code="zh-hans-cn" InMinimumRequirementSet="true" />
+    <Language Code="zh-hans-sg" InMinimumRequirementSet="true" />
+    <Language Code="zh-hant" InMinimumRequirementSet="true" />
+    <Language Code="zh-hant-hk" InMinimumRequirementSet="true" />
+    <Language Code="zh-hant-mo" InMinimumRequirementSet="true" />
+    <Language Code="zh-hant-tw" InMinimumRequirementSet="true" />
+    <Language Code="zh-hk" InMinimumRequirementSet="true" />
+    <Language Code="zh-mo" InMinimumRequirementSet="true" />
+    <Language Code="zh-sg" InMinimumRequirementSet="true" />
+    <Language Code="zh-tw" InMinimumRequirementSet="true" />
+    <Language Code="zu" InMinimumRequirementSet="true" />
+    <Language Code="zu-za" InMinimumRequirementSet="true" />
+  </SupportedLocales>
+  <ProductReservedInfo>
+    <MainPackageIdentityName>30485NetHackDevTeam.NetHack3.6</MainPackageIdentityName>
+    <ReservedNames>
+      <ReservedName>NetHack 3.7</ReservedName>
+    </ReservedNames>
+  </ProductReservedInfo>
+  <AccountPackageIdentityNames>
+    <MainPackageIdentityName>30485NetHackDevTeam.NetHackBeta</MainPackageIdentityName>
+  </AccountPackageIdentityNames>
+  <PackageInfoList LandingUrl="https://developer.microsoft.com/dashboard/Application?appId=9PJ7BFSRP8M5" />
+</StoreAssociation>

diff --git a/win/win32/vs/ScreenShot.PNG b/sys/windows/vs/ScreenShot.PNG
similarity index 100%
rename from win/win32/vs/ScreenShot.PNG
rename to sys/windows/vs/ScreenShot.PNG

diff --git a/win/win32/vs/build.bat b/sys/windows/vs/build.bat
similarity index 100%
rename from win/win32/vs/build.bat
rename to sys/windows/vs/build.bat

diff --git a/win/win32/vs/common.props b/sys/windows/vs/common.props
similarity index 100%
rename from win/win32/vs/common.props
rename to sys/windows/vs/common.props

diff --git a/win/win32/vs/config.props b/sys/windows/vs/config.props
similarity index 100%
rename from win/win32/vs/config.props
rename to sys/windows/vs/config.props

diff --git a/win/win32/vs/console.props b/sys/windows/vs/console.props
similarity index 100%
rename from win/win32/vs/console.props
rename to sys/windows/vs/console.props

diff --git a/win/win32/vs/cpp.hint b/sys/windows/vs/cpp.hint
similarity index 100%
rename from win/win32/vs/cpp.hint
rename to sys/windows/vs/cpp.hint

diff --git a/win/win32/vs/default.props b/sys/windows/vs/default.props
similarity index 100%
rename from win/win32/vs/default.props
rename to sys/windows/vs/default.props

diff --git a/win/win32/vs/default_dll.props b/sys/windows/vs/default_dll.props
similarity index 100%
rename from win/win32/vs/default_dll.props
rename to sys/windows/vs/default_dll.props

diff --git a/win/win32/vs/default_lib.props b/sys/windows/vs/default_lib.props
similarity index 100%
rename from win/win32/vs/default_lib.props
rename to sys/windows/vs/default_lib.props

diff --git a/win/win32/vs/dirs.props b/sys/windows/vs/dirs.props
similarity index 68%
rename from win/win32/vs/dirs.props
rename to sys/windows/vs/dirs.props
index ed8a7554fa7224412dade620be3dfa622be50b07..17e6ac8e24bcff8f40e9c8bca55f7d207d955967 100644 (file)
--- a/win/win32/vs/dirs.props
+++ b/sys/windows/vs/dirs.props
@@ -1,29 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <RootDir>$(MSBuildProjectDirectory)\..\..\..\</RootDir>
+    <RootDir>$(MSBuildProjectDirectory)\..\..\..\..\</RootDir>
+    <vsDir>$(RootDir)sys\windows\vs\</vsDir>
     <BinDir>$(RootDir)binary\$(Configuration)\$(Platform)\</BinDir>
     <ObjDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(TargetName)\</ObjDir>
     <SymbolsDir>$(ProjectDir)symbols\$(Configuration)\$(Platform)\$(TargetName)\</SymbolsDir>
     <ToolsDir>$(RootDir)tools\$(Configuration)\$(Platform)\</ToolsDir>
+    <ImageDir>$(vsDir)\Images\</ImageDir>
     <UtilDir>$(RootDir)util\</UtilDir>
     <DatDir>$(RootDir)dat\</DatDir>
     <DocDir>$(RootDir)doc\</DocDir>
     <IncDir>$(RootDir)include\</IncDir>
     <LuaDir>$(RootDir)submodules\lua\</LuaDir>
     <SrcDir>$(RootDir)src\</SrcDir>
-       <SysDir>$(RootDir)sys\</SysDir>
+    <SysDir>$(RootDir)sys\</SysDir>
     <UtilDir>$(RootDir)util\</UtilDir>
-       <SysShareDir>$(RootDir)sys\share\</SysShareDir>
-    <SysWinntDir>$(RootDir)sys\winnt\</SysWinntDir>
+    <SysShareDir>$(RootDir)sys\share\</SysShareDir>
+    <SysWindDir>$(RootDir)sys\windows\</SysWindDir>
     <WinShareDir>$(RootDir)win\share\</WinShareDir>
     <WinTtyDir>$(RootDir)win\tty\</WinTtyDir>
     <WinWin32Dir>$(RootDir)win\win32\</WinWin32Dir>
     <OutDir>$(ToolsDir)</OutDir>
-       <IntDir>$(ObjDir)</IntDir>
-       <WinCursDir>$(RootDir)win\curses\</WinCursDir>
+    <IntDir>$(ObjDir)</IntDir>
+    <WinCursDir>$(RootDir)win\curses\</WinCursDir>
+    <SubmodulesDir>$(RootDir)submodules\</SubmodulesDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(PDCURSES)'=='' AND Exists('$(RootDir)lib\PDCurses')">
-       <PDCURSES>$(RootDir)lib\PDCurses\</PDCURSES>
+    <PDCURSES>$(RootDir)lib\PDCurses\</PDCURSES>
   </PropertyGroup>
 </Project>

diff --git a/win/win32/vs/afterdlb.proj b/sys/windows/vs/dlb/afterdlb.proj
similarity index 73%
rename from win/win32/vs/afterdlb.proj
rename to sys/windows/vs/dlb/afterdlb.proj
index 56ea03350c2c2ee6019fe11bae4624d9af2293e6..967c181fb4e71d0e4b94f83e523173974dd09380 100644 (file)
--- a/win/win32/vs/afterdlb.proj
+++ b/sys/windows/vs/dlb/afterdlb.proj
@@ -1,11 +1,11 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="dirs.props"/>
-  <Import Project="files.props"/>
+  <Import Project="..\dirs.props"/>
+  <Import Project="$(vsDir)files.props"/>
   <Target Name="Build"
-       Inputs="$(ToolsDir)dlb.exe;@(DlbList);$(SysWinntDir)porthelp"
+       Inputs="$(ToolsDir)dlb.exe;@(DlbList);$(SysWindDir)porthelp"
        Outputs="$(BinDir)nhdat$(VERSION_MAJOR)$(VERSION_MINOR)$(PATCHLEVEL)">
        <MakeDir Directories="$(BinDir)"/>
-       <Copy SourceFiles="$(SysWinntDir)porthelp" DestinationFolder="$(DatDir)"/>
+       <Copy SourceFiles="$(SysWindDir)porthelp" DestinationFolder="$(DatDir)"/>
        <WriteLinesToFile File="$(DatDir)dlb.lst" Lines="@(DlbList->'%(filename)%(extension)')" Overwrite="true"/>
        <Exec Command="&quot;$(ToolsDir)dlb.exe&quot; cIf dlb.lst &quot;$(BinDir)nhdat&quot;" WorkingDirectory="$(DatDir)"/>
        <Delete Files="$(DatDir)porthelp"/>

diff --git a/win/win32/vs/dlb.vcxproj b/sys/windows/vs/dlb/dlb.vcxproj
similarity index 72%
rename from win/win32/vs/dlb.vcxproj
rename to sys/windows/vs/dlb/dlb.vcxproj
index ed248279b112740205e7eaa4eb5e68c023b29d63..f8c22a6530fdec3c1dcdbd13d16d0d56ff154c26 100644 (file)
--- a/win/win32/vs/dlb.vcxproj
+++ b/sys/windows/vs/dlb/dlb.vcxproj
@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <Import Project="config.props" />\r
+  <Import Project="..\dirs.props" />\r
+  <Import Project="$(vsDir)config.props" />\r
   <PropertyGroup Label="Globals">\r
     <ProjectGuid>{0303A585-3F83-4BB7-AF6B-1E12C8FB54AC}</ProjectGuid>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
-  <Import Project="default.props" />\r
+  <Import Project="$(vsDir)default.props" />\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
-    <Import Project="NetHackProperties.props" />\r
+    <Import Project="$(vsDir)NetHackProperties.props" />\r
   </ImportGroup>\r
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
-    <Import Project="NetHackProperties.props" />\r
+    <Import Project="$(vsDir)NetHackProperties.props" />\r
   </ImportGroup>\r
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
-    <Import Project="NetHackProperties.props" />\r
+    <Import Project="$(vsDir)NetHackProperties.props" />\r
   </ImportGroup>\r
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
-    <Import Project="NetHackProperties.props" />\r
+    <Import Project="$(vsDir)NetHackProperties.props" />\r
   </ImportGroup>\r
-  <Import Project="console.props" />\r
-  <Import Project="common.props" />\r
-  <Import Project="dirs.props" />\r
-  <Import Project="files.props" />\r
+  <Import Project="$(vsDir)console.props" />\r
+  <Import Project="$(vsDir)common.props" />\r
+  <Import Project="$(vsDir)files.props" />\r
   <ItemDefinitionGroup>\r
     <ClCompile>\r
-      <AdditionalIncludeDirectories>$(IncDir);$(SysWinntDir);$(SysShareDir);$(LuaDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>$(IncDir);$(SysWindDir);$(SysShareDir);$(LuaDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32CON;DLB;MSWIN_GRAPHICS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
     </ClCompile>\r
   </ItemDefinitionGroup>\r
@@ -48,4 +48,4 @@
   <Target Name="AfterRebuild">\r
     <MSBuild Projects="afterdlb.proj" Targets="Build" Properties="Configuration=$(Configuration)" />\r
   </Target>\r
-</Project>
\ No newline at end of file
+</Project>\r

diff --git a/win/win32/vs/dll.props b/sys/windows/vs/dll.props
similarity index 100%
rename from win/win32/vs/dll.props
rename to sys/windows/vs/dll.props

diff --git a/win/win32/vs/files.props b/sys/windows/vs/files.props
similarity index 99%
rename from win/win32/vs/files.props
rename to sys/windows/vs/files.props
index 5d955fe66d6538eeecb1a64a83bd6a537c9b87f4..68c7222884fa499ab65e877c4c3af6897e7d05ec 100644 (file)
--- a/win/win32/vs/files.props
+++ b/sys/windows/vs/files.props
@@ -141,7 +141,7 @@
     <Luafiles Include = "wiz-strt.lua"/>
   </ItemGroup>
   <ItemGroup>
-    <UUFiles Include = "$(SysWinntDir)nhico.uu"/>
+    <UUFiles Include = "$(SysWindDir)nhico.uu"/>
     <UUFiles Include = "$(WinWin32Dir)mnsel.uu"/>
     <UUFiles Include = "$(WinWin32Dir)mnselcnt.uu"/>
     <UUFiles Include = "$(WinWin32Dir)mnunsel.uu"/>

diff --git a/win/win32/vs/aftermakedefs.proj b/sys/windows/vs/makedefs/aftermakedefs.proj
similarity index 91%
rename from win/win32/vs/aftermakedefs.proj
rename to sys/windows/vs/makedefs/aftermakedefs.proj
index 4ce136bb98d1818272e9c0f88847d8ac60d400cd..068de05f1300929d0ca296bdccb0af75b3e33fd3 100644 (file)
--- a/win/win32/vs/aftermakedefs.proj
+++ b/sys/windows/vs/makedefs/aftermakedefs.proj
@@ -1,6 +1,6 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="dirs.props"/>
-  <Import Project="files.props"/>
+  <Import Project="..\dirs.props"/>
+  <Import Project="$(vsDir)files.props"/>
   <Target Name="Build"
      Inputs="$(ToolsDir)makedefs.exe"
         Outputs="@(Defs)">

diff --git a/win/win32/vs/makedefs.vcxproj b/sys/windows/vs/makedefs/makedefs.vcxproj
similarity index 54%
rename from win/win32/vs/makedefs.vcxproj
rename to sys/windows/vs/makedefs/makedefs.vcxproj
index f82bb2c9a228236acccf1c44773d318dc9ae4e59..fa20216cae35b7b24bff301ee2bae757251f8d16 100644 (file)
--- a/win/win32/vs/makedefs.vcxproj
+++ b/sys/windows/vs/makedefs/makedefs.vcxproj
@@ -1,52 +1,52 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <Import Project="config.props" />\r
+  <Import Project="..\config.props" />\r
+  <Import Project="..\dirs.props" />\r
   <PropertyGroup Label="Globals">\r
     <ProjectGuid>{BA3DD34C-04B7-40D0-B373-9329AA9E8945}</ProjectGuid>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
-  <Import Project="default.props" />\r
+  <Import Project="$(vsDir)default.props" />\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
-    <Import Project="NetHackProperties.props" />\r
+    <Import Project="$(vsDir)NetHackProperties.props" />\r
   </ImportGroup>\r
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
-    <Import Project="NetHackProperties.props" />\r
+    <Import Project="$(vsDir)NetHackProperties.props" />\r
   </ImportGroup>\r
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
-    <Import Project="NetHackProperties.props" />\r
+    <Import Project="$(vsDir)NetHackProperties.props" />\r
   </ImportGroup>\r
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
-    <Import Project="NetHackProperties.props" />\r
+    <Import Project="$(vsDir)NetHackProperties.props" />\r
   </ImportGroup>\r
-  <Import Project="console.props" />\r
-  <Import Project="common.props" />\r
-  <Import Project="dirs.props" />\r
-  <Import Project="files.props" />\r
+  <Import Project="$(vsDir)console.props" />\r
+  <Import Project="$(vsDir)common.props" />\r
+  <Import Project="$(vsDir)files.props" />\r
   <ItemDefinitionGroup>\r
     <ClCompile>\r
-      <AdditionalIncludeDirectories>$(IncDir);$(SysWinntDir);$(LuaDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>$(IncDir);$(SysWindDir);$(LuaDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32CON;DLB;MSWIN_GRAPHICS;ENUM_PM;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
     </ClCompile>\r
   </ItemDefinitionGroup>\r
   <ItemGroup>\r
-    <ClCompile Include="..\..\..\util\makedefs.c" />\r
-    <ClCompile Include="..\..\..\src\monst.c" />\r
-    <ClCompile Include="..\..\..\src\objects.c" />\r
+    <ClCompile Include="$(RootDir)util\makedefs.c" />\r
+    <ClCompile Include="$(RootDir)src\monst.c" />\r
+    <ClCompile Include="$(RootDir)src\objects.c" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ClInclude Include="..\..\..\include\config.h" />\r
-    <ClInclude Include="..\..\..\include\config1.h" />\r
-    <ClInclude Include="..\..\..\include\context.h" />\r
-    <ClInclude Include="..\..\..\include\coord.h" />\r
-    <ClInclude Include="..\..\..\include\global.h" />\r
-    <ClInclude Include="..\..\..\include\monattk.h" />\r
-    <ClInclude Include="..\..\..\include\monflag.h" />\r
-    <ClInclude Include="..\..\..\include\monsym.h" />\r
-    <ClInclude Include="..\..\..\include\ntconf.h" />\r
-    <ClInclude Include="..\..\..\include\objclass.h" />\r
-    <ClInclude Include="..\..\..\include\patchlevel.h" />\r
-    <ClInclude Include="..\..\..\include\tradstdc.h" />\r
+    <ClInclude Include="$(IncDir)config.h" />\r
+    <ClInclude Include="$(IncDir)config1.h" />\r
+    <ClInclude Include="$(IncDir)context.h" />\r
+    <ClInclude Include="$(IncDir)coord.h" />\r
+    <ClInclude Include="$(IncDir)global.h" />\r
+    <ClInclude Include="$(IncDir)monattk.h" />\r
+    <ClInclude Include="$(IncDir)monflag.h" />\r
+    <ClInclude Include="$(IncDir)monsym.h" />\r
+    <ClInclude Include="$(IncDir)windconf.h" />\r
+    <ClInclude Include="$(IncDir)objclass.h" />\r
+    <ClInclude Include="$(IncDir)patchlevel.h" />\r
+    <ClInclude Include="$(IncDir)tradstdc.h" />\r
   </ItemGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <Target\r
@@ -55,10 +55,10 @@
       Outputs="$(IncDir)\nhlua.h">\r
       <Message Text="Generating $(IncDir)nhlua.h" />\r
        <Exec Command="echo /* nhlua.h - generated by makdefs.vcxproj ClCompile */ &gt; nhlua.h" WorkingDirectory="$(IncDir)"/>\r
-       <Exec Command="echo #include %22../submodules/lua/lua.h%22 &gt;&gt; nhlua.h" WorkingDirectory="$(IncDir)"/>\r
+       <Exec Command="echo #include %22$(SubmodulesDir)lua/lua.h%22 &gt;&gt; nhlua.h" WorkingDirectory="$(IncDir)"/>\r
        <Exec Command="echo LUA_API int (lua_error) (lua_State *L) NORETURN; &gt;&gt; nhlua.h" WorkingDirectory="$(IncDir)"/>\r
-       <Exec Command="echo #include %22../submodules/lua/lualib.h%22 &gt;&gt; nhlua.h" WorkingDirectory="$(IncDir)"/>\r
-       <Exec Command="echo #include %22../submodules/lua/lauxlib.h%22 &gt;&gt; nhlua.h" WorkingDirectory="$(IncDir)"/>\r
+       <Exec Command="echo #include %22$(SubmodulesDir)lua/lualib.h%22 &gt;&gt; nhlua.h" WorkingDirectory="$(IncDir)"/>\r
+       <Exec Command="echo #include %22$(SubmodulesDir)lua/lauxlib.h%22 &gt;&gt; nhlua.h" WorkingDirectory="$(IncDir)"/>\r
        <Exec Command="echo /*nhlua.h*/ &gt;&gt; nhlua.h" WorkingDirectory="$(IncDir)"/>\r
  </Target>\r
   <Target Name="AfterBuild">\r

diff --git a/win/win32/vs/nh340key.def b/sys/windows/vs/nh340key/nh340key.def
similarity index 100%
rename from win/win32/vs/nh340key.def
rename to sys/windows/vs/nh340key/nh340key.def

diff --git a/win/win32/vs/nh340key.vcxproj b/sys/windows/vs/nh340key/nh340key.vcxproj
similarity index 65%
rename from win/win32/vs/nh340key.vcxproj
rename to sys/windows/vs/nh340key/nh340key.vcxproj
index 3f54c336a60f7397db031885d0637736c9950487..663cefd3adef717bb803531d6f7b916da810cb39 100644 (file)
--- a/win/win32/vs/nh340key.vcxproj
+++ b/sys/windows/vs/nh340key/nh340key.vcxproj
@@ -1,36 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <Import Project="config.props" />\r
+  <Import Project="..\dirs.props" />\r
+  <Import Project="$(vsDir)config.props" />\r
   <PropertyGroup Label="Globals">\r
     <ProjectGuid>{BE04E242-A1E9-4593-B95B-057F37330B76}</ProjectGuid>\r
     <Keyword>Win32Proj</Keyword>\r
     <RootNamespace>nh340key</RootNamespace>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
-  <Import Project="default_dll.props" />\r
+  <Import Project="$(vsDir)default_dll.props" />\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
-    <Import Project="NetHackProperties.props" />\r
+    <Import Project="$(vsDir)NetHackProperties.props" />\r
   </ImportGroup>\r
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
-    <Import Project="NetHackProperties.props" />\r
+    <Import Project="$(vsDir)NetHackProperties.props" />\r
   </ImportGroup>\r
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
-    <Import Project="NetHackProperties.props" />\r
+    <Import Project="$(vsDir)NetHackProperties.props" />\r
   </ImportGroup>\r
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
-    <Import Project="NetHackProperties.props" />\r
+    <Import Project="$(vsDir)NetHackProperties.props" />\r
   </ImportGroup>\r
-  <Import Project="dll.props" />\r
-  <Import Project="common.props" />\r
-  <Import Project="dirs.props" />\r
-  <Import Project="files.props" />\r
+  <Import Project="$(vsDir)dll.props" />\r
+  <Import Project="$(vsDir)common.props" />\r
+  <Import Project="$(vsDir)files.props" />\r
   <PropertyGroup>\r
     <OutDir>$(BinDir)</OutDir>\r
   </PropertyGroup>\r
   <ItemDefinitionGroup>\r
     <ClCompile>\r
-      <AdditionalIncludeDirectories>$(IncDir);$(SysWinntDir);$(LuaDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>$(IncDir);$(SysWindDir);$(LuaDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
     </ClCompile>\r
     <Link>\r
       <ImportLibrary>$(ToolsDir)$(TargetName).lib</ImportLibrary>\r
@@ -42,13 +42,13 @@
     </Link>\r
   </ItemDefinitionGroup>\r
   <ItemGroup>\r
-    <ClCompile Include="$(SysWinntDir)nh340key.c" />\r
+    <ClCompile Include="$(SysWindDir)nh340key.c" />\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="$(IncDir)hack.h" />\r
-    <ClInclude Include="$(IncDir)ntconf.h" />\r
+    <ClInclude Include="$(IncDir)windconf.h" />\r
     <ClInclude Include="$(IncDir)wintty.h" />\r
-    <ClInclude Include="$(SysWinntDir)win32api.h" />\r
+    <ClInclude Include="$(SysWindDir)win32api.h" />\r
   </ItemGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
-</Project>
\ No newline at end of file
+</Project>\r

diff --git a/win/win32/vs/nhdefkey.def b/sys/windows/vs/nhdefkey/nhdefkey.def
similarity index 100%
rename from win/win32/vs/nhdefkey.def
rename to sys/windows/vs/nhdefkey/nhdefkey.def

diff --git a/win/win32/vs/nhdefkey.vcxproj b/sys/windows/vs/nhdefkey/nhdefkey.vcxproj
similarity index 65%
rename from win/win32/vs/nhdefkey.vcxproj
rename to sys/windows/vs/nhdefkey/nhdefkey.vcxproj
index 3201aa79f24bb7087bd05657327cd428db086729..4af518c60f8d844ae7e596e3390ee2265feaa14f 100644 (file)
--- a/win/win32/vs/nhdefkey.vcxproj
+++ b/sys/windows/vs/nhdefkey/nhdefkey.vcxproj
@@ -1,36 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <Import Project="config.props" />\r
+  <Import Project="..\dirs.props" />\r
+  <Import Project="$(vsDir)config.props" />\r
   <PropertyGroup Label="Globals">\r
     <ProjectGuid>{6813477F-64B6-4B97-B230-438D0D233385}</ProjectGuid>\r
     <Keyword>Win32Proj</Keyword>\r
     <RootNamespace>nhdefkey</RootNamespace>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
-  <Import Project="default_dll.props" />\r
+  <Import Project="$(vsDir)default_dll.props" />\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
-    <Import Project="NetHackProperties.props" />\r
+    <Import Project="$(vsDir)NetHackProperties.props" />\r
   </ImportGroup>\r
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
-    <Import Project="NetHackProperties.props" />\r
+    <Import Project="$(vsDir)NetHackProperties.props" />\r
   </ImportGroup>\r
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
-    <Import Project="NetHackProperties.props" />\r
+    <Import Project="$(vsDir)NetHackProperties.props" />\r
   </ImportGroup>\r
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
-    <Import Project="NetHackProperties.props" />\r
+    <Import Project="$(vsDir)NetHackProperties.props" />\r
   </ImportGroup>\r
-  <Import Project="dll.props" />\r
-  <Import Project="common.props" />\r
-  <Import Project="dirs.props" />\r
-  <Import Project="files.props" />\r
+  <Import Project="$(vsDir)dll.props" />\r
+  <Import Project="$(vsDir)common.props" />\r
+  <Import Project="$(vsDir)files.props" />\r
   <PropertyGroup>\r
     <OutDir>$(BinDir)</OutDir>\r
   </PropertyGroup>\r
   <ItemDefinitionGroup>\r
     <ClCompile>\r
-      <AdditionalIncludeDirectories>$(IncDir);$(SysWinntDir);$(LuaDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>$(IncDir);$(SysWindDir);$(LuaDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
     </ClCompile>\r
     <Link>\r
       <ImportLibrary>$(ToolsDir)$(TargetName).lib</ImportLibrary>\r
@@ -42,13 +42,13 @@
     </Link>\r
   </ItemDefinitionGroup>\r
   <ItemGroup>\r
-    <ClCompile Include="$(SysWinntDir)nhdefkey.c" />\r
+    <ClCompile Include="$(SysWindDir)nhdefkey.c" />\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="$(IncDir)hack.h" />\r
-    <ClInclude Include="$(IncDir)ntconf.h" />\r
+    <ClInclude Include="$(IncDir)windconf.h" />\r
     <ClInclude Include="$(IncDir)wintty.h" />\r
-    <ClInclude Include="$(SysWinntDir)win32api.h" />\r
+    <ClInclude Include="$(SysWindDir)win32api.h" />\r
   </ItemGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
-</Project>
\ No newline at end of file
+</Project>\r

diff --git a/win/win32/vs/nhraykey.def b/sys/windows/vs/nhraykey/nhraykey.def
similarity index 100%
rename from win/win32/vs/nhraykey.def
rename to sys/windows/vs/nhraykey/nhraykey.def

diff --git a/win/win32/vs/nhraykey.vcxproj b/sys/windows/vs/nhraykey/nhraykey.vcxproj
similarity index 65%
rename from win/win32/vs/nhraykey.vcxproj
rename to sys/windows/vs/nhraykey/nhraykey.vcxproj
index e37c6a4265398dd576f80b3124b115547f4c0581..788fb490a3f6e013b520d331e3d2310472e7228b 100644 (file)
--- a/win/win32/vs/nhraykey.vcxproj
+++ b/sys/windows/vs/nhraykey/nhraykey.vcxproj
@@ -1,36 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <Import Project="config.props" />\r
+  <Import Project="..\dirs.props" />\r
+  <Import Project="$(vsDir)config.props" />\r
   <PropertyGroup Label="Globals">\r
     <ProjectGuid>{2E1F4BB3-3BD7-43AD-8E64-D3B8A2F5D7B2}</ProjectGuid>\r
     <Keyword>Win32Proj</Keyword>\r
     <RootNamespace>nhraykey</RootNamespace>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
-  <Import Project="default_dll.props" />\r
+  <Import Project="$(vsDir)default_dll.props" />\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
-    <Import Project="NetHackProperties.props" />\r
+    <Import Project="$(vsDir)NetHackProperties.props" />\r
   </ImportGroup>\r
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
-    <Import Project="NetHackProperties.props" />\r
+    <Import Project="$(vsDir)NetHackProperties.props" />\r
   </ImportGroup>\r
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
-    <Import Project="NetHackProperties.props" />\r
+    <Import Project="$(vsDir)NetHackProperties.props" />\r
   </ImportGroup>\r
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
-    <Import Project="NetHackProperties.props" />\r
+    <Import Project="$(vsDir)NetHackProperties.props" />\r
   </ImportGroup>\r
-  <Import Project="dll.props" />\r
-  <Import Project="common.props" />\r
-  <Import Project="dirs.props" />\r
-  <Import Project="files.props" />\r
+  <Import Project="$(vsDir)dll.props" />\r
+  <Import Project="$(vsDir)common.props" />\r
+  <Import Project="$(vsDir)files.props" />\r
   <PropertyGroup>\r
     <OutDir>$(BinDir)</OutDir>\r
   </PropertyGroup>\r
   <ItemDefinitionGroup>\r
     <ClCompile>\r
-      <AdditionalIncludeDirectories>$(IncDir);$(SysWinntDir);$(LuaDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>$(IncDir);$(SysWindDir);$(LuaDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
     </ClCompile>\r
     <Link>\r
       <ImportLibrary>$(ToolsDir)$(TargetName).lib</ImportLibrary>\r
@@ -42,13 +42,13 @@
     </Link>\r
   </ItemDefinitionGroup>\r
   <ItemGroup>\r
-    <ClCompile Include="$(SysWinntDir)nhraykey.c" />\r
+    <ClCompile Include="$(SysWindDir)nhraykey.c" />\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="$(IncDir)hack.h" />\r
-    <ClInclude Include="$(IncDir)ntconf.h" />\r
+    <ClInclude Include="$(IncDir)windconf.h" />\r
     <ClInclude Include="$(IncDir)wintty.h" />\r
-    <ClInclude Include="$(SysWinntDir)win32api.h" />\r
+    <ClInclude Include="$(SysWindDir)win32api.h" />\r
   </ItemGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
-</Project>
\ No newline at end of file
+</Project>\r

diff --git a/win/win32/vs/afterrecover.proj b/sys/windows/vs/recover/afterrecover.proj
similarity index 81%
rename from win/win32/vs/afterrecover.proj
rename to sys/windows/vs/recover/afterrecover.proj
index 46ab13a5570d9738498e9634d045c22d3a605855..d9e52e3c4acd250c6f82612299345f922cf13c11 100644 (file)
--- a/win/win32/vs/afterrecover.proj
+++ b/sys/windows/vs/recover/afterrecover.proj
@@ -1,6 +1,6 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="dirs.props"/>
-  <Import Project="files.props"/>
+  <Import Project="..\dirs.props"/>
+  <Import Project="$(vsDir)files.props"/>
   <Target Name="Build"
      Inputs="$(DocDir)recover.txt"
         Outputs="$(BinDir)recover.txt">

diff --git a/win/win32/vs/recover.vcxproj b/sys/windows/vs/recover/recover.vcxproj
similarity index 71%
rename from win/win32/vs/recover.vcxproj
rename to sys/windows/vs/recover/recover.vcxproj
index 27828e5ecb323fae43939ffc2220aeb4e99972bc..26f3f2d8458abc3998b44eb4510f718330648611 100644 (file)
--- a/win/win32/vs/recover.vcxproj
+++ b/sys/windows/vs/recover/recover.vcxproj
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <Import Project="config.props" />\r
+  <Import Project="..\dirs.props" />\r
+  <Import Project="$(vsDir)config.props" />\r
   <PropertyGroup Label="Globals">\r
     <ProjectGuid>{2F35F228-6733-4FE5-9B46-B3AA10D4BC2E}</ProjectGuid>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
-  <Import Project="default.props" />\r
+  <Import Project="$(vsDir)default.props" />\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
-  <Import Project="NetHackProperties.props" />\r
-  <Import Project="console.props" />\r
-  <Import Project="common.props" />\r
-  <Import Project="dirs.props" />\r
-  <Import Project="files.props" />\r
+  <Import Project="$(vsDir)NetHackProperties.props" />\r
+  <Import Project="$(vsDir)console.props" />\r
+  <Import Project="$(vsDir)common.props" />\r
+  <Import Project="$(vsDir)files.props" />\r
   <PropertyGroup>\r
     <OutDir>$(BinDir)</OutDir>\r
   </PropertyGroup>\r
   <ItemDefinitionGroup>\r
     <ClCompile>\r
-      <AdditionalIncludeDirectories>$(IncDir);$(SysWinntDir);$(LuaDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>$(IncDir);$(SysWindDir);$(LuaDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32CON;DLB;MSWIN_GRAPHICS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
     </ClCompile>\r
   </ItemDefinitionGroup>\r
@@ -29,9 +29,9 @@
     <ClInclude Include="$(IncDir)config1.h" />\r
     <ClInclude Include="$(IncDir)coord.h" />\r
     <ClInclude Include="$(IncDir)global.h" />\r
-    <ClInclude Include="$(IncDir)ntconf.h" />\r
+    <ClInclude Include="$(IncDir)windconf.h" />\r
     <ClInclude Include="$(IncDir)tradstdc.h" />\r
-    <ClInclude Include="$(SysWinntDir)win32api.h" />\r
+    <ClInclude Include="$(SysWindDir)win32api.h" />\r
   </ItemGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <Target Name="AfterBuild">\r
@@ -43,4 +43,4 @@
   <Target Name="AfterRebuild">\r
     <MSBuild Projects="afterrecover.proj" Targets="Build" Properties="Configuration=$(Configuration)" />\r
   </Target>\r
-</Project>
\ No newline at end of file
+</Project>\r

diff --git a/win/win32/vs/aftertile2bmp.proj b/sys/windows/vs/tile2bmp/aftertile2bmp.proj
similarity index 86%
rename from win/win32/vs/aftertile2bmp.proj
rename to sys/windows/vs/tile2bmp/aftertile2bmp.proj
index 5fd6d13b0dc14094d881cfecca2cf4dbdbae9116..0d7525d5f34dd94b3121fa7eddfa914c9d1297bc 100644 (file)
--- a/win/win32/vs/aftertile2bmp.proj
+++ b/sys/windows/vs/tile2bmp/aftertile2bmp.proj
@@ -1,6 +1,6 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="dirs.props"/>
-  <Import Project="files.props"/>
+  <Import Project="..\dirs.props"/>
+  <Import Project="$(vsDir)files.props"/>
   <Target Name="Build"
      Inputs="$(ToolsDir)tile2bmp.exe;$(WinShareDir)monsters.txt;$(WinShareDir)objects.txt"
         Outputs="$(WinWin32Dir)tiles.bmp">

diff --git a/win/win32/vs/tile2bmp.vcxproj b/sys/windows/vs/tile2bmp/tile2bmp.vcxproj
similarity index 74%
rename from win/win32/vs/tile2bmp.vcxproj
rename to sys/windows/vs/tile2bmp/tile2bmp.vcxproj
index 372e3a02bbc0434dcc331f188061f586472d248c..4cb7d6472175eb0664850820f4442886113f6c41 100644 (file)
--- a/win/win32/vs/tile2bmp.vcxproj
+++ b/sys/windows/vs/tile2bmp/tile2bmp.vcxproj
@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <Import Project="config.props" />\r
+  <Import Project="..\dirs.props" />\r
+  <Import Project="$(vsDir)config.props" />\r
   <PropertyGroup Label="Globals">\r
     <ProjectGuid>{642BC75D-ABAF-403E-8224-7C725FD4CB42}</ProjectGuid>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
-  <Import Project="default.props" />\r
+  <Import Project="$(vsDir)default.props" />\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
-    <Import Project="NetHackProperties.props" />\r
+    <Import Project="$(vsDir)NetHackProperties.props" />\r
   </ImportGroup>\r
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
-    <Import Project="NetHackProperties.props" />\r
+    <Import Project="$(vsDir)NetHackProperties.props" />\r
   </ImportGroup>\r
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
-    <Import Project="NetHackProperties.props" />\r
+    <Import Project="$(vsDir)NetHackProperties.props" />\r
   </ImportGroup>\r
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
-    <Import Project="NetHackProperties.props" />\r
+    <Import Project="$(vsDir)NetHackProperties.props" />\r
   </ImportGroup>\r
-  <Import Project="console.props" />\r
-  <Import Project="common.props" />\r
-  <Import Project="dirs.props" />\r
-  <Import Project="files.props" />\r
+  <Import Project="$(vsDir)console.props" />\r
+  <Import Project="$(vsDir)common.props" />\r
+  <Import Project="$(vsDir)files.props" />\r
   <ItemDefinitionGroup>\r
     <ClCompile>\r
-      <AdditionalIncludeDirectories>$(IncDir);$(SysWinntDir);$(SysShareDir);$(LuaDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>$(IncDir);$(SysWindDir);$(SysShareDir);$(LuaDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32CON;DLB;MSWIN_GRAPHICS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
     </ClCompile>\r
   </ItemDefinitionGroup>\r

diff --git a/win/win32/vs/aftertilemap.proj b/sys/windows/vs/tilemap/aftertilemap.proj
similarity index 81%
rename from win/win32/vs/aftertilemap.proj
rename to sys/windows/vs/tilemap/aftertilemap.proj
index e576f8b8909c9224a538a60e678783a01442d056..a8795e96a838398ccfb51d96424dd13896dcc8e2 100644 (file)
--- a/win/win32/vs/aftertilemap.proj
+++ b/sys/windows/vs/tilemap/aftertilemap.proj
@@ -1,6 +1,6 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="dirs.props"/>
-  <Import Project="files.props"/>
+  <Import Project="..\dirs.props"/>
+  <Import Project="$(vsDir)files.props"/>
   <Target Name="Build"
      Inputs="$(ToolsDir)tilemap.exe"
         Outputs="$(SrcDir)tile.c">

diff --git a/win/win32/vs/tilemap.vcxproj b/sys/windows/vs/tilemap/tilemap.vcxproj
similarity index 82%
rename from win/win32/vs/tilemap.vcxproj
rename to sys/windows/vs/tilemap/tilemap.vcxproj
index 8ab1ab1db80db9d5ff94fc1cd0d6812027706e84..7e884d08ed6eaec85225a3172f3fac30b798b2ea 100644 (file)
--- a/win/win32/vs/tilemap.vcxproj
+++ b/sys/windows/vs/tilemap/tilemap.vcxproj
@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <Import Project="config.props" />\r
+  <Import Project="..\dirs.props" />\r
+  <Import Project="$(vsDir)config.props" />\r
   <PropertyGroup Label="Globals">\r
     <ProjectGuid>{93F10526-209E-41D7-BBEA-775787876895}</ProjectGuid>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
-  <Import Project="default.props" />\r
+  <Import Project="$(vsDir)default.props" />\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
-    <Import Project="NetHackProperties.props" />\r
+    <Import Project="$(vsDir)NetHackProperties.props" />\r
   </ImportGroup>\r
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
-    <Import Project="NetHackProperties.props" />\r
+    <Import Project="$(vsDir)NetHackProperties.props" />\r
   </ImportGroup>\r
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
-    <Import Project="NetHackProperties.props" />\r
+    <Import Project="$(vsDir)NetHackProperties.props" />\r
   </ImportGroup>\r
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
-    <Import Project="NetHackProperties.props" />\r
+    <Import Project="$(vsDir)NetHackProperties.props" />\r
   </ImportGroup>\r
-  <Import Project="console.props" />\r
-  <Import Project="common.props" />\r
-  <Import Project="dirs.props" />\r
-  <Import Project="files.props" />\r
+  <Import Project="$(vsDir)console.props" />\r
+  <Import Project="$(vsDir)common.props" />\r
+  <Import Project="$(vsDir)files.props" />\r
   <ItemDefinitionGroup>\r
     <ClCompile>\r
-      <AdditionalIncludeDirectories>$(IncDir);$(SysWinntDir);$(SysShareDir);$(LuaDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>$(IncDir);$(SysWindDir);$(SysShareDir);$(LuaDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32CON;DLB;MSWIN_GRAPHICS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
     </ClCompile>\r
   </ItemDefinitionGroup>\r
@@ -52,7 +52,7 @@
     <ClInclude Include="$(IncDir)monattk.h" />\r
     <ClInclude Include="$(IncDir)monst.h" />\r
     <ClInclude Include="$(IncDir)monsym.h" />\r
-    <ClInclude Include="$(IncDir)ntconf.h" />\r
+    <ClInclude Include="$(IncDir)windconf.h" />\r
     <ClInclude Include="$(IncDir)obj.h" />\r
     <ClInclude Include="$(IncDir)objclass.h" />\r
     <ClInclude Include="$(IncDir)onames.h" />\r

diff --git a/win/win32/vs/tiles.vcxproj b/sys/windows/vs/tiles/tiles.vcxproj
similarity index 95%
rename from win/win32/vs/tiles.vcxproj
rename to sys/windows/vs/tiles/tiles.vcxproj
index f17bd023f71e1e43a5f45eec9a43dafc44c88999..e6b52ad7884cfc7cb4fa94d167670e0d0458d148 100644 (file)
--- a/win/win32/vs/tiles.vcxproj
+++ b/sys/windows/vs/tiles/tiles.vcxproj
@@ -1,124 +1,124 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{55946465-FC65-47B3-BB48-742C7694C0D6}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\util\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\..\util\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\Debug\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">nmake /f "tiles.mak"</NMakeBuildCommandLine>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">nmake /f "tiles.mak"</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">nmake /f "tiles.mak" /a</NMakeReBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">nmake /f "tiles.mak" /a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <NMakeOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\win\win32\tiles.bmp</NMakeOutput>
-    <NMakeOutput Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\win\win32\tiles.bmp</NMakeOutput>
-    <NMakePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
-    <NMakePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
-    <NMakeIncludeSearchPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
-    <NMakeIncludeSearchPath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
-    <NMakeForcedIncludes Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(NMakeForcedIncludes)</NMakeForcedIncludes>
-    <NMakeForcedIncludes Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(NMakeForcedIncludes)</NMakeForcedIncludes>
-    <NMakeAssemblySearchPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(NMakeAssemblySearchPath)</NMakeAssemblySearchPath>
-    <NMakeAssemblySearchPath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(NMakeAssemblySearchPath)</NMakeAssemblySearchPath>
-    <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
-    <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\util\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\..\util\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\Release\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">nmake /f "tiles.mak"</NMakeBuildCommandLine>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">nmake /f "tiles.mak"</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">nmake /f "tiles.mak" /a</NMakeReBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">nmake /f "tiles.mak" /a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <NMakeOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\win\win32\tiles.bmp</NMakeOutput>
-    <NMakeOutput Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\win\win32\tiles.bmp</NMakeOutput>
-    <NMakePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
-    <NMakePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
-    <NMakeIncludeSearchPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
-    <NMakeIncludeSearchPath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
-    <NMakeForcedIncludes Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeForcedIncludes)</NMakeForcedIncludes>
-    <NMakeForcedIncludes Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(NMakeForcedIncludes)</NMakeForcedIncludes>
-    <NMakeAssemblySearchPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeAssemblySearchPath)</NMakeAssemblySearchPath>
-    <NMakeAssemblySearchPath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(NMakeAssemblySearchPath)</NMakeAssemblySearchPath>
-    <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
-    <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ProjectReference Include="tile2bmp.vcxproj">
-      <Project>{642bc75d-abaf-403e-8224-7c725fd4cb42}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|Win32">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Debug|x64">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>x64</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|Win32">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|x64">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>x64</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{55946465-FC65-47B3-BB48-742C7694C0D6}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseOfMfc>false</UseOfMfc>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseOfMfc>false</UseOfMfc>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseOfMfc>false</UseOfMfc>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseOfMfc>false</UseOfMfc>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup>\r
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(RootDir)util\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(RootDir)util\</OutDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</IntDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\Debug\</IntDir>\r
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">nmake /f "tiles.mak"</NMakeBuildCommandLine>\r
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">nmake /f "tiles.mak"</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">nmake /f "tiles.mak" /a</NMakeReBuildCommandLine>\r
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">nmake /f "tiles.mak" /a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />\r
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />\r
+    <NMakeOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(RootDir)win\win32\tiles.bmp</NMakeOutput>\r
+    <NMakeOutput Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(RootDir)win\win32\tiles.bmp</NMakeOutput>\r
+    <NMakePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>\r
+    <NMakePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>\r
+    <NMakeIncludeSearchPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>\r
+    <NMakeIncludeSearchPath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>\r
+    <NMakeForcedIncludes Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(NMakeForcedIncludes)</NMakeForcedIncludes>\r
+    <NMakeForcedIncludes Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(NMakeForcedIncludes)</NMakeForcedIncludes>\r
+    <NMakeAssemblySearchPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(NMakeAssemblySearchPath)</NMakeAssemblySearchPath>\r
+    <NMakeAssemblySearchPath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(NMakeAssemblySearchPath)</NMakeAssemblySearchPath>\r
+    <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>\r
+    <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(RootDir)util\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(RootDir)util\</OutDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</IntDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\Release\</IntDir>\r
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">nmake /f "tiles.mak"</NMakeBuildCommandLine>\r
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">nmake /f "tiles.mak"</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">nmake /f "tiles.mak" /a</NMakeReBuildCommandLine>\r
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">nmake /f "tiles.mak" /a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />\r
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />\r
+    <NMakeOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(RootDir)win\win32\tiles.bmp</NMakeOutput>\r
+    <NMakeOutput Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(RootDir)win\win32\tiles.bmp</NMakeOutput>\r
+    <NMakePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>\r
+    <NMakePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>\r
+    <NMakeIncludeSearchPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>\r
+    <NMakeIncludeSearchPath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>\r
+    <NMakeForcedIncludes Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeForcedIncludes)</NMakeForcedIncludes>\r
+    <NMakeForcedIncludes Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(NMakeForcedIncludes)</NMakeForcedIncludes>\r
+    <NMakeAssemblySearchPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeAssemblySearchPath)</NMakeAssemblySearchPath>\r
+    <NMakeAssemblySearchPath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(NMakeAssemblySearchPath)</NMakeAssemblySearchPath>\r
+    <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>\r
+    <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <ProjectReference Include="tile2bmp.vcxproj">\r
+      <Project>{642bc75d-abaf-403e-8224-7c725fd4cb42}</Project>\r
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>\r
+    </ProjectReference>\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>\r

diff --git a/win/win32/vs/travisci.sh b/sys/windows/vs/travisci.sh
similarity index 98%
rename from win/win32/vs/travisci.sh
rename to sys/windows/vs/travisci.sh
index cb56619d883d820e3363ab6af480fbcabaf39257..5d530395f545ec3da05a1b0ccf4767b38cbeabbd 100644 (file)
--- a/win/win32/vs/travisci.sh
+++ b/sys/windows/vs/travisci.sh
@@ -43,7 +43,7 @@ export ADD_CURSES=Y
 export PDCURSES_TOP=../lib/pdcurses
 export
 cd src
-cp ../sys/winnt/Makefile.msc ./Makefile
+cp ../sys/windows/Makefile.msc ./Makefile
 nmake install
 cd ..
 powershell -Command "Compress-Archive -U -Path binary/* -DestinationPath $TRAVIS_TAG.x86.zip"

diff --git a/win/win32/vs/afteruudecode.proj b/sys/windows/vs/uudecode/afteruudecode.proj
similarity index 90%
rename from win/win32/vs/afteruudecode.proj
rename to sys/windows/vs/uudecode/afteruudecode.proj
index 7f81188ae3c36d5b8b2d0044a30b669e0652517a..dbfdf604ee2b8303f93b2fa0d1e3b10d27988ed6 100644 (file)
--- a/win/win32/vs/afteruudecode.proj
+++ b/sys/windows/vs/uudecode/afteruudecode.proj
@@ -1,10 +1,10 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="dirs.props"/>
-  <Import Project="files.props"/>
+  <Import Project="..\dirs.props"/>
+  <Import Project="$(vsDir)files.props"/>
   <Target Name="Build"
      Inputs="$(ToolsDir)uudecode.exe;@(UUFiles)"
         Outputs="@(IconFiles);@(BmpFiles);@(RecordFiles)">
-       <Exec Command="&quot;$(ToolsDir)uudecode.exe&quot; &quot;$(SysWinntDir)nhico.uu&quot;" WorkingDirectory="$(WinWin32Dir)"/>
+       <Exec Command="&quot;$(ToolsDir)uudecode.exe&quot; &quot;$(SysWindDir)nhico.uu&quot;" WorkingDirectory="$(WinWin32Dir)"/>
        <Exec Command="&quot;$(ToolsDir)uudecode.exe&quot; &quot;$(WinWin32Dir)mnsel.uu&quot;" WorkingDirectory="$(WinWin32Dir)"/>
        <Exec Command="&quot;$(ToolsDir)uudecode.exe&quot; &quot;$(WinWin32Dir)mnselcnt.uu&quot;" WorkingDirectory="$(WinWin32Dir)"/>
        <Exec Command="&quot;$(ToolsDir)uudecode.exe&quot; &quot;$(WinWin32Dir)mnunsel.uu&quot;" WorkingDirectory="$(WinWin32Dir)"/>

diff --git a/win/win32/vs/uudecode.vcxproj b/sys/windows/vs/uudecode/uudecode.vcxproj
similarity index 77%
rename from win/win32/vs/uudecode.vcxproj
rename to sys/windows/vs/uudecode/uudecode.vcxproj
index e2aa05c7e767a94216300c81ed968001c7a13b59..e01a6973891a18f719d2933d907f712cadf3e8b2 100644 (file)
--- a/win/win32/vs/uudecode.vcxproj
+++ b/sys/windows/vs/uudecode/uudecode.vcxproj
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <Import Project="config.props" />\r
+  <Import Project="..\dirs.props" />\r
+  <Import Project="$(vsDir)config.props" />\r
   <PropertyGroup Label="Globals">\r
     <ProjectGuid>{63F9B82B-F589-4082-ABE5-D4F0682050AB}</ProjectGuid>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
-  <Import Project="default.props" />\r
+  <Import Project="$(vsDir)default.props" />\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
-    <Import Project="NetHackProperties.props" />\r
+    <Import Project="$(vsDir)NetHackProperties.props" />\r
   </ImportGroup>\r
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
-    <Import Project="NetHackProperties.props" />\r
+    <Import Project="$(vsDir)NetHackProperties.props" />\r
   </ImportGroup>\r
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
-    <Import Project="NetHackProperties.props" />\r
+    <Import Project="$(vsDir)NetHackProperties.props" />\r
   </ImportGroup>\r
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
-    <Import Project="NetHackProperties.props" />\r
+    <Import Project="$(vsDir)NetHackProperties.props" />\r
   </ImportGroup>\r
-  <Import Project="console.props" />\r
-  <Import Project="common.props" />\r
-  <Import Project="dirs.props" />\r
-  <Import Project="files.props" />\r
+  <Import Project="$(vsDir)console.props" />\r
+  <Import Project="$(vsDir)common.props" />\r
+  <Import Project="$(vsDir)files.props" />\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <ClCompile>\r
       <AdditionalIncludeDirectories>$(IncDir)</AdditionalIncludeDirectories>\r
@@ -46,4 +46,4 @@
   <Target Name="AfterRebuild">\r
     <MSBuild Projects="afteruudecode.proj" Targets="Build" Properties="Configuration=$(Configuration)" />\r
   </Target>\r
-</Project>
\ No newline at end of file
+</Project>\r

diff --git a/sys/winnt/win10.c b/sys/windows/win10.c
similarity index 100%
rename from sys/winnt/win10.c
rename to sys/windows/win10.c

diff --git a/sys/winnt/win10.h b/sys/windows/win10.h
similarity index 100%
rename from sys/winnt/win10.h
rename to sys/windows/win10.h

diff --git a/sys/winnt/win32api.h b/sys/windows/win32api.h
similarity index 100%
rename from sys/winnt/win32api.h
rename to sys/windows/win32api.h

diff --git a/sys/winnt/windmain.c b/sys/windows/windmain.c
similarity index 99%
rename from sys/winnt/windmain.c
rename to sys/windows/windmain.c
index 7b2ba200b46bb18bcb402e46bfad2ebb37610085..6259402197778a741a1f37c45c6acb6e52dbf8cc 100644 (file)
--- a/sys/winnt/windmain.c
+++ b/sys/windows/windmain.c
@@ -528,7 +528,7 @@ _CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDERR);*/
     if (WINDOWPORT("mswin"))
         iflags.use_background_glyph = TRUE;
     if (WINDOWPORT("tty"))
-        nttty_open(1);
+        consoletty_open(1);
 
     init_nhwindows(&argc, argv);
 

diff --git a/sys/winnt/winnt.c b/sys/windows/windsys.c
similarity index 98%
rename from sys/winnt/winnt.c
rename to sys/windows/windsys.c
index 45ececc754f9c1f479db3280533872c16d0f565e..af507217514d2ea29f48952618ba436643f88c19 100644 (file)
--- a/sys/winnt/winnt.c
+++ b/sys/windows/windsys.c
@@ -1,4 +1,4 @@
-/* NetHack 3.7 winnt.c $NHDT-Date: 1596498321 2020/08/03 23:45:21 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.64 $ */
+/* NetHack 3.7 windows.c       $NHDT-Date: 1596498321 2020/08/03 23:45:21 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.64 $ */
 /* Copyright (c) NetHack PC Development Team 1993, 1994 */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -59,7 +59,7 @@ extern void safe_routines(void);
 
 /* The function pointer nt_kbhit contains a kbhit() equivalent
  * which varies depending on which window port is active.
- * For the tty port it is tty_kbhit() [from nttty.c]
+ * For the tty port it is tty_kbhit() [from consoletty.c]
  * For the win32 port it is win32_kbhit() [from winmain.c]
  * It is initialized to point to def_kbhit [in here] for safety.
  */
@@ -475,7 +475,7 @@ nethack_exit(int code)
     /* Only if we started from the GUI, not the command prompt,
      * we need to get one last return, so the score board does
      * not vanish instantly after being created.
-     * GUILaunched is defined and set in nttty.c.
+     * GUILaunched is defined and set in consoletty.c.
      */
 
 
@@ -518,12 +518,12 @@ getreturn(const char *str)
     return;
 }
 
-/* nethack_enter_winnt() is called from main immediately after
+/* nethack_enter_windows() is called from main immediately after
    initializing the window port */
-void nethack_enter_winnt(void)
+void nethack_enter_windows(void)
 {
        if (WINDOWPORT("tty"))
-               nethack_enter_nttty();
+               nethack_enter_consoletty();
 }
 
 /* CP437 to Unicode mapping according to the Unicode Consortium */
@@ -724,4 +724,4 @@ nt_assert_failed(const char *expression, const char *filepath, int line)
 
 #endif /* WIN32 */
 
-/*winnt.c*/
+/*windows.c*/

diff --git a/sys/winnt/winos.h b/sys/windows/winos.h
similarity index 100%
rename from sys/winnt/winos.h
rename to sys/windows/winos.h

diff --git a/util/mdgrep.h b/util/mdgrep.h
index dfdd9790f271c1b69cc887dcac861c7c2cdbf4db..66fd6d1b1afdd5a308e36ec480897b91075f51d5 100644 (file)
--- a/util/mdgrep.h
+++ b/util/mdgrep.h
@@ -230,11 +230,6 @@ static struct grep_var grep_vars[] = { { "0", 0 },
 #else
                                        { "WIN32_PLATFORM_WFSP", 0 },
 #endif
-#if defined(WINNT)
-                                       { "WINNT", 1 },
-#else
-                                       { "WINNT", 0 },
-#endif
 #if defined(WIN_CE)
                                        { "WIN_CE", 1 },
 #else

diff --git a/win/curses/Readme.txt b/win/curses/Readme.txt
index f9c95fdefd5a7018c299c005c62da9226f60c1d1..3affac2271ed3cbcb35fa2180a1ff21d9facfa37 100644 (file)
--- a/win/curses/Readme.txt
+++ b/win/curses/Readme.txt
@@ -30,8 +30,8 @@ against ncurses.  Edit Makefile.src if you wish to compile against a
 different curses library, such as PDCurses for SDL.
 
 Windows build instructions: If you are using Mingw32 as your compiler,
-then follow the instructions in sys/winnt/Install.nt with the following
-changes:
+then follow the instructions in sys/windows/Install.windows with the
+following changes:
 
  * After running nhsetup, manually copy the file cursmake.gcc to the
  src/ subdirectory

diff --git a/win/tty/wintty.c b/win/tty/wintty.c
index 643544b8ebac140f75c6770f5a1402e0c21945e7..d9c0ef21d69d02fadfb44d4f2f9a7cf0208993b7 100644 (file)
--- a/win/tty/wintty.c
+++ b/win/tty/wintty.c
@@ -475,7 +475,7 @@ tty_preference_update(const char *pref)
     }
 
 #if defined(WIN32)
-    nttty_preference_update(pref);
+    consoletty_preference_update(pref);
 #else
     genl_preference_update(pref);
 #endif
@@ -1430,7 +1430,7 @@ tty_exit_nhwindows(const char *str)
     tty_shutdown(); /* cleanup termcap/terminfo/whatever */
 #endif
 #ifdef WIN32
-    nttty_exit();
+    consoletty_exit();
 #endif
     iflags.window_inited = 0;
 }
@@ -3566,7 +3566,7 @@ tty_nh_poskey(int *x UNUSED, int *y UNUSED, int *mod UNUSED)
      */
     if (WIN_MESSAGE != WIN_ERR && wins[WIN_MESSAGE])
         wins[WIN_MESSAGE]->flags &= ~WIN_STOP;
-    i = ntposkey(x, y, mod);
+    i = console_poskey(x, y, mod);
     if (!i && mod && (*mod == 0 || *mod == EOF))
         i = '\033'; /* map NUL or EOF to ESC, nethack doesn't expect either */
     /* topline has been seen - we can clear need for more */

diff --git a/win/win32/mhmap.c b/win/win32/mhmap.c
index 71fdf5533e68641a904497a2e98c45fd3dddecb8..0af2b05dc32cd7acab9085bd2252078e33971429 100644 (file)
--- a/win/win32/mhmap.c
+++ b/win/win32/mhmap.c
@@ -93,7 +93,7 @@ static void clearAll(PNHMapWindow data);
 #if (VERSION_MAJOR < 4) && (VERSION_MINOR < 4) && (PATCHLEVEL < 2)
 static void nhglyph2charcolor(short glyph, uchar *ch, int *color);
 #endif
-extern boolean win32_cursorblink;       /* from sys\winnt\winnt.c */
+extern boolean win32_cursorblink;       /* from sys\windows\windsys.c */
 
 HWND
 mswin_init_map_window(void)