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

build both tty NetHack.exe and gui NetHackW.exe

Browse Source 
Changes to be committed:
	modified:   include/config.h
	modified:   include/extern.h
	modified:   include/flag.h
	modified:   include/global.h
	modified:   include/ntconf.h
	modified:   include/wintty.h
	modified:   src/cmd.c
	modified:   src/files.c
	modified:   src/options.c
	modified:   sys/share/pcmain.c
	modified:   sys/share/pcsys.c
	modified:   sys/share/pcunix.c
	modified:   sys/winnt/Makefile.gcc
	modified:   sys/winnt/Makefile.msc
	modified:   sys/winnt/nttty.c
	new file:   sys/winnt/stubs.c
	modified:   sys/winnt/winnt.c
	modified:   util/makedefs.c
	modified:   win/tty/wintty.c

Adjust the code and the command line Makefile so that
you no longer have to choose whether to build the tty
version NetHack.exe, or the gui version NetHackW.exe.

Both will now be built in a single 'nmake install' pass.
This commit is contained in:
nhmall
2015-04-22 00:07:46 -04:00
parent 9b63abf2b0
commit aaca36a6d5
19 changed files with 804 additions and 684 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sys/winnt/winnt.c
View File

@@ -1,6 +1,6 @@
/* NetHack 3.5 winnt.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 winnt.c $NHDT-Date: 1429675609 2015/04/22 04:06:49 $ $NHDT-Branch: win32-x64-working $:$NHDT-Revision: 1.22 $ */
/* NetHack 3.5 winnt.c $Date: 2012/01/15 19:11:41 $ $Revision: 1.18 $ */
/* SCCS Id: @(#)winnt.c 3.5 $NHDT-Date$ */
/* SCCS Id: @(#)winnt.c 3.5 $NHDT-Date: 1429675610 2015/04/22 04:06:50 $ */
/* SCCS Id: @(#)winnt.c 3.5 $Date: 2012/01/15 19:11:41 $ */
/* Copyright (c) NetHack PC Development Team 1993, 1994 */
/* NetHack may be freely redistributed. See license for details. */
@@ -20,9 +20,7 @@
#endif
#include <ctype.h>
#include "win32api.h"
#ifdef WIN32CON
#include "wintty.h"
#endif
#ifdef WIN32
@@ -200,7 +198,7 @@ return &szFullPath[0];
}
# endif
#ifndef WIN32CON
/* fatal error */
/*VARARGS1*/
void
@@ -223,21 +221,17 @@ error VA_DECL(const char *,s)
VA_END();
exit(EXIT_FAILURE);
}
#endif
void Delay(int ms)
{
(void)Sleep(ms);
}
#ifdef WIN32CON
extern void NDECL(backsp);
#endif
void win32_abort()
{
if (wizard) {
# ifdef WIN32CON
int c, ci, ct;
if (!iflags.window_inited)
@@ -260,7 +254,6 @@ void win32_abort()
}
if (c == 'y')
DebugBreak();
# endif
}
abort();
}