From: nhmall Date: Thu, 3 Jun 2021 16:14:27 +0000 (-0400) Subject: change references from winnt to windows X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0a10bd632df954d686df21cf3e2517c90ff20062;p=nethack 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 76785f4c2..10b0c8d7a 100644 --- 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 cd293ce98..8805a01f5 100644 --- 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 5b6e7e3ac..a0501850b 100644 --- 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 791720470..07b6e0651 100644 --- 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 222b7ba9b..90e33f3be 100644 --- 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 043aa4849..4dadc0f09 100644 --- 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 9bd043571..26f203ac2 100644 --- 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 ffabf95a4..5c7e74b16 100644 --- 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 b1aa1d5fc..e93c5e208 100644 --- 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 f6ca4494e..30ec66d84 100644 --- 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 = ""; }; 3186A39721A4B0FC0052BF02 /* rm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = rm.h; path = ../../include/rm.h; sourceTree = ""; }; 3186A39A21A4B0FD0052BF02 /* wintty.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = wintty.h; path = ../../include/wintty.h; sourceTree = ""; }; - 3186A39B21A4B0FD0052BF02 /* ntconf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ntconf.h; path = ../../include/ntconf.h; sourceTree = ""; }; + 3186A39B21A4B0FD0052BF02 /* windconf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = windconf.h; path = ../../include/windconf.h; sourceTree = ""; }; 3186A39C21A4B0FD0052BF02 /* mkroom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mkroom.h; path = ../../include/mkroom.h; sourceTree = ""; }; 3186A39E21A4B0FD0052BF02 /* quest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = quest.h; path = ../../include/quest.h; sourceTree = ""; }; 3186A3A021A4B0FD0052BF02 /* dgn_file.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dgn_file.h; path = ../../include/dgn_file.h; sourceTree = ""; }; @@ -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 3bd3b5a13..2c16a5e18 100644 --- 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 080cb5ef6..1060c43ff 100644 --- 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 d52abfcb5..44a8b1e17 100644 --- 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 4bc4d29be..c7b0ff133 100644 --- 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 aefea272b..4532a9c73 100644 --- 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 8751c7fad..dfd049ad9 100644 --- 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 2245dd048..c27409e6e 100644 --- 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 7f65ac88f..40e3fba19 100755 --- 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 ea9413a81..0830a7468 100644 --- 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 c4775b3c5..ced2d32bd 100644 --- 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 5d7fdde7a..b2e237095 100644 --- 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 VisualStudioVersion = 15.0.26730.12 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NetHackW", "NetHackW.vcxproj", "{CEC5D360-8804-454F-8591-002184C23499}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NetHackW", "NetHackW\NetHackW.vcxproj", "{CEC5D360-8804-454F-8591-002184C23499}" ProjectSection(ProjectDependencies) = postProject {93F10526-209E-41D7-BBEA-775787876895} = {93F10526-209E-41D7-BBEA-775787876895} {63F9B82B-F589-4082-ABE5-D4F0682050AB} = {63F9B82B-F589-4082-ABE5-D4F0682050AB} @@ -12,32 +12,32 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NetHackW", "NetHackW.vcxpro {0303A585-3F83-4BB7-AF6B-1E12C8FB54AC} = {0303A585-3F83-4BB7-AF6B-1E12C8FB54AC} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dlb", "dlb.vcxproj", "{0303A585-3F83-4BB7-AF6B-1E12C8FB54AC}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dlb", "dlb\dlb.vcxproj", "{0303A585-3F83-4BB7-AF6B-1E12C8FB54AC}" ProjectSection(ProjectDependencies) = postProject {63F9B82B-F589-4082-ABE5-D4F0682050AB} = {63F9B82B-F589-4082-ABE5-D4F0682050AB} {BA3DD34C-04B7-40D0-B373-9329AA9E8945} = {BA3DD34C-04B7-40D0-B373-9329AA9E8945} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "makedefs", "makedefs.vcxproj", "{BA3DD34C-04B7-40D0-B373-9329AA9E8945}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "makedefs", "makedefs\makedefs.vcxproj", "{BA3DD34C-04B7-40D0-B373-9329AA9E8945}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "recover", "recover.vcxproj", "{2F35F228-6733-4FE5-9B46-B3AA10D4BC2E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "recover", "recover\recover.vcxproj", "{2F35F228-6733-4FE5-9B46-B3AA10D4BC2E}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tile2bmp", "tile2bmp.vcxproj", "{642BC75D-ABAF-403E-8224-7C725FD4CB42}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tile2bmp", "tile2bmp\tile2bmp.vcxproj", "{642BC75D-ABAF-403E-8224-7C725FD4CB42}" ProjectSection(ProjectDependencies) = postProject {BA3DD34C-04B7-40D0-B373-9329AA9E8945} = {BA3DD34C-04B7-40D0-B373-9329AA9E8945} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tilemap", "tilemap.vcxproj", "{93F10526-209E-41D7-BBEA-775787876895}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tilemap", "tilemap\tilemap.vcxproj", "{93F10526-209E-41D7-BBEA-775787876895}" ProjectSection(ProjectDependencies) = postProject {BA3DD34C-04B7-40D0-B373-9329AA9E8945} = {BA3DD34C-04B7-40D0-B373-9329AA9E8945} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "uudecode", "uudecode.vcxproj", "{63F9B82B-F589-4082-ABE5-D4F0682050AB}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "uudecode", "uudecode\uudecode.vcxproj", "{63F9B82B-F589-4082-ABE5-D4F0682050AB}" ProjectSection(ProjectDependencies) = postProject {BA3DD34C-04B7-40D0-B373-9329AA9E8945} = {BA3DD34C-04B7-40D0-B373-9329AA9E8945} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NetHack", "NetHack.vcxproj", "{609BC774-C6F8-4B2B-AA7D-5B3D0EA95751}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NetHack", "NetHack\NetHack.vcxproj", "{609BC774-C6F8-4B2B-AA7D-5B3D0EA95751}" ProjectSection(ProjectDependencies) = postProject {63F9B82B-F589-4082-ABE5-D4F0682050AB} = {63F9B82B-F589-4082-ABE5-D4F0682050AB} {BA3DD34C-04B7-40D0-B373-9329AA9E8945} = {BA3DD34C-04B7-40D0-B373-9329AA9E8945} @@ -45,22 +45,22 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NetHack", "NetHack.vcxproj" {0303A585-3F83-4BB7-AF6B-1E12C8FB54AC} = {0303A585-3F83-4BB7-AF6B-1E12C8FB54AC} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nhdefkey", "nhdefkey.vcxproj", "{6813477F-64B6-4B97-B230-438D0D233385}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nhdefkey", "nhdefkey\nhdefkey.vcxproj", "{6813477F-64B6-4B97-B230-438D0D233385}" ProjectSection(ProjectDependencies) = postProject {BA3DD34C-04B7-40D0-B373-9329AA9E8945} = {BA3DD34C-04B7-40D0-B373-9329AA9E8945} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nh340key", "nh340key.vcxproj", "{BE04E242-A1E9-4593-B95B-057F37330B76}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nh340key", "nh340key\nh340key.vcxproj", "{BE04E242-A1E9-4593-B95B-057F37330B76}" ProjectSection(ProjectDependencies) = postProject {BA3DD34C-04B7-40D0-B373-9329AA9E8945} = {BA3DD34C-04B7-40D0-B373-9329AA9E8945} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nhraykey", "nhraykey.vcxproj", "{2E1F4BB3-3BD7-43AD-8E64-D3B8A2F5D7B2}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nhraykey", "nhraykey\nhraykey.vcxproj", "{2E1F4BB3-3BD7-43AD-8E64-D3B8A2F5D7B2}" ProjectSection(ProjectDependencies) = postProject {BA3DD34C-04B7-40D0-B373-9329AA9E8945} = {BA3DD34C-04B7-40D0-B373-9329AA9E8945} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PDCurses", "PDCurses.vcxproj", "{BAA70D0F-3EC7-4D10-91F0-974F1F49308B}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PDCurses", "PDCurses\PDCurses.vcxproj", "{BAA70D0F-3EC7-4D10-91F0-974F1F49308B}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{477BF231-48E0-4312-AA12-9D8576215489}" ProjectSection(SolutionItems) = preProject 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 651ff2f7b..1f3997246 100644 --- a/win/win32/vs/NetHack.vcxproj +++ b/sys/windows/vs/NetHack/NetHack.vcxproj @@ -1,19 +1,19 @@ - + + {609BC774-C6F8-4B2B-AA7D-5B3D0EA95751} Win32Proj NetHack - + - - - - - + + + + $(BinDir) @@ -34,7 +34,7 @@ Default Speed true - $(WinWin32Dir);$(IncDir);$(SysWinntDir);$(SysShareDir);$(WinShareDir);$(LuaDir);%(AdditionalIncludeDirectories) + $(WinWin32Dir);$(IncDir);$(SysWindDir);$(SysShareDir);$(WinShareDir);$(LuaDir);%(AdditionalIncludeDirectories) TILES;WIN32CON;DLB;MSWIN_GRAPHICS;SAFEPROCS;_LIB;%(PreprocessorDefinitions) @@ -164,13 +164,13 @@ - - - + + + GUISTUB;%(PreprocessorDefinitions) - - + + @@ -216,7 +216,7 @@ - + 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 ca39fddfc..00bba9ce3 100644 --- a/win/win32/vs/afternethack.proj +++ b/sys/windows/vs/NetHack/afternethack.proj @@ -1,11 +1,10 @@ - - + - 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 514baa251..8a53a8f1d 100644 --- a/win/win32/vs/NetHackPackage.wapproj +++ b/sys/windows/vs/NetHackPackage.wapproj @@ -26,7 +26,6 @@ - $(BinDir) @@ -36,7 +35,7 @@ 10.0.15063.0 en-US NetHackPackage_StoreKey.pfx - NetHackW.vcxproj + NetHackW\NetHackW.vcxproj 19591BE8832D6EFED75019EACE7C4CA42ABC90D4 False True @@ -113,25 +112,25 @@ - + NetHackW\.nethackrc.template - + NetHackW\Guidebook.txt - + NetHackW\license - + NetHackW\nhdat$(VERSION_MAJOR)$(VERSION_MINOR)$(PATCHLEVEL) - + NetHackW\opthelp - + NetHackW\symbols.template - + NetHackW\sysconf.template @@ -139,7 +138,7 @@ - + - \ No newline at end of file + diff --git a/sys/windows/vs/NetHackPackage/NetHackPackage.appxmanifest b/sys/windows/vs/NetHackPackage/NetHackPackage.appxmanifest new file mode 100644 index 000000000..54140a413 --- /dev/null +++ b/sys/windows/vs/NetHackPackage/NetHackPackage.appxmanifest @@ -0,0 +1,29 @@ + + + + + NetHack 3.7 + NetHack DevTeam + Images\StoreLogo.png + + + + + + + + + + + + + + + + + + + + + + diff --git a/sys/windows/vs/NetHackPackage/NetHackPackage.wapproj b/sys/windows/vs/NetHackPackage/NetHackPackage.wapproj new file mode 100644 index 000000000..75a9096b6 --- /dev/null +++ b/sys/windows/vs/NetHackPackage/NetHackPackage.wapproj @@ -0,0 +1,141 @@ + + + + 15.0 + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + $(MSBuildExtensionsPath)\Microsoft\DesktopBridge\ + + + + + + $(BinDir) + + + 6838ec9d-f25d-4779-9cd7-2edb61e49429 + 10.0.17763.0 + 10.0.15063.0 + en-US + NetHackPackage_StoreKey.pfx + 19591BE8832D6EFED75019EACE7C4CA42ABC90D4 + False + True + x86 + 1 + OnApplicationRun + + + Always + + + Always + + + Always + + + Always + + + + Designer + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $(vsDir)NetHackW\.nethackrc.template + + + $(vsDir)NetHackW\Guidebook.txt + + + $(vsDir)NetHackW\license + + + $(vsDir)NetHackW\nhdat$(VERSION_MAJOR)$(VERSION_MINOR)$(PATCHLEVEL) + + + $(vsDir)NetHackW\opthelp + + + $(vsDir)NetHackW\symbols.template + + + $(vsDir)NetHackW\sysconf.template + + + + + + + \ 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 6526fb8eb..a628983a1 100644 --- a/win/win32/vs/NetHackW.vcxproj +++ b/sys/windows/vs/NetHackW/NetHackW.vcxproj @@ -1,17 +1,17 @@  - + {CEC5D360-8804-454F-8591-002184C23499} NetHackW - + + - - - - + + + $(BinDir) @@ -20,7 +20,7 @@ /Gs /Oi- /w44774 %(AdditionalOptions) Disabled true - $(WinWin32Dir);$(IncDir);$(SysWinntDir);$(SysShareDir);$(WinShareDir);$(LuaDir);%(AdditionalIncludeDirectories) + $(WinWin32Dir);$(IncDir);$(SysWindDir);$(SysShareDir);$(WinShareDir);$(LuaDir);%(AdditionalIncludeDirectories) TILES;_WINDOWS;DLB;MSWIN_GRAPHICS;SAFEPROCS;NOTTYGRAPHICS;%(PreprocessorDefinitions) @@ -158,13 +158,13 @@ - - + + TTYSTUB; - - - + + + @@ -241,7 +241,7 @@ - + @@ -279,30 +279,30 @@ - + - - - - - - - - - + + + + + + + + + - + - + - + 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 1365917ca..837506b89 100644 --- a/win/win32/vs/PDCurses.vcxproj +++ b/sys/windows/vs/PDCurses/PDCurses.vcxproj @@ -1,15 +1,15 @@ - + + {BAA70D0F-3EC7-4D10-91F0-974F1F49308B} Win32Proj PDCurses - + - @@ -115,4 +115,4 @@ - \ No newline at end of file + diff --git a/sys/windows/vs/Package.StoreAssociation.xml b/sys/windows/vs/Package.StoreAssociation.xml new file mode 100644 index 000000000..24422d2fd --- /dev/null +++ b/sys/windows/vs/Package.StoreAssociation.xml @@ -0,0 +1,373 @@ + + + CN=8BDC628A-FAAA-4EBA-8B5B-EB61BA93BA1F + NetHack DevTeam + AAD + http://www.w3.org/2001/04/xmlenc#sha256 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 30485NetHackDevTeam.NetHack3.6 + + NetHack 3.7 + + + + 30485NetHackDevTeam.NetHackBeta + + + 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 ed8a7554f..17e6ac8e2 100644 --- a/win/win32/vs/dirs.props +++ b/sys/windows/vs/dirs.props @@ -1,29 +1,32 @@ - $(MSBuildProjectDirectory)\..\..\..\ + $(MSBuildProjectDirectory)\..\..\..\..\ + $(RootDir)sys\windows\vs\ $(RootDir)binary\$(Configuration)\$(Platform)\ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(TargetName)\ $(ProjectDir)symbols\$(Configuration)\$(Platform)\$(TargetName)\ $(RootDir)tools\$(Configuration)\$(Platform)\ + $(vsDir)\Images\ $(RootDir)util\ $(RootDir)dat\ $(RootDir)doc\ $(RootDir)include\ $(RootDir)submodules\lua\ $(RootDir)src\ - $(RootDir)sys\ + $(RootDir)sys\ $(RootDir)util\ - $(RootDir)sys\share\ - $(RootDir)sys\winnt\ + $(RootDir)sys\share\ + $(RootDir)sys\windows\ $(RootDir)win\share\ $(RootDir)win\tty\ $(RootDir)win\win32\ $(ToolsDir) - $(ObjDir) - $(RootDir)win\curses\ + $(ObjDir) + $(RootDir)win\curses\ + $(RootDir)submodules\ - $(RootDir)lib\PDCurses\ + $(RootDir)lib\PDCurses\ 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 56ea03350..967c181fb 100644 --- a/win/win32/vs/afterdlb.proj +++ b/sys/windows/vs/dlb/afterdlb.proj @@ -1,11 +1,11 @@ - - + + - + 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 ed248279b..f8c22a653 100644 --- a/win/win32/vs/dlb.vcxproj +++ b/sys/windows/vs/dlb/dlb.vcxproj @@ -1,31 +1,31 @@  - + + {0303A585-3F83-4BB7-AF6B-1E12C8FB54AC} - + - + - + - + - + - - - - + + + - $(IncDir);$(SysWinntDir);$(SysShareDir);$(LuaDir);%(AdditionalIncludeDirectories) + $(IncDir);$(SysWindDir);$(SysShareDir);$(LuaDir);%(AdditionalIncludeDirectories) WIN32CON;DLB;MSWIN_GRAPHICS;%(PreprocessorDefinitions) @@ -48,4 +48,4 @@ - \ No newline at end of file + 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 5d955fe66..68c722288 100644 --- a/win/win32/vs/files.props +++ b/sys/windows/vs/files.props @@ -141,7 +141,7 @@ - + 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 4ce136bb9..068de05f1 100644 --- a/win/win32/vs/aftermakedefs.proj +++ b/sys/windows/vs/makedefs/aftermakedefs.proj @@ -1,6 +1,6 @@ - - + + 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 f82bb2c9a..fa20216ca 100644 --- a/win/win32/vs/makedefs.vcxproj +++ b/sys/windows/vs/makedefs/makedefs.vcxproj @@ -1,52 +1,52 @@  - + + {BA3DD34C-04B7-40D0-B373-9329AA9E8945} - + - + - + - + - + - - - - + + + - $(IncDir);$(SysWinntDir);$(LuaDir);%(AdditionalIncludeDirectories) + $(IncDir);$(SysWindDir);$(LuaDir);%(AdditionalIncludeDirectories) WIN32CON;DLB;MSWIN_GRAPHICS;ENUM_PM;%(PreprocessorDefinitions) - - - + + + - - - - - - - - - - - - + + + + + + + + + + + + - + - - + + 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 3f54c336a..663cefd3a 100644 --- a/win/win32/vs/nh340key.vcxproj +++ b/sys/windows/vs/nh340key/nh340key.vcxproj @@ -1,36 +1,36 @@  - + + {BE04E242-A1E9-4593-B95B-057F37330B76} Win32Proj nh340key - + - + - + - + - + - - - - + + + $(BinDir) - $(IncDir);$(SysWinntDir);$(LuaDir);%(AdditionalIncludeDirectories) + $(IncDir);$(SysWindDir);$(LuaDir);%(AdditionalIncludeDirectories) $(ToolsDir)$(TargetName).lib @@ -42,13 +42,13 @@ - + - + - + - \ No newline at end of file + 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 3201aa79f..4af518c60 100644 --- a/win/win32/vs/nhdefkey.vcxproj +++ b/sys/windows/vs/nhdefkey/nhdefkey.vcxproj @@ -1,36 +1,36 @@  - + + {6813477F-64B6-4B97-B230-438D0D233385} Win32Proj nhdefkey - + - + - + - + - + - - - - + + + $(BinDir) - $(IncDir);$(SysWinntDir);$(LuaDir);%(AdditionalIncludeDirectories) + $(IncDir);$(SysWindDir);$(LuaDir);%(AdditionalIncludeDirectories) $(ToolsDir)$(TargetName).lib @@ -42,13 +42,13 @@ - + - + - + - \ No newline at end of file + 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 e37c6a426..788fb490a 100644 --- a/win/win32/vs/nhraykey.vcxproj +++ b/sys/windows/vs/nhraykey/nhraykey.vcxproj @@ -1,36 +1,36 @@  - + + {2E1F4BB3-3BD7-43AD-8E64-D3B8A2F5D7B2} Win32Proj nhraykey - + - + - + - + - + - - - - + + + $(BinDir) - $(IncDir);$(SysWinntDir);$(LuaDir);%(AdditionalIncludeDirectories) + $(IncDir);$(SysWindDir);$(LuaDir);%(AdditionalIncludeDirectories) $(ToolsDir)$(TargetName).lib @@ -42,13 +42,13 @@ - + - + - + - \ No newline at end of file + 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 46ab13a55..d9e52e3c4 100644 --- a/win/win32/vs/afterrecover.proj +++ b/sys/windows/vs/recover/afterrecover.proj @@ -1,6 +1,6 @@ - - + + 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 27828e5ec..26f3f2d84 100644 --- a/win/win32/vs/recover.vcxproj +++ b/sys/windows/vs/recover/recover.vcxproj @@ -1,23 +1,23 @@  - + + {2F35F228-6733-4FE5-9B46-B3AA10D4BC2E} - + - - - - - + + + + $(BinDir) - $(IncDir);$(SysWinntDir);$(LuaDir);%(AdditionalIncludeDirectories) + $(IncDir);$(SysWindDir);$(LuaDir);%(AdditionalIncludeDirectories) WIN32CON;DLB;MSWIN_GRAPHICS;%(PreprocessorDefinitions) @@ -29,9 +29,9 @@ - + - + @@ -43,4 +43,4 @@ - \ No newline at end of file + 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 5fd6d13b0..0d7525d5f 100644 --- a/win/win32/vs/aftertile2bmp.proj +++ b/sys/windows/vs/tile2bmp/aftertile2bmp.proj @@ -1,6 +1,6 @@ - - + + 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 372e3a02b..4cb7d6472 100644 --- a/win/win32/vs/tile2bmp.vcxproj +++ b/sys/windows/vs/tile2bmp/tile2bmp.vcxproj @@ -1,31 +1,31 @@  - + + {642BC75D-ABAF-403E-8224-7C725FD4CB42} - + - + - + - + - + - - - - + + + - $(IncDir);$(SysWinntDir);$(SysShareDir);$(LuaDir);%(AdditionalIncludeDirectories) + $(IncDir);$(SysWindDir);$(SysShareDir);$(LuaDir);%(AdditionalIncludeDirectories) WIN32CON;DLB;MSWIN_GRAPHICS;%(PreprocessorDefinitions) 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 e576f8b89..a8795e96a 100644 --- a/win/win32/vs/aftertilemap.proj +++ b/sys/windows/vs/tilemap/aftertilemap.proj @@ -1,6 +1,6 @@ - - + + 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 8ab1ab1db..7e884d08e 100644 --- a/win/win32/vs/tilemap.vcxproj +++ b/sys/windows/vs/tilemap/tilemap.vcxproj @@ -1,31 +1,31 @@  - + + {93F10526-209E-41D7-BBEA-775787876895} - + - + - + - + - + - - - - + + + - $(IncDir);$(SysWinntDir);$(SysShareDir);$(LuaDir);%(AdditionalIncludeDirectories) + $(IncDir);$(SysWindDir);$(SysShareDir);$(LuaDir);%(AdditionalIncludeDirectories) WIN32CON;DLB;MSWIN_GRAPHICS;%(PreprocessorDefinitions) @@ -52,7 +52,7 @@ - + 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 f17bd023f..e6b52ad78 100644 --- a/win/win32/vs/tiles.vcxproj +++ b/sys/windows/vs/tiles/tiles.vcxproj @@ -1,124 +1,124 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {55946465-FC65-47B3-BB48-742C7694C0D6} - MakeFileProj - - - - Makefile - false - v120 - - - Makefile - false - v120 - - - Makefile - false - v120 - - - Makefile - false - v120 - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - .\..\util\ - .\..\util\ - .\Debug\ - .\Debug\ - nmake /f "tiles.mak" - nmake /f "tiles.mak" - nmake /f "tiles.mak" /a - nmake /f "tiles.mak" /a - - - ..\win\win32\tiles.bmp - ..\win\win32\tiles.bmp - $(NMakePreprocessorDefinitions) - $(NMakePreprocessorDefinitions) - $(NMakeIncludeSearchPath) - $(NMakeIncludeSearchPath) - $(NMakeForcedIncludes) - $(NMakeForcedIncludes) - $(NMakeAssemblySearchPath) - $(NMakeAssemblySearchPath) - $(NMakeForcedUsingAssemblies) - $(NMakeForcedUsingAssemblies) - .\..\util\ - .\..\util\ - .\Release\ - .\Release\ - nmake /f "tiles.mak" - nmake /f "tiles.mak" - nmake /f "tiles.mak" /a - nmake /f "tiles.mak" /a - - - ..\win\win32\tiles.bmp - ..\win\win32\tiles.bmp - $(NMakePreprocessorDefinitions) - $(NMakePreprocessorDefinitions) - $(NMakeIncludeSearchPath) - $(NMakeIncludeSearchPath) - $(NMakeForcedIncludes) - $(NMakeForcedIncludes) - $(NMakeAssemblySearchPath) - $(NMakeAssemblySearchPath) - $(NMakeForcedUsingAssemblies) - $(NMakeForcedUsingAssemblies) - - - - - - {642bc75d-abaf-403e-8224-7c725fd4cb42} - false - - - - - - + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {55946465-FC65-47B3-BB48-742C7694C0D6} + MakeFileProj + + + + Makefile + false + v120 + + + Makefile + false + v120 + + + Makefile + false + v120 + + + Makefile + false + v120 + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(RootDir)util\ + $(RootDir)util\ + .\Debug\ + .\Debug\ + nmake /f "tiles.mak" + nmake /f "tiles.mak" + nmake /f "tiles.mak" /a + nmake /f "tiles.mak" /a + + + $(RootDir)win\win32\tiles.bmp + $(RootDir)win\win32\tiles.bmp + $(NMakePreprocessorDefinitions) + $(NMakePreprocessorDefinitions) + $(NMakeIncludeSearchPath) + $(NMakeIncludeSearchPath) + $(NMakeForcedIncludes) + $(NMakeForcedIncludes) + $(NMakeAssemblySearchPath) + $(NMakeAssemblySearchPath) + $(NMakeForcedUsingAssemblies) + $(NMakeForcedUsingAssemblies) + $(RootDir)util\ + $(RootDir)util\ + .\Release\ + .\Release\ + nmake /f "tiles.mak" + nmake /f "tiles.mak" + nmake /f "tiles.mak" /a + nmake /f "tiles.mak" /a + + + $(RootDir)win\win32\tiles.bmp + $(RootDir)win\win32\tiles.bmp + $(NMakePreprocessorDefinitions) + $(NMakePreprocessorDefinitions) + $(NMakeIncludeSearchPath) + $(NMakeIncludeSearchPath) + $(NMakeForcedIncludes) + $(NMakeForcedIncludes) + $(NMakeAssemblySearchPath) + $(NMakeAssemblySearchPath) + $(NMakeForcedUsingAssemblies) + $(NMakeForcedUsingAssemblies) + + + + + + {642bc75d-abaf-403e-8224-7c725fd4cb42} + false + + + + + + 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 cb56619d8..5d530395f 100644 --- 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 7f81188ae..dbfdf604e 100644 --- a/win/win32/vs/afteruudecode.proj +++ b/sys/windows/vs/uudecode/afteruudecode.proj @@ -1,10 +1,10 @@ - - + + - + 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 e2aa05c7e..e01a69738 100644 --- a/win/win32/vs/uudecode.vcxproj +++ b/sys/windows/vs/uudecode/uudecode.vcxproj @@ -1,28 +1,28 @@  - + + {63F9B82B-F589-4082-ABE5-D4F0682050AB} - + - + - + - + - + - - - - + + + $(IncDir) @@ -46,4 +46,4 @@ - \ No newline at end of file + 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 7b2ba200b..625940219 100644 --- 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 45ececc75..af5072175 100644 --- 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 dfdd9790f..66fd6d1b1 100644 --- 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 f9c95fdef..3affac227 100644 --- 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 643544b8e..d9c0ef21d 100644 --- 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 71fdf5533..0af2b05dc 100644 --- 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)