diff -Naurd ../nethack-3.4.0/sys/winnt/defaults.nh ./sys/winnt/defaults.nh --- ../nethack-3.4.0/sys/winnt/defaults.nh Wed Mar 20 23:44:00 2002 +++ ./sys/winnt/defaults.nh Mon Feb 24 15:25:05 2003 @@ -31,10 +31,18 @@ # General options. You might also set "silent" so as not to attract # the boss's attention. # -OPTIONS=time,noshowexp,number_pad,lit_corridor,rest_on_space +OPTIONS=time,noshowexp,number_pad,lit_corridor # # If you want to get rid of "use #quit to quit..." use: -#OPTIONS=suppress_alert:3.3.1 +OPTIONS=suppress_alert:3.3.1 +# +# Note: the rest_on_space in the next line may not be +# appropriate for a beginning NetHack player, since +# it could result in use of a turn unintentionally. +# If you're new to NetHack, comment it out. It is +# being left in to keep the sample config file the +# same as it was in past releases. +OPTIONS=rest_on_space # # Set some options to control graphical window-port (these will # be safely and silently ignored by the tty port) @@ -55,7 +63,7 @@ OPTIONS=font_text:Courier New,font_size_text:9 # Status window settings -OPTIONS=font_status:Courier New,font_size_status:10 +OPTIONS=font_status:Courier New,font_size_status:9 # Other OPTIONS=hilite_pet,!toptenwin @@ -72,18 +80,33 @@ # window, windowframe, windowtext. #OPTIONS=windowcolors:status windowtext/window message windowtext/window +# *** LOCATIONS *** +# IMPORTANT: If you change any of these locations, the directories they +# point at must exist. NetHack will not create them for you. # -#HACKDIR=c:\games\nethack -# +# HACKDIR is the default location for everything. # Note: On Windows HACKDIR defaults to the location -# of the NetHack.exe or NetHackw.exe file. -# Setting HACKDIR above will override that. +# of the NetHack.exe or NetHackw.exe file so +# setting HACKDIR below to override that is +# not usually necessary or recommended. +#HACKDIR=c:\games\nethack # -# LEVELS and SAVE default to HACKDIR +# The location that level files in progress are stored (default=HACKDIR, writeable) +#LEVELDIR=c:\nethack\levels +# +# The location where saved games are kept (default=HACKDIR, writeable) +#SAVEDIR=c:\nethack\save +# +# The location that bones files are kept (default=HACKDIR, writeable) +#BONESDIR=c:\nethack\save +# +# The location that file synchronization locks are stored (default=HACKDIR, writeable) +#LOCKDIR=c:\nethack\levels +# +# The location that a record of game aborts and self-diagnosed game problems +# is kept (default=HACKDIR, writeable) +#TROUBLEDIR=c:\nethack\trouble # -#LEVELS=c:\games\nethack\bones -#SAVE=c:\games\nethack\bones - # *** CHARACTER GRAPHICS *** # # See the on-line help or the Guidebook for which symbols are in which diff -Naurd ../nethack-3.4.0/sys/winnt/Install.nt ./sys/winnt/Install.nt --- ../nethack-3.4.0/sys/winnt/Install.nt Wed Mar 20 23:44:01 2002 +++ ./sys/winnt/Install.nt Mon Feb 24 15:25:05 2003 @@ -1,58 +1,57 @@ Copyright (c) NetHack Development Team 1990-2002 NetHack may be freely redistributed. See license for details. ============================================================== - Instructions for compiling and installing - NetHack 3.4 on a Windows NT, 2000, or XP system + Instructions for compiling and installing + NetHack 3.4 on a Windows 9x, NT, 2000, or XP system ============================================================== - Last revision: March 2, 2002 - -{TODO: there are some TODO's in the text below to be resolved before release} + Last revision: $Date: 2003/02/22 01:20:14 $ Credit for the porting of NetHack to the Win32 Console Subsystem goes to the NT Porting Team started by Michael Allison. -Credit for the Win32 Graphical version of NetHack (aka -"NetHack for Windows" or Nethackw) goes to Alex Kompel who initially -developed and contributed the port. - -The PC Windows porting team consisting of Michael Allison, Dave Cohrs, -Alex Kompel, Yitzhak Sapir, and Janet Walz integrated the tty version -and the graphical version into the NetHack 3.4.0 sources. Just as -the release of NetHack 3.4.0 was being prepared, Dion Nicolaas submitted -an entire win32 port of his own to the NetHack Development Team. Dion was -subsequently invited to join the PC Windows porting team where he could -continue to contribute to the win32 port, and that invitation was accepted. +Credit for the Win32 Graphical version of NetHack (aka "NetHack for +Windows" or NetHackW) goes to Alex Kompel who initially developed and +contributed the port. +The PC Windows porting team consisting of Michael Allison, David Cohrs, +Alex Kompel, Dion Nicolaas, Yitzhak Sapir, and Janet Walz maintained the +tty and graphical win32 versions of NetHack 3.4.1. You can build either the TTY version of NetHack or the Windows Graphical version. In either case you can use one of the following build environments: o A copy of Microsoft Visual C V6.0 SP3 or later. Things may work with - an earlier version of the compiler, but the current code has not been - tested with an earlier version. + an earlier version of the compiler, but the current code has not + been tested with an earlier version. OR o A copy of Borland C 5.5.1 command line tools. Borland has made a version of its command line tools available for download after registration at: - http://www.borland.com/bcppbuilder/freecompiler/. + http://www.borland.com/bcppbuilder/freecompiler/ -Additionally, you can build a TTY version of NetHack with the following -build environment: + OR - o A copy of MinGW 1.0. MinGW is a collection of header files and import - libraries with which native Windows32 programs can be made; MinGW 1.0 - ships with the GNU Compiler Collection. + o A copy of MinGW 2.0. MinGW is a collection of header files and import + libraries with which native Windows32 programs can be made; the + MinGW 2.0 distribution contains the GNU Compiler Collection. You can download MinGW at - http://www.mingw.org/ + http://www.mingw.org/ + Earlier versions of MinGW will not allow you to build the Windows + Graphical version. + +In addition to the makefiles that allow you to build NetHack from the +command line, there is also a set of project files and a workspace file +that allow you to build the Windows Graphical version from Microsoft +Visual C's IDE (Integrated Development Environment.) -FIRST STEP: +FIRST STEP The first step in building either version of NetHack is to execute -sys/winnt/nhsetup.bat. +sys\winnt\nhsetup.bat. From the command prompt: cd sys\winnt @@ -68,20 +67,29 @@ source tree, and many files appropriate for a graphical build will be moved there. -If you wish to build the TTY version, proceed now to "BUILDING TTY VERSION." -If you wish to build the graphical version, proceed now to "BUILDING GRAPHICAL VERSION." +If you wish to build from the command line, proceed to "BUILDING FROM +THE COMMAND LINE." +If you wish to build using Visual C's IDE, proceed now to "BUILDING +USING VISUAL C'S IDE." ------------------------- -| BUILDING TTY VERSION | ------------------------- +BUILDING FROM THE COMMAND LINE -This version of NetHack for Win32 is a tty port utilizing the WIN32 -Console I/O subsystem. +You can built two different versions of NetHack for Win32 from the +command line: + A tty port utilizing the Win32 Console I/O subsystem, Console + NetHack; + A Win32 native port built on the Windows API, Graphical NetHack or + NetHackW. -I. Dispelling the Myths: +The executable for Console NetHack will be named NetHack.exe. The +executable for Graphical NetHack will be named NetHackW.exe. You can opt +to build both; they will be able to use the same datafiles, save files +and bones files. - Compiling NetHack for WIN32 TTY is not as easy as it sounds, nor as hard +I. Dispelling the Myths: + + Compiling NetHack for Win32 is not as easy as it sounds, nor as hard as it looks, however it will behoove you to read this entire section through before beginning the task. @@ -89,48 +97,48 @@ o Microsoft Visual C++ V6.0 SP3 or greater o Borland C 5.5.1 - o MinGW 1.0 with GCC 2.95.3-6 + o MinGW 2.0 (with GCC 3.2) The Microsoft Visual C Makefile was created for use with MS NMAKE which is provided with the Microsoft compiler. The supplied Makefile may work with earlier versions of the Microsoft 32-bit compiler, but that has not been tested. - The Borland C Makefile was created for use with Borland MAKE - which is provided with the Borland compiler. + The Borland C Makefile was created for use with Borland MAKE which + is provided with the Borland compiler. The GCC Makefile was created for use with GNU Make version 3.79.1, which comes with the MinGW package. - You may find it useful to obtain copies of lex (flex) and yacc (bison, - or byacc). While not strictly necessary to compile nethack, they are - required should you desire to make any changes to the level and dungeon - compilers. - + You may find it useful to obtain copies of lex (flex) and yacc + (bison, or byacc). While not strictly necessary to compile nethack, + they are required should you desire to make any changes to the level + and dungeon compilers. -II. To compile your copy of NetHack on a 32 bit Windows machine (NT or 2000): - (Note: build has not been tested on Windows XP. That isn't to say that - it doesn't work, it just hasn't been tried by us.) +II. To compile your copy of NetHack on a Windows NT/2000/XP machine: Setting Up -1. It almost goes without saying that you should make sure that your tools - are set up and running correctly. That includes ensuring that all the - necessary environment variables for the compiler environment +1. It almost goes without saying that you should make sure that your + tools are set up and running correctly. That includes ensuring that + all the necessary environment variables for the compiler environment are set correctly. (Examples: For the Microsoft compiler by executing vcvars32.bat, which is probably in the bin directory of your compilers directory tree. For the Borland Makefile, you can simply invoke the Make utility from the Makefile's directory (For - the standard Borland compiler installation you can just - use the explicit path "c:\borland\bcc55\bin\make /f Makefile.bcc". - For the GCC Makefile, add \bin to your path, where is - your MinGW root directory.) + the standard Borland compiler installation you can just use the + explicit path "c:\borland\bcc55\bin\make /f Makefile.bcc". For the + GCC Makefile, add \bin to your path, where is your + MinGW root directory.) 2. Make sure all the NetHack files are in the appropriate directory structure. You should have a main directory with subdirectories - dat, doc, include, src, sys\share, sys\winnt, util, win\tty, and - binary (The "binary" directory was created by nhsetup.bat earlier - if you followed the steps appropriately). + dat, doc, include, src, sys\share, sys\winnt, util, and binary (The + "binary" directory was created by nhsetup.bat earlier if you + followed the steps appropriately). + + For Console NetHack you need win\tty in addition to these; for + Graphical NetHack you need win\win32 in addition to these. Other subdirectories may also be included in your distribution, but they are not necessary for building the TTY version for the Win32 @@ -149,6 +157,18 @@ share winnt tty + Required Directories for a Win32 Graphical NetHack: + + top + | + ----------------------------------------------------/ /----- + | | | | | | | | + util dat doc include src sys win binary + | | + ------ ----- + | | | + share winnt win32 + Check the file "Files" in your top level directory for an exact listing of what file is in which directory. In order for the Makefiles to work, all the source files must be in the proper @@ -156,38 +176,38 @@ If you downloaded or ftp'd the sources from a UNIX system, the lines will probably end in UNIX-style newlines, instead of the carriage - return and line feed pairs used by Windows. Some programs have trouble - with them, so you may need to convert them. The compiler should not - have any problems with them however. + return and line feed pairs used by Windows. Some programs have + trouble with them, so you may need to convert them. The compiler + should not have any problems with them however. 3. Now go to the include subdirectory to check a couple of the header files there. Things *should* work as they are, but since you have - probably set up your system in some sort of custom configuration - it doesn't hurt to check out the following: + probably set up your system in some sort of custom configuration it + doesn't hurt to check out the following: - First check config.h according to the comments to match your system and - desired set of features. Mostly you need to check the WIZARD option. + First check config.h according to the comments to match your system + and desired set of features. Mostly you need to check section 4 and + 5. - You may include all or as few of the special game features as you wish - (they are located last in the file). + You may include all or as few of the special game features as you + wish (they are located last in the file). 4. Edit your Makefile. - For building the TTY version, ensure that GRAPHICAL is set to "N", - or commented out. (If you aren't building the TTY version, you are - currently reading the wrong section, and following the wrong set of - steps. In that case, you may wish to start reading from the top - again.) + For building Console NetHack, ensure that GRAPHICAL is set to "N", + or commented out. For building Graphical NetHack, set GRAPHICAL to + "Y". Optional step: - If you elected not to use the high-quality BSD random number routines by - commenting out RANDOM in ntconf.h, comment out (or set equal to nothing) - the RANDOM macro in your Makefile. + If you elected not to use the high-quality BSD random number + routines by commenting out RANDOM in ntconf.h, comment out (or + set equal to nothing) the RANDOM macro in your Makefile. - If you are recompiling after patching your sources, or if you got your - files from somewhere other than the official distribution, "touch - makedefs.c" to ensure that certain files (onames.h and pm.h) are remade, - lest potentially troublesome timestamps fool your make (or nmake) utility. + If you are recompiling after patching your sources, or if you got + your files from somewhere other than the official distribution, + "touch makedefs.c" to ensure that certain files (onames.h and pm.h) + are remade, lest potentially troublesome timestamps fool your make + (or nmake) utility. Compiling @@ -200,57 +220,23 @@ make /f Makefile.bcc install For GCC: - make -f Makefile.gcc install + mingw32-make -f Makefile.gcc install If you get any errors along the way then something has not been set - up correctly. The time it takes to compile depends on your particular - machine of course, but you should be able to go for lunch and return - to find everything finished. The less memory, and slower your machine, - the longer the lunch you may take. :-) + up correctly. The time it takes to compile depends on your + particular machine of course, but you should be able to go for lunch + and return to find everything finished. The less memory, and slower + your machine, the longer the lunch you may take. :-) - In any case, it is likely that the command prompt window where you are - doing the compiling will be occupied for a while. If all goes well, - you will get an NetHack executable. - -Running NetHack - -6. Make sure all of the support files -- Guidebook.txt, license, - Defaults.nh, NetHack.exe, nhdat, and recover.exe -- were copied to the - game directory. If not, move them there yourself. - - Edit Defaults.nh to reflect your particular setup and personal - preferences, by following the comments. As with all releases since - 3.2.1, HACKDIR defaults to the same directory as that where the NetHack.exe - executable resides. You only need to set HACKDIR in defaults.nh if, - for some reason, you wish to override that (be careful). - -7. Executing the game - - a) Running from the command prompt: - - If you add the directory containing the NetHack executable - to your PATH, you can just type "nethack" or "nethack -umike" - to start it up. Alternatively, you can explicitly invoke it with - a command such as "c:\nethack\binary\nethack.exe" (specifying whatever - drive and directory your NetHack executable resides in) each time. - - b) Running from a Windows shortcut. - - If you will be running it by launching it from a shortcut, just - use the following information when setting up the shortcut. - - Description : NetHack 3.4.0 - Command Line : C:\NETHACK\BINARY\NETHACK.EXE - - (changing the directory to the appropriate one of course) - -8. Play NetHack. If it works, you're done! + In any case, it is likely that the command prompt window where you + are doing the compiling will be occupied for a while. If all goes + well, you will get an NetHack executable. Notes: -1) To install an update of NetHack after changing something, change - your current directory to src and issue the appropriate command - for your compiler: +1. To install an update of NetHack after changing something, change + your current directory to src and issue the appropriate command for + your compiler: For Microsoft compiler: nmake @@ -259,63 +245,67 @@ make /f Makefile.bcc For GCC: - make -f Makefile.gcc + mingw32-make -f Makefile.gcc - If you add, delete, or reorder monsters or objects, or you change the - format of saved level files, delete any save and bones files. (Trying - to use such files sometimes produces amusing confusions on the game's - part, but usually crashes.) + If you add, delete, or reorder monsters or objects, or you change + the format of saved level files, delete any save and bones files. + (Trying to use such files sometimes produces amusing confusions on + the game's part, but usually crashes.) - If you made changes to any of the level compiler software, you may have - to delete dgn_flex.c, dgn_yacc.c, lev_flex.c, and lev_yacc.c from the - util directory to ensure that they are remade. + If you made changes to any of the level compiler software, you may + have to delete dgn_flex.c, dgn_yacc.c, lev_flex.c, and lev_yacc.c + from the util directory to ensure that they are remade. -2) The executable produced by the TTY build is a 32-bit, flat-address space, - non-overlayed .exe file, which should run on any true Win32 environment - with console I/O support. +2. The executable produced by the TTY build is a 32-bit, flat-address + space, non-overlayed .exe file, which should run on any true Win32 + environment with console I/O support. + The executable built by the graphical built is a 32-bit, + flat-address space, non-overlayed .exe file, which should run on any + true Win32 graphical environment. ------------------------------- -| BUILDING GRAPHICAL VERSION | ------------------------------- + To run NetHack, proceed to RUNNING NETHACK. -This version of NetHack is a Win32 native port built on the Windows API. +BUILDING USING VISUAL C'S IDE -I. Dispelling the Myths: +Only the Win32 native port built on the Windows API, or Graphical +NetHack, can be built using the Visual C IDE. - Compiling NetHack for Windows is straightforward, as long as you have - your compiler and tools correctly installed. +I. Dispelling the Myths: - It is also assumed that you already changed your directory to + Compiling NetHack using the Visual C IDE is straightforward, as long + as you have your compiler and tools correctly installed. + + It is again assumed that you already changed your directory to sys\winnt and executed: nhsetup - as described at the top of this document. If you didn't, you must - go back and do so before proceeding. + as described at the top of this document. If you didn't, you must go + back and do so before proceeding. -II. To compile your copy of NetHack for Windows on a - Windows NT/2000/XP machine: +II. To compile your copy of NetHack for Windows on a Windows NT/2000/XP + machine using the Visual C IDE: Setting Up -1. It almost goes without saying that you should make sure that your tools - are set up and running correctly. (Examples: For the Microsoft Visual - Studio C compiler it should correctly fire up when you choose it in - your Start | Programs menus, and for Borland make sure that the compiler - is in your PATH, or that you know where the make.exe executable resides.) +1. It almost goes without saying that you should make sure that your + tools are set up and running correctly. (For the Microsoft Visual C + IDE it should correctly fire up when you choose it in your Start | + Programs menus.) 2. Make sure all the NetHack files are in the appropriate directory structure. You should have a main directory with subdirectories - dat, doc, include, src, sys\share, sys\winnt, util, win\win32, - and at this point you should also have a build directory and a - binary directory (both created by nhsetup.bat executed from - sys\winnt earlier.) + dat, doc, include, src, sys\share, sys\winnt, util, win\win32, and + at this point you should also have a build directory and a binary + directory (both created by nhsetup.bat executed from sys\winnt + earlier.) Other subdirectories may also be included in your distribution, but they are not necessary for building the graphical version of NetHack (you can delete them to save space if you wish.) - Required Directories for a Win32 Graphical NetHack: + Required Directories for building Graphical NetHack with the Visual + C IDE: top | @@ -329,169 +319,132 @@ Those last two (build and binary) are created during the building process. They are not disributed as part of the NetHack source - distribution. nhsetup.bat creates the build directory and moves - a few files into it, including the Visual C project files. - The "binary" directory will house everything you need to play the - game after building is complete. + distribution. nhsetup.bat creates the build directory and moves a + few files into it, including the Visual C project files. The + "binary" directory will house everything you need to play the game + after building is complete. Check the file "Files" in your top level directory for an exact - listing of what file is in which directory. In order for the - build process to work, all the source files must be in the proper + listing of what file is in which directory. In order for the build + process to work, all the source files must be in the proper locations. Remember that nhsetup.bat moves/copies many files around to their intended locations for building NetHack. If you downloaded or ftp'd the sources from a UNIX system, the lines will probably end in UNIX-style newlines, instead of the carriage - return and line feed pairs used by Windows. Visual Studio project - files and workspace files (dsp and dsw files) in particular need to - have their lines end in carriage-return-line-feed or they won't work + return and line feed pairs used by Windows. Visual C project files + and workspace files (dsp and dsw files) in particular need to have + their lines end in carriage-return-line-feed or they won't work properly. 3. Ready your tool. - Microsoft compiler users, perform step 3a. - Borland compiler users, perform step 3b. - - Note for Microsoft users: It's possible to build a graphical version - using the Makefile. For simplicity's sake, however, only the Visual - C IDE build will be explained. The IDE build has full game - functionality and is the officially released build.s - - a) Microsoft compiler: - Start the Visual C IDE. In the Visual C IDE Menus, choose: - File | Open Workspace + Note: It's possible to build a graphical version using the Makefile, + as explained above. However, the IDE build has full game + functionality and is the officially released build. - b) Borland compiler: - Chdir to the NetHack src directory: - chdir ../../src - if your current directory was still sys/winnt, - or: - chdir src - if your current directory was the top of the NetHack tree. + Start the Visual C IDE. In the Visual C IDE menus, choose: + File | Open Workspace 4. Set up for the build. - Microsoft compiler users, perform step 4a. - Borland compiler users, perform step 4b. - a) Microsoft compiler only: - o In the Visual C "Open Workspace" dialog box, navigate to the top - of your NetHack source directory. - - In there, highlight "nethack.dsw" and click on Open. - Once the workspace has been opened, you should see the following - list in the Visual C selection window: - + dgncomp files - + dgnstuff files - + dlb_main files - + levcomp files - + levstuff files - + makedefs files - + nethackw files - + recover files - + tile2bmp files - + tilemap files - + uudecode files - - o On the Visual C menus, choose: - Project | Set Active Project | nethackw - - o On the Visual C menus again, choose either: - Build | Set Active Configuration | nethackw - Win32 Release - or - Build | Set Active Configuration | nethackw - Win32 Debug - - The first will create the Release build of NetHackW which does - not contain all the debugging information and is smaller, and - runs quicker. The second will create the Debug build of NetHackW - and will spend a lot of time writing debug information to the disk - as the game is played. Unless you are debugging or enhancing NetHack - for Windows, choose the Release build. - - o For Microsoft compiler build, you may now proceed to step 5. + In the Visual C "Open Workspace" dialog box, navigate to the top of + your NetHack source directory. - b) Borland Compiler only: + In there, highlight "nethack.dsw" and click on Open. + Once the workspace has been opened, you should see the following + list in the Visual C selection window: + + dgncomp files + + dgnstuff files + + dlb_main files + + levcomp files + + levstuff files + + makedefs files + + nethackw files + + recover files + + tile2bmp files + + tilemap files + + uudecode files - o Edit the Makefile. Ensure the following are set correctly. - GRAPHICAL should be set to "Y" + On the Visual C menus, choose: + Project | Set Active Project | NetHackW - o Ensure that all your tools directories are set up properly. - By default, your tools are assumed to be in the same - directory as the MAKE program. + On the Visual C menus again, choose either: + Build | Set Active Configuration | NetHackW - Win32 Release + or + Build | Set Active Configuration | NetHackW - Win32 Debug + The first will create the Release build of NetHackW which does not + contain all the debugging information and is smaller, and runs + quicker. The second will create the Debug build of NetHackW and + will spend a lot of time writing debug information to the disk as + the game is played. Unless you are debugging or enhancing NetHack + for Windows, choose the Release build. Building 5. Start your build. - Microsoft compiler users, perform step 5a. - Borland compiler users, perform step 5b. - - a) Microsoft Compiler only: - o On the Visual C menus once again, choose: - Build | Build nethackw.exe - This starts the build. It is likely that the IDE message window - where you are doing the compiling will be occupied for a while. - If all goes well, you will get an NetHack executable called - nethackw.exe in the "binary" directory, along with all the support - files that it needs. - o For Microsoft compiler build, you may now proceed to step 6. - - b) Borland Compiler only: - o With your current directory the NetHack src directory, - issue the following command: - make /f Makefile.bcc install + On the Visual C menus once again, choose: + Build | Build NetHackW.exe + This starts the build. It is likely that the IDE message window + where you are doing the compiling will be occupied for a while. -6. If all has gone well to this point, you should now have a playable - game of "NetHack for Windows" in the "binary" directory. +6. If all has gone well to this point, you should now have a NetHack + executable called NetHackW.exe in the "binary" directory, along with + all the support files that it needs. -Running NetHack +RUNNING NETHACK -7. Make sure all of the support files -- Guidebook.txt, license, - Defaults.nh, nethackw.exe, nhdat, and recover.exe - -- were copied to the binary directory. - (If not, find them in the tree and move them there yourself if they - exist. If they don't exist, something has gone wrong) +I. Checking the installation: + Make sure all of the support files -- Guidebook.txt, license, + Defaults.nh, NetHack.exe or NetHackW.exe, nhdat, and recover.exe -- + were copied to the game directory. If not, move them there + yourself. Edit Defaults.nh to reflect your particular setup and personal preferences, by following the comments. As with all releases since - 3.2.1, HACKDIR defaults to the same directory as that where the nethackw.exe - executable resides. You only need to set HACKDIR in Defaults.nh if, - for some reason, you wish to override that (be careful). + 3.2.1, HACKDIR defaults to the same directory as that where the + NetHack.exe or NetHackW.exe executable resides. You only need to + set HACKDIR in defaults.nh if, for some reason, you wish to override + that (be careful). -8. Executing the game - a) Running from the command prompt: +II. Executing the game - If you add the directory containing the NetHack executable - to your PATH, - You can just type "nethackw" to start it up. Alternatively, you - can explicitly invoke it with a command such as - "c:\nethack\binary\nethackw.exe" (specifying whatever drive - and directory your NetHack executable resides in) each time. +1. Running from the command prompt: - b) Running from a Windows shortcut (win95 or NT4.x) + If you add the directory containing the NetHack executable to your + PATH, you can just type "nethack" or "nethack -umike" or "nethackw" + or "nethackw -umike" to start it up. Alternatively, you can + explicitly invoke it with a command such as + "c:\nethack\binary\nethack.exe" or "c:\nethack\binary\nethackw.exe" + (specifying whatever drive and directory your NetHack executable + resides in) each time. - If you will be running it by launching it from program manager - or from a shortcut, just use the following information when - setting up the icon or shortcut. +2. Running from a Windows shortcut. - Description : NetHack 3.4.0 + If you will be running it by launching it from a shortcut, just use + the following information when setting up the shortcut. + + Description : NetHack 3.4.1 Console version + Command Line : C:\NETHACK\BINARY\NETHACK.EXE + + Description : NetHack 3.4.1 Graphical Interface Command Line : C:\NETHACK\BINARY\NETHACKW.EXE - (changing the directory in the Command Line to the appropriate one of course) + (changing the directory to the appropriate one of course) -9. Play NetHack for Windows. If it works, you're done! +III. Play NetHack. If it works, you're done! PROBLEMS - If you encounter a bug and wish to report it, please send e-mail to: - nethack-bugs@nethack.org - - If you have any comments or suggestions, feel free to drop us a line c/o: - DevTeam@nethack.org + If you discover a bug and wish to report it, or if you have comments + or suggestions we recommend using our "Contact Us" web page at: + http://www.nethack.org/common/contact.html - You may wish to vist the NetHack Development Team's website occasionally - to check for updates or known bugs. The website can be found at: - http://www.nethack.org/ + If you don't have access to the web, or you want to send us a patch + to the NetHack source code feel free to drop us a line c/o: + DevTeam (at) nethack.org Happy NetHacking! diff -Naurd ../nethack-3.4.0/sys/winnt/Makefile.bcc ./sys/winnt/Makefile.bcc --- ../nethack-3.4.0/sys/winnt/Makefile.bcc Wed Mar 20 23:44:01 2002 +++ ./sys/winnt/Makefile.bcc Mon Feb 24 15:25:05 2003 @@ -1,5 +1,5 @@ -# SCCS Id: @(#)Makefile.bcc 3.4 2002/03/03 -# Copyright (c) NetHack PC Development Team 1993-2002 +# SCCS Id: @(#)Makefile.bcc 3.4 $Date: 2003/02/19 14:20:46 $ +# Copyright (c) NetHack PC Development Team 1993-2003 # # NetHack 3.4.x Makefile for Borland C++ V5.5.1 and above and Borland's MAKE # @@ -13,22 +13,25 @@ # root, but this can be changed by modifying the bccroot and related # variables. # -# This is used for building a TTY or graphical version of NetHack using -# WIN32 Console I/O and API routines only. +# This is used for building two versions of NetHack: +# A tty port utilizing the Win32 Console I/O subsystem, Console +# NetHack; +# A Win32 native port built on the Windows API, Graphical NetHack or +# NetHackW. # # In addition to your C compiler, # # if you want to change you will need a -# files with suffix workalike for -# .y yacc (such as bison) -# .l lex (such as flex) +# files with suffix workalike for +# .y yacc (such as bison) +# .l lex (such as flex) # # # If you have any questions read the sys/winnt/Install.nt file included # with the distribution. # # -- -# Yitzhak Sapir +# Yitzhak Sapir #============================================================================== # Do not delete the following 3 lines. # @@ -67,7 +70,7 @@ link = $(bccbin)\ilink32 implib = $(bccbin)\tlib -cflags = -c -D_X86_=1 -DWINVER=$(MAKE_WINVER) -q -I$(bccinc) -w-pia -w-rch -w-par -w-aus +cflags = -c -D_X86_=1 -DWINVER=$(MAKE_WINVER) -q -I$(bccinc) -w-pia -w-rch -w-csu -w-par -w-aus cdebug = -y -v -O2 cvarsmt = -DWIN32 -D_WIN32 -D_MT lflags = @@ -92,7 +95,11 @@ # Set the gamedir according to your preference. # It must be present prior to compilation. +!IF "$(GRAPHICAL)" == "Y" +GAME = NetHackW # Game Name +!ELSE GAME = NetHack # Game Name +!ENDIF GAMEDIR = ..\binary # Game directory # @@ -134,6 +141,22 @@ #DO_YACC = YACC_ACT #DO_LEX = LEX_ACT +# Wilbur Streett's Win32 ports of GNU bison and flex are available at: +# http://www.monmouth.com/~wstreett/lex-yacc/lex-yacc.html +# +# To use them, download the executables and templates (bison.simple, +# bison.hairy) to some directory, and set the environment variables +# BISON_SIMPLE and BISON_HAIRY, and your path to point to this +# directory. +# +# For example, if you placed them in C:\BIN, you should set: +# C:> SET BISON_SIMPLE=C:\BIN\BISON.SIMPLE +# C:> SET BISON_HAIRY=C:\BIN\BISON.HAIRY +# +# Also, make sure your path points to the bison/flex directories. +# +# The following settings are configured for Wilbur Streett's ports. + # - Specify your yacc and lex programs (or work-alikes) here. YACC = bison -y @@ -150,8 +173,10 @@ FLEXSKEL = #FLEXSKEL = -S../tools/flex.ske -YTABC = y.tab.c -YTABH = y.tab.h +#YTABC = y.tab.c +#YTABH = y.tab.h +YTABC = y_tab.c +YTABH = y_tab.h LEXYYC = lex.yy.c # @@ -163,19 +188,6 @@ #RANDOM = # -# - For debugging ability, comment out the upper two -# macros and uncomment the lower two. -# - -# -# Leave the next two lines uncommented _ONLY_ if you do NOT want any -# debug capability in the object files, or in the NetHack executable. -# Comment them if you want debug capability. - -#cdebug = -#linkdebug = - -# # Compiler and Linker flags # @@ -216,10 +228,7 @@ TILEUTIL32 = $(UTIL)\til2bm32.exe TILEBMP32 = $(SRC)\tiles32.bmp -# These should be left commented in 3.4.x -# - -#SOUND = $(OBJ)\ntsound.o +SOUND = $(OBJ)\ntsound.o #SOUND = # To store all the level files, @@ -234,10 +243,6 @@ DLBFLG = ! ENDIF -# You can actually build a set of tiles -# with this makefile even though they -# are not used. Use 'nmake o\nhtiles.bmp' -# #========================================== # Setting up the compiler and linker @@ -379,7 +384,7 @@ TILEFILES = $(WSHR)\monsters.txt $(WSHR)\objects.txt $(WSHR)\other.txt # -# These are not invoked during a normal game build in 3.4.0 +# These are not invoked during a normal game build in 3.4.1 # TEXT_IO = $(O)tiletext.o $(O)tiletxt.o $(O)drawing.o \ $(O)decl.o $(O)monst.o $(O)objects.o @@ -527,15 +532,17 @@ ! ENDIF if exist $(DOC)\guidebook.txt copy $(DOC)\guidebook.txt $(GAMEDIR)\Guidebook.txt if exist $(DOC)\nethack.txt copy $(DOC)\nethack.txt $(GAMEDIR)\NetHack.txt - if exist $(DOC)\recover.txt copy $(DOC)\recover.txt $(GAMEDIR)\recover.txt @if exist $(SRC)\$(GAME).PDB copy $(SRC)\$(GAME).pdb $(GAMEDIR)\$(GAME).pdb @if exist $(GAMEDIR)\$(GAME).PDB echo NOTE: You may want to remove $(GAMEDIR)\$(GAME).pdb to conserve space -copy $(NTSYS)\defaults.nh $(GAMEDIR)\defaults.nh - copy $(U)recover.exe $(GAMEDIR) echo install done > $@ # copy $(NTSYS)\winnt.hlp $(GAMEDIR) +recover: $(U)recover.exe + if exist $(U)recover.exe copy $(U)recover.exe $(GAMEDIR) + if exist $(DOC)\recover.txt copy $(DOC)\recover.txt $(GAMEDIR)\recover.txt + $(O)sp_lev.tag: $(O)utility.tag $(DAT)\bigroom.des $(DAT)\castle.des \ $(DAT)\endgame.des $(DAT)\gehennom.des $(DAT)\knox.des \ $(DAT)\medusa.des $(DAT)\oracle.des $(DAT)\tower.des \ @@ -575,7 +582,7 @@ $(O)utility.tag: $(INCL)\date.h $(INCL)\onames.h $(INCL)\pm.h \ $(SRC)\monstr.c $(SRC)\vis_tab.c \ $(U)lev_comp.exe $(INCL)\vis_tab.h \ - $(U)dgn_comp.exe $(U)recover.exe $(TILEUTIL16) + $(U)dgn_comp.exe $(TILEUTIL16) @echo utilities made >$@ @echo utilities made. @@ -678,7 +685,7 @@ #========================================== $(U)uudecode.exe: $(O)uudecode.o - @$(link) $(LFLAGSU) $(startobj) $(O)\uudecode.o, $@,,$(libsmt) + @$(link) $(LFLAGSU) $(startobj) $(O)uudecode.o, $@,,$(libsmt) $(O)uudecode.o: $(SSYS)\uudecode.c @@ -896,11 +903,11 @@ #========================================== $(U)recover.exe: $(RECOVOBJS) $(SRC)\uuid.lib - @$(link) $(LFLAGSU) $(startobj) $(RECOVOBJS), $@,,$(libsmt) + $(link) $(LFLAGSU) $(startobj) $(RECOVOBJS), $@,,$(libsmt) $(O)recover.o: $(CONFIG_H) $(U)recover.c $(INCL)\win32api.h - @$(cc) $(CFLAGSU) -o$@ $(U)recover.c + $(cc) $(CFLAGSU) -o$@ $(U)recover.c #========================================== # Tile Mapping @@ -1073,10 +1080,14 @@ # # The rest are stolen from sys/unix/Makefile.src, -# with slashes changed to back-slashes -# and -c (which is included in CFLAGS) substituted -# with -o$@ , but otherwise untouched. That -# means that there is some irrelevant stuff +# with the following changes: +# * ../include changed to $(INCL) +# * slashes changed to back-slashes +# * -c (which is included in CFLAGS) substituted +# with -o$@ +# * $(CC) changed to $(cc) +# but otherwise untouched. +# That means that there is some irrelevant stuff # in here, but maintenance should be easier. # $(O)tos.o: ..\sys\atari\tos.c $(HACK_H) $(INCL)\tcap.h diff -Naurd ../nethack-3.4.0/sys/winnt/Makefile.gcc ./sys/winnt/Makefile.gcc --- ../nethack-3.4.0/sys/winnt/Makefile.gcc Wed Mar 20 23:44:01 2002 +++ ./sys/winnt/Makefile.gcc Mon Feb 24 15:25:05 2003 @@ -1,23 +1,27 @@ -# SCCS Id: @(#)Makefile.gcc 3.4 2002/02/04 -# Copyright (c) NetHack PC Development Team 1993-2002 +# SCCS Id: @(#)Makefile.gcc 3.4 $Date: 2003/02/19 14:20:47 $ +# Copyright (c) NetHack PC Development Team 1993-2003 # # NetHack 3.4.x Makefile for MinGW # # Win32 Compilers Tested: -# - gcc version 2.95.3-6 +# - MinGW 1.0 (gcc version 2.95.3-6) (Console NetHack only) +# - MinGW 2.0 (gcc version 3.2) # # If you don't have this compiler, you can get it at: # http://www.mingw.org/ # -# This is used for building a TTY version of NetHack using -# WIN32 Console I/O only. +# This is used for building two versions of NetHack: +# A tty port utilizing the Win32 Console I/O subsystem, Console +# NetHack; +# A Win32 native port built on the Windows API, Graphical NetHack or +# NetHackW. # # In addition to your C compiler, # # if you want to change you will need a -# files with suffix workalike for -# .y yacc (such as bison) -# .l lex (such as flex) +# files with suffix workalike for +# .y yacc (such as bison) +# .l lex (such as flex) # # # If you have any questions read the sys/winnt/Install.nt file included @@ -27,11 +31,10 @@ # Dion Nicolaas #============================================================================== # Graphical interface -# Don't uncomment this line for 3.4.0 # Set to Y for a graphical version # Set to anything else (or undefine) for a tty version -GRAPHICAL = N +#GRAPHICAL = Y # Debug # Set to Y for Debug support (to produce debug information) @@ -58,8 +61,13 @@ # Set the gamedir according to your preference. # If not present prior to compilation it gets created. +ifeq "$(GRAPHICAL)" "Y" +# Game Name +GAME = NetHackW +else # Game Name GAME = NetHack +endif # Game directory GAMEDIR = ../binary @@ -154,21 +162,22 @@ $(O)mhfont.o $(O)mhinput.o $(O)mhmain.o $(O)mhmap.o \ $(O)mhmenu.o $(O)mhmsgwnd.o $(O)mhrip.o $(O)mhsplash.o \ $(O)mhstatus.o $(O)mhtext.o $(O)mswproc.o $(O)winhack.o -# WIN32_IE=0x400 is currently unsupported by MinGW WINPFLAG = -DTILES -DMSWIN_GRAPHICS -D_WIN32_IE=0x0400 -NHRES = $(O)winhack.o +NHRES = $(O)winres.o WINPINC = -I$(WIN32) WINPHDR = $(WIN32)/mhaskyn.h $(WIN32)/mhdlg.h $(WIN32)/mhfont.h \ $(WIN32)/mhinput.h $(WIN32)/mhmain.h $(WIN32)/mhmap.h \ $(WIN32)/mhmenu.h $(WIN32)/mhmsg.h $(WIN32)/mhmsgwnd.h \ $(WIN32)/mhrip.h $(WIN32)/mhstatus.h \ $(WIN32)/mhtext.h $(WIN32)/resource.h $(WIN32)/winMS.h +WINPLIBS = -lcomctl32 -lwinmm else WINPORT = $(O)nttty.o WINPFLAG= -DWIN32CON WINPHDR = NHRES = $(O)console.o WINPINC = +WINPLIBS = -lwinmm endif TILEUTIL16 = $(UTIL)/tile2bmp.exe @@ -177,10 +186,8 @@ TILEUTIL32 = $(UTIL)/til2bm32.exe TILEBMP32 = $(SRC)/tiles32.bmp -# These should be left commented in 3.4.x -# +SOUND = $(OBJ)/ntsound.o -#SOUND = $(OBJ)/ntsound.o #SOUND = # To store all the level files, @@ -339,7 +346,7 @@ TILEFILES = $(WSHR)/monsters.txt $(WSHR)/objects.txt $(WSHR)/other.txt # -# These are not invoked during a normal game build in 3.4.0 +# These are not invoked during a normal game build in 3.4.1 # TEXT_IO = $(O)tiletext.o $(O)tiletxt.o $(O)drawing.o \ $(O)decl.o $(O)monst.o $(O)objects.o @@ -499,15 +506,15 @@ endif $(subst /,\,if exist $(DOC)/guidebook.txt copy $(DOC)/guidebook.txt $(GAMEDIR)/Guidebook.txt) $(subst /,\,if exist $(DOC)/nethack.txt copy $(DOC)/nethack.txt $(GAMEDIR)/NetHack.txt) - $(subst /,\,if exist $(DOC)/recover.txt copy $(DOC)/recover.txt $(GAMEDIR)/recover.txt) - $(subst /,\,@if exist $(SRC)/$(GAME).PDB copy $(SRC)/$(GAME).pdb $(GAMEDIR)/$(GAME).pdb) - $(subst /,\,@if exist $(GAMEDIR)/$(GAME).PDB echo NOTE: You may want to remove $(GAMEDIR)/$(GAME).pdb to conserve space) $(subst /,\,-copy $(NTSYS)/defaults.nh $(GAMEDIR)/defaults.nh) - $(subst /,\,copy $(U)recover.exe $(GAMEDIR)) $(subst /,\,echo install done > $@) # copy $(NTSYS)/winnt.hlp $(GAMEDIR) +recover: $(U)recover.exe + $(subst /,\,if exist $(U)recover.exe copy $(U)recover.exe $(GAMEDIR)) + $(subst /,\,if exist $(DOC)/recover.txt copy $(DOC)/recover.txt $(GAMEDIR)/recover.txt) + $(O)sp_lev.tag: $(O)utility.tag $(DAT)/bigroom.des $(DAT)/castle.des \ $(DAT)/endgame.des $(DAT)/gehennom.des $(DAT)/knox.des \ $(DAT)/medusa.des $(DAT)/oracle.des $(DAT)/tower.des \ @@ -547,7 +554,7 @@ $(O)utility.tag: $(INCL)/date.h $(INCL)/onames.h $(INCL)/pm.h \ $(SRC)/monstr.c $(SRC)/vis_tab.c \ $(U)lev_comp.exe $(INCL)/vis_tab.h \ - $(U)dgn_comp.exe $(U)recover.exe $(TILEUTIL16) + $(U)dgn_comp.exe $(TILEUTIL16) $(subst /,\,@echo utilities made >$@) @echo utilities made. @@ -555,10 +562,10 @@ @echo Optional tile development utilities are up to date. ifeq "$(GRAPHICAL)" "Y" -$(NHRES): $(TILEBMP16) $(WIN32)\winhack.rc $(WIN32)\mnsel.bmp \ - $(WIN32)\mnselcnt.bmp $(WIN32)\mnunsel.bmp \ - $(WIN32)\petmark.bmp $(WIN32)\NetHack.ico $(WIN32)\rip.bmp \ - $(WIN32)\splash.bmp +$(NHRES): $(TILEBMP16) $(WIN32)/winhack.rc $(WIN32)/mnsel.bmp \ + $(WIN32)/mnselcnt.bmp $(WIN32)/mnunsel.bmp \ + $(WIN32)/petmark.bmp $(WIN32)/NetHack.ico $(WIN32)/rip.bmp \ + $(WIN32)/splash.bmp @$(rc) -o$@ --include-dir $(WIN32) -i $(WIN32)/winhack.rc else $(NHRES): $(NTSYS)/console.rc $(NTSYS)/NetHack.ico @@ -571,7 +578,7 @@ $(GAMEFILE) : $(ALLOBJ) $(NHRES) @echo Linking.... - @$(link) $(lflags) -o$@ $(ALLOBJ) $(NHRES) + @$(link) $(lflags) -o$@ $(ALLOBJ) $(NHRES) $(WINPLIBS) $(subst /,\,@if exist $(O)install.tag del $(O)install.tag) $(GAME)_.ico : $(NTSYS)/$(GAME).ico @@ -646,7 +653,7 @@ $(NTSYS)/NetHack.ico : $(U)uudecode.exe $(NTSYS)/nhico.uu $(subst /,\,chdir $(NTSYS)) & \ - $(subst /,\,uudecode.exe nhico.uu) & \ + $(subst /,\,..\..\util\uudecode.exe nhico.uu) & \ $(subst /,\,chdir ..\..\src) $(WIN32)/NetHack.ico : $(U)uudecode.exe $(NTSYS)/nhico.uu @@ -723,8 +730,8 @@ @echo lev_comp.h from $(SSYS) into $(UTIL) and use them. $(subst /,\,@copy $(SSYS)/lev_yacc.c $(U)lev_yacc.c >nul) $(subst /,\,@copy $(SSYS)/lev_comp.h $(INCL)/lev_comp.h >nul) - @echo /**/ $(subst /,\,>>$(U)lev_yacc.c) - @echo /**/ $(subst /,\,>>$(INCL)/lev_comp.h) + $(subst /,\,echo.>>$(U)lev_yacc.c) + $(subst /,\,echo.>>$(INCL)/lev_comp.h) endif $(U)lev_$(LEX).c: $(U)lev_comp.l @@ -740,7 +747,7 @@ @echo For now, we will copy the prebuilt lev_lex.c @echo from $(SSYS) into $(UTIL) and use it. $(subst /,\,@copy $(SSYS)/lev_lex.c $@ >nul) - @echo /**/ $(subst /,\,>>$@) + $(subst /,\,echo.>>$@) endif #========================================== @@ -779,8 +786,8 @@ @echo dgn_comp.h from $(SSYS) into $(UTIL) and use them. $(subst /,\,@copy $(SSYS)/dgn_yacc.c $(U)dgn_yacc.c >nul) $(subst /,\,@copy $(SSYS)/dgn_comp.h $(INCL)/dgn_comp.h >nul) - @echo /**/ $(subst /,\,>>$(U)dgn_yacc.c) - @echo /**/ $(subst /,\,>>$(INCL)/dgn_comp.h) + @$(subst /,\,echo.>>$(U)dgn_yacc.c) + @$(subst /,\,echo.>>$(INCL)/dgn_comp.h) endif $(U)dgn_$(LEX).c: $(U)dgn_comp.l @@ -796,7 +803,7 @@ @echo For now, we will copy the prebuilt dgn_lex.c @echo from $(SSYS) into $(UTIL) and use it. $(subst /,\,@copy $(SSYS)/dgn_lex.c $@ >nul) - @echo /**/ $(subst /,\,>>$@) + @$(subst /,\,echo.>>$@) endif #========================================== @@ -868,11 +875,10 @@ #========================================== $(U)recover.exe: $(RECOVOBJS) - @$(link) $(LFLAGSU) -o$@ $(RECOVOBJS) - + $(link) $(LFLAGSU) -o$@ $(RECOVOBJS) $(O)recover.o: $(CONFIG_H) $(U)recover.c $(INCL)/win32api.h - @$(cc) $(CFLAGSU) -o$@ $(U)recover.c + $(cc) $(CFLAGSU) -o$@ $(U)recover.c #========================================== # Tile Mapping @@ -1072,15 +1078,20 @@ # # The rest are stolen from sys/unix/Makefile.src, -# and -c (which is included in CFLAGS) substituted -# with -o$@ , but otherwise untouched. That -# means that there is some irrelevant stuff +# with the following changes: +# * ../include changed to $(INCL) +# * -c (which is included in CFLAGS) substituted +# with -o$@ +# * targets prefixed with $(O) +# * $(CC) changed to $(cc) +# but otherwise untouched. +# That means that there is some irrelevant stuff # in here, but maintenance should be easier. # $(O)tos.o: ../sys/atari/tos.c $(HACK_H) $(INCL)/tcap.h $(cc) $(CFLAGS) -o$@ ../sys/atari/tos.c $(O)pcmain.o: ../sys/share/pcmain.c $(HACK_H) $(INCL)/dlb.h \ - $(INCL)/win32api.h + $(INCL)/win32api.h $(cc) $(CFLAGS) -o$@ ../sys/share/pcmain.c $(O)pcsys.o: ../sys/share/pcsys.c $(HACK_H) $(cc) $(CFLAGS) -o$@ ../sys/share/pcsys.c @@ -1098,6 +1109,8 @@ $(cc) $(CFLAGS) -o$@ ../sys/unix/unixmain.c $(O)unixunix.o: ../sys/unix/unixunix.c $(HACK_H) $(cc) $(CFLAGS) -o$@ ../sys/unix/unixunix.c +$(O)unixres.o: ../sys/unix/unixres.c $(CONFIG_H) + $(cc) $(CFLAGS) -o$@ ../sys/unix/unixres.c $(O)bemain.o: ../sys/be/bemain.c $(HACK_H) $(INCL)/dlb.h $(cc) $(CFLAGS) -o$@ ../sys/be/bemain.c $(O)getline.o: ../win/tty/getline.c $(HACK_H) $(INCL)/func_tab.h @@ -1107,26 +1120,26 @@ $(O)topl.o: ../win/tty/topl.c $(HACK_H) $(INCL)/tcap.h $(cc) $(CFLAGS) -o$@ ../win/tty/topl.c $(O)wintty.o: ../win/tty/wintty.c $(HACK_H) $(INCL)/dlb.h \ - $(INCL)/patchlevel.h $(INCL)/tcap.h + $(INCL)/patchlevel.h $(INCL)/tcap.h $(cc) $(CFLAGS) -o$@ ../win/tty/wintty.c $(O)Window.o: ../win/X11/Window.c $(INCL)/xwindowp.h $(INCL)/xwindow.h \ - $(CONFIG_H) + $(CONFIG_H) $(cc) $(CFLAGS) -o$@ ../win/X11/Window.c $(O)dialogs.o: ../win/X11/dialogs.c $(CONFIG_H) $(cc) $(CFLAGS) -o$@ ../win/X11/dialogs.c $(O)winX.o: ../win/X11/winX.c $(HACK_H) $(INCL)/winX.h $(INCL)/dlb.h \ - $(INCL)/patchlevel.h ../win/X11/nh72icon \ - ../win/X11/nh56icon ../win/X11/nh32icon + $(INCL)/patchlevel.h ../win/X11/nh72icon \ + ../win/X11/nh56icon ../win/X11/nh32icon $(cc) $(CFLAGS) -o$@ ../win/X11/winX.c $(O)winmap.o: ../win/X11/winmap.c $(INCL)/xwindow.h $(HACK_H) $(INCL)/dlb.h \ - $(INCL)/winX.h $(INCL)/tile2x11.h + $(INCL)/winX.h $(INCL)/tile2x11.h $(cc) $(CFLAGS) -o$@ ../win/X11/winmap.c $(O)winmenu.o: ../win/X11/winmenu.c $(HACK_H) $(INCL)/winX.h $(cc) $(CFLAGS) -o$@ ../win/X11/winmenu.c $(O)winmesg.o: ../win/X11/winmesg.c $(INCL)/xwindow.h $(HACK_H) $(INCL)/winX.h $(cc) $(CFLAGS) -o$@ ../win/X11/winmesg.c $(O)winmisc.o: ../win/X11/winmisc.c $(HACK_H) $(INCL)/func_tab.h \ - $(INCL)/winX.h + $(INCL)/winX.h $(cc) $(CFLAGS) -o$@ ../win/X11/winmisc.c $(O)winstat.o: ../win/X11/winstat.c $(HACK_H) $(INCL)/winX.h $(cc) $(CFLAGS) -o$@ ../win/X11/winstat.c @@ -1134,68 +1147,75 @@ $(cc) $(CFLAGS) -o$@ ../win/X11/wintext.c $(O)winval.o: ../win/X11/winval.c $(HACK_H) $(INCL)/winX.h $(cc) $(CFLAGS) -o$@ ../win/X11/winval.c -$(O)tile.o: $(SRC)/tile.c $(HACK_H) +$(O)tile.o: tile.c $(HACK_H) $(O)gnaskstr.o: ../win/gnome/gnaskstr.c ../win/gnome/gnaskstr.h \ - ../win/gnome/gnmain.h - $(cc) $(CFLAGS) $(GNOMEINC) -c ../win/gnome/gnaskstr.c + ../win/gnome/gnmain.h + $(cc) $(CFLAGS) $(GNOMEINC) -o$@ ../win/gnome/gnaskstr.c $(O)gnbind.o: ../win/gnome/gnbind.c ../win/gnome/gnbind.h ../win/gnome/gnmain.h \ - ../win/gnome/gnaskstr.h ../win/gnome/gnyesno.h - $(cc) $(CFLAGS) $(GNOMEINC) -c ../win/gnome/gnbind.c -$(O)gnglyph.o: ../win/gnome/gnglyph.c ../win/gnome/gnglyph.h - $(cc) $(CFLAGS) $(GNOMEINC) -c ../win/gnome/gnglyph.c + ../win/gnome/gnaskstr.h ../win/gnome/gnyesno.h + $(cc) $(CFLAGS) $(GNOMEINC) -o$@ ../win/gnome/gnbind.c +$(O)gnglyph.o: ../win/gnome/gnglyph.c ../win/gnome/gnglyph.h $(INCL)/tile2x11.h + $(cc) $(CFLAGS) $(GNOMEINC) -o$@ ../win/gnome/gnglyph.c $(O)gnmain.o: ../win/gnome/gnmain.c ../win/gnome/gnmain.h ../win/gnome/gnsignal.h \ - ../win/gnome/gnbind.h ../win/gnome/gnopts.h $(HACK_H) \ - $(INCL)/date.h - $(cc) $(CFLAGS) $(GNOMEINC) -c ../win/gnome/gnmain.c + ../win/gnome/gnbind.h ../win/gnome/gnopts.h $(HACK_H) \ + $(INCL)/date.h + $(cc) $(CFLAGS) $(GNOMEINC) -o$@ ../win/gnome/gnmain.c $(O)gnmap.o: ../win/gnome/gnmap.c ../win/gnome/gnmap.h ../win/gnome/gnglyph.h \ - ../win/gnome/gnsignal.h $(HACK_H) - $(cc) $(CFLAGS) $(GNOMEINC) -c ../win/gnome/gnmap.c + ../win/gnome/gnsignal.h $(HACK_H) + $(cc) $(CFLAGS) $(GNOMEINC) -o$@ ../win/gnome/gnmap.c $(O)gnmenu.o: ../win/gnome/gnmenu.c ../win/gnome/gnmenu.h ../win/gnome/gnmain.h \ - ../win/gnome/gnbind.h - $(cc) $(CFLAGS) $(GNOMEINC) -c ../win/gnome/gnmenu.c + ../win/gnome/gnbind.h + $(cc) $(CFLAGS) $(GNOMEINC) -o$@ ../win/gnome/gnmenu.c $(O)gnmesg.o: ../win/gnome/gnmesg.c ../win/gnome/gnmesg.h ../win/gnome/gnsignal.h - $(cc) $(CFLAGS) $(GNOMEINC) -c ../win/gnome/gnmesg.c + $(cc) $(CFLAGS) $(GNOMEINC) -o$@ ../win/gnome/gnmesg.c $(O)gnopts.o: ../win/gnome/gnopts.c ../win/gnome/gnopts.h ../win/gnome/gnglyph.h \ - ../win/gnome/gnmain.h ../win/gnome/gnmap.h $(HACK_H) - $(cc) $(CFLAGS) $(GNOMEINC) -c ../win/gnome/gnopts.c + ../win/gnome/gnmain.h ../win/gnome/gnmap.h $(HACK_H) + $(cc) $(CFLAGS) $(GNOMEINC) -o$@ ../win/gnome/gnopts.c $(O)gnplayer.o: ../win/gnome/gnplayer.c ../win/gnome/gnplayer.h \ - ../win/gnome/gnmain.h $(HACK_H) - $(cc) $(CFLAGS) $(GNOMEINC) -c ../win/gnome/gnplayer.c + ../win/gnome/gnmain.h $(HACK_H) + $(cc) $(CFLAGS) $(GNOMEINC) -o$@ ../win/gnome/gnplayer.c $(O)gnsignal.o: ../win/gnome/gnsignal.c ../win/gnome/gnsignal.h \ - ../win/gnome/gnmain.h - $(cc) $(CFLAGS) $(GNOMEINC) -c ../win/gnome/gnsignal.c + ../win/gnome/gnmain.h + $(cc) $(CFLAGS) $(GNOMEINC) -o$@ ../win/gnome/gnsignal.c $(O)gnstatus.o: ../win/gnome/gnstatus.c ../win/gnome/gnstatus.h \ - ../win/gnome/gnsignal.h ../win/gnome/gn_xpms.h \ - ../win/gnome/gnomeprv.h - $(cc) $(CFLAGS) $(GNOMEINC) -c ../win/gnome/gnstatus.c + ../win/gnome/gnsignal.h ../win/gnome/gn_xpms.h \ + ../win/gnome/gnomeprv.h + $(cc) $(CFLAGS) $(GNOMEINC) -o$@ ../win/gnome/gnstatus.c $(O)gntext.o: ../win/gnome/gntext.c ../win/gnome/gntext.h ../win/gnome/gnmain.h \ - ../win/gnome/gn_rip.h - $(cc) $(CFLAGS) $(GNOMEINC) -c ../win/gnome/gntext.c + ../win/gnome/gn_rip.h + $(cc) $(CFLAGS) $(GNOMEINC) -o$@ ../win/gnome/gntext.c +$(O)gnworn.o: ../win/gnome/gnworn.c ../win/gnome/gnworn.h ../win/gnome/gnglyph.h \ + ../win/gnome/gnsignal.h ../win/gnome/gnomeprv.h + $(cc) $(CFLAGS) $(GNOMEINC) -o$@ ../win/gnome/gnworn.c $(O)gnyesno.o: ../win/gnome/gnyesno.c ../win/gnome/gnbind.h ../win/gnome/gnyesno.h - $(cc) $(CFLAGS) $(GNOMEINC) -c ../win/gnome/gnyesno.c + $(cc) $(CFLAGS) $(GNOMEINC) -o$@ ../win/gnome/gnyesno.c $(O)wingem.o: ../win/gem/wingem.c $(HACK_H) $(INCL)/func_tab.h $(INCL)/dlb.h \ - $(INCL)/patchlevel.h $(INCL)/wingem.h + $(INCL)/patchlevel.h $(INCL)/wingem.h $(cc) $(CFLAGS) -o$@ ../win/gem/wingem.c $(O)wingem1.o: ../win/gem/wingem1.c $(INCL)/gem_rsc.h $(INCL)/load_img.h \ - $(INCL)/wintype.h $(INCL)/wingem.h + $(INCL)/gr_rect.h $(INCL)/wintype.h $(INCL)/wingem.h $(cc) $(CFLAGS) -o$@ ../win/gem/wingem1.c $(O)load_img.o: ../win/gem/load_img.c $(INCL)/load_img.h $(cc) $(CFLAGS) -o$@ ../win/gem/load_img.c +$(O)gr_rect.o: ../win/gem/gr_rect.c $(INCL)/gr_rect.h + $(cc) $(CFLAGS) -o$@ ../win/gem/gr_rect.c $(O)tile.o: tile.c $(HACK_H) $(O)qt_win.o: ../win/Qt/qt_win.cpp $(HACK_H) $(INCL)/func_tab.h \ - $(INCL)/dlb.h $(INCL)/patchlevel.h $(INCL)/qt_win.h \ - $(INCL)/qt_clust.h $(INCL)/qt_kde0.h \ - $(INCL)/qt_xpms.h qt_win.moc qt_kde0.moc - $(CXX) $(CXXFLAGS) -c ../win/Qt/qt_win.cpp + $(INCL)/dlb.h $(INCL)/patchlevel.h $(INCL)/tile2x11.h \ + $(INCL)/qt_win.h $(INCL)/qt_clust.h $(INCL)/qt_kde0.h \ + $(INCL)/qt_xpms.h qt_win.moc qt_kde0.moc qttableview.moc + $(CXX) $(CXXFLAGS) -o$@ ../win/Qt/qt_win.cpp $(O)qt_clust.o: ../win/Qt/qt_clust.cpp $(INCL)/qt_clust.h - $(CXX) $(CXXFLAGS) -c ../win/Qt/qt_clust.cpp -$(O)monstr.o: $(SRC)/monstr.c $(CONFIG_H) -$(O)vis_tab.o: $(SRC)/vis_tab.c $(CONFIG_H) $(INCL)/vis_tab.h + $(CXX) $(CXXFLAGS) -o$@ ../win/Qt/qt_clust.cpp +$(O)qttableview.o: ../win/Qt/qttableview.cpp $(INCL)/qttableview.h + $(CXX) $(CXXFLAGS) -o$@ ../win/Qt/qttableview.cpp +$(O)monstr.o: monstr.c $(CONFIG_H) +$(O)vis_tab.o: vis_tab.c $(CONFIG_H) $(INCL)/vis_tab.h $(O)allmain.o: allmain.c $(HACK_H) $(O)alloc.o: alloc.c $(CONFIG_H) $(O)apply.o: apply.c $(HACK_H) $(INCL)/edog.h $(O)artifact.o: artifact.c $(HACK_H) $(INCL)/artifact.h $(INCL)/artilist.h -$(O)attrib.o: attrib.c $(HACK_H) $(INCL)/artifact.h +$(O)attrib.o: attrib.c $(HACK_H) $(O)ball.o: ball.c $(HACK_H) $(O)bones.o: bones.c $(HACK_H) $(INCL)/lev.h $(O)botl.o: botl.c $(HACK_H) @@ -1225,12 +1245,12 @@ $(O)fountain.o: fountain.c $(HACK_H) $(O)hack.o: hack.c $(HACK_H) $(O)hacklib.o: hacklib.c $(HACK_H) -$(O)invent.o: invent.c $(HACK_H) $(INCL)/artifact.h +$(O)invent.o: invent.c $(HACK_H) $(O)light.o: light.c $(HACK_H) $(INCL)/lev.h $(O)lock.o: lock.c $(HACK_H) $(O)mail.o: mail.c $(HACK_H) $(INCL)/mail.h $(O)makemon.o: makemon.c $(HACK_H) $(INCL)/epri.h $(INCL)/emin.h \ - $(INCL)/edog.h + $(INCL)/edog.h $(O)mapglyph.o: mapglyph.c $(HACK_H) $(O)mcastu.o: mcastu.c $(HACK_H) $(O)mhitm.o: mhitm.c $(HACK_H) $(INCL)/artifact.h $(INCL)/edog.h @@ -1239,25 +1259,26 @@ $(O)mklev.o: mklev.c $(HACK_H) $(O)mkmap.o: mkmap.c $(HACK_H) $(INCL)/sp_lev.h $(O)mkmaze.o: mkmaze.c $(HACK_H) $(INCL)/sp_lev.h $(INCL)/lev.h -$(O)mkobj.o: mkobj.c $(HACK_H) $(INCL)/artifact.h +$(O)mkobj.o: mkobj.c $(HACK_H) $(O)mkroom.o: mkroom.c $(HACK_H) $(O)mon.o: mon.c $(HACK_H) $(INCL)/mfndpos.h $(INCL)/edog.h $(O)mondata.o: mondata.c $(HACK_H) $(INCL)/eshk.h $(INCL)/epri.h -$(O)monmove.o: monmove.c $(HACK_H) $(INCL)/mfndpos.h $(INCL)/artifact.h +$(O)monmove.o: monmove.c $(HACK_H) $(INCL)/mfndpos.h $(INCL)/artifact.h \ + $(INCL)/epri.h $(O)monst.o: monst.c $(CONFIG_H) $(INCL)/permonst.h $(INCL)/align.h \ - $(INCL)/monattk.h $(INCL)/monflag.h $(INCL)/monsym.h \ - $(INCL)/dungeon.h $(INCL)/eshk.h $(INCL)/vault.h \ - $(INCL)/epri.h $(INCL)/color.h + $(INCL)/monattk.h $(INCL)/monflag.h $(INCL)/monsym.h \ + $(INCL)/dungeon.h $(INCL)/eshk.h $(INCL)/vault.h \ + $(INCL)/epri.h $(INCL)/color.h $(O)mplayer.o: mplayer.c $(HACK_H) $(O)mthrowu.o: mthrowu.c $(HACK_H) $(O)muse.o: muse.c $(HACK_H) $(INCL)/edog.h $(O)music.o: music.c $(HACK_H) #interp.c $(O)o_init.o: o_init.c $(HACK_H) $(INCL)/lev.h $(O)objects.o: objects.c $(CONFIG_H) $(INCL)/obj.h $(INCL)/objclass.h \ - $(INCL)/prop.h $(INCL)/skills.h $(INCL)/color.h + $(INCL)/prop.h $(INCL)/skills.h $(INCL)/color.h $(O)objnam.o: objnam.c $(HACK_H) $(O)options.o: options.c $(CONFIG_H) $(INCL)/objclass.h $(INCL)/flag.h \ - $(HACK_H) $(INCL)/tcap.h + $(HACK_H) $(INCL)/tcap.h $(O)pager.o: pager.c $(HACK_H) $(INCL)/dlb.h $(O)pickup.o: pickup.c $(HACK_H) $(O)pline.o: pline.c $(HACK_H) $(INCL)/epri.h $(INCL)/edog.h @@ -1265,7 +1286,7 @@ $(O)potion.o: potion.c $(HACK_H) $(O)pray.o: pray.c $(HACK_H) $(INCL)/epri.h $(O)priest.o: priest.c $(HACK_H) $(INCL)/mfndpos.h $(INCL)/eshk.h \ - $(INCL)/epri.h $(INCL)/emin.h + $(INCL)/epri.h $(INCL)/emin.h $(O)quest.o: quest.c $(HACK_H) $(INCL)/qtext.h $(O)questpgr.o: questpgr.c $(HACK_H) $(INCL)/dlb.h $(INCL)/qtext.h $(O)read.o: read.c $(HACK_H) @@ -1299,11 +1320,10 @@ $(O)were.o: were.c $(HACK_H) $(O)wield.o: wield.c $(HACK_H) $(O)windows.o: windows.c $(HACK_H) $(INCL)/wingem.h $(INCL)/winGnome.h -$(O)wizard.o: wizard.c $(HACK_H) $(INCL)/qtext.h +$(O)wizard.o: wizard.c $(HACK_H) $(INCL)/qtext.h $(INCL)/epri.h $(O)worm.o: worm.c $(HACK_H) $(INCL)/lev.h $(O)worn.o: worn.c $(HACK_H) $(O)write.o: write.c $(HACK_H) $(O)zap.o: zap.c $(HACK_H) # end of file - diff -Naurd ../nethack-3.4.0/sys/winnt/Makefile.msc ./sys/winnt/Makefile.msc --- ../nethack-3.4.0/sys/winnt/Makefile.msc Wed Mar 20 23:44:01 2002 +++ ./sys/winnt/Makefile.msc Mon Feb 24 15:25:05 2003 @@ -1,5 +1,5 @@ -# SCCS Id: @(#)Makefile.nt 3.4 2002/02/28 -# Copyright (c) NetHack PC Development Team 1993-2001 +# SCCS Id: @(#)Makefile.msc 3.4 $Date: 2003/02/19 14:20:47 $ +# Copyright (c) NetHack PC Development Team 1993-2003 # # NetHack 3.4.x Makefile for MS Visual C++ V6.x and above and MS NMAKE # @@ -7,8 +7,11 @@ # - Microsoft 32 bit Visual C++ V4.x # - Microsoft 32 bit Visual C++ V6.0 SP3, SP4 # -# This is used for building a TTY version of NetHack using WIN32 Console -# I/O routines only. +# This is used for building two versions of NetHack: +# A tty port utilizing the Win32 Console I/O subsystem, Console +# NetHack; +# A Win32 native port built on the Windows API, Graphical NetHack or +# NetHackW. # # In addition to your C compiler, # @@ -34,11 +37,15 @@ #GRAPHICAL = Y -# # Set the gamedir according to your preference. # If not present prior to compilation it gets created. +!IF "$(GRAPHICAL)" == "Y" +GAME = NetHackW # Game Name +!ELSE GAME = NetHack # Game Name +!ENDIF + GAMEDIR = ..\binary # Game directory # @@ -109,11 +116,6 @@ #RANDOM = # -# - For debugging ability, comment out the upper two -# macros and uncomment the lower two. -# - -# # Leave the next two lines uncommented _ONLY_ if you do NOT want any # debug capability in the object files, or in the NetHack executable. # Comment them if you want debug capability. @@ -162,7 +164,7 @@ TILEUTIL32 = $(UTIL)\til2bm32.exe TILEBMP32 = $(SRC)\tiles32.bmp -#SOUND = $(OBJ)\ntsound.o +SOUND = $(OBJ)\ntsound.o #SOUND = @@ -324,7 +326,7 @@ TILEFILES = $(WSHR)\monsters.txt $(WSHR)\objects.txt $(WSHR)\other.txt # -# These are not invoked during a normal game build in 3.4.0 +# These are not invoked during a normal game build in 3.4.1 # TEXT_IO = $(O)tiletext.o $(O)tiletxt.o $(O)drawing.o \ $(O)decl.o $(O)monst.o $(O)objects.o @@ -475,15 +477,17 @@ ! ENDIF if exist $(DOC)\guidebook.txt copy $(DOC)\guidebook.txt $(GAMEDIR)\Guidebook.txt if exist $(DOC)\nethack.txt copy $(DOC)\nethack.txt $(GAMEDIR)\NetHack.txt - if exist $(DOC)\recover.txt copy $(DOC)\recover.txt $(GAMEDIR)\recover.txt @if exist $(SRC)\$(GAME).PDB copy $(SRC)\$(GAME).pdb $(GAMEDIR)\$(GAME).pdb @if exist $(GAMEDIR)\$(GAME).PDB echo NOTE: You may want to remove $(GAMEDIR)\$(GAME).pdb to conserve space -copy $(NTSYS)\defaults.nh $(GAMEDIR)\defaults.nh - copy $(U)recover.exe $(GAMEDIR) echo install done > $@ # copy $(NTSYS)\winnt.hlp $(GAMEDIR) +recover: $(U)recover.exe + if exist $(U)recover.exe copy $(U)recover.exe $(GAMEDIR) + if exist $(DOC)\recover.txt copy $(DOC)\recover.txt $(GAMEDIR)\recover.txt + $(O)sp_lev.tag: $(O)utility.tag $(DAT)\bigroom.des $(DAT)\castle.des \ $(DAT)\endgame.des $(DAT)\gehennom.des $(DAT)\knox.des \ $(DAT)\medusa.des $(DAT)\oracle.des $(DAT)\tower.des \ @@ -523,7 +527,7 @@ $(O)utility.tag: $(INCL)\date.h $(INCL)\onames.h $(INCL)\pm.h \ $(SRC)\monstr.c $(SRC)\vis_tab.c \ $(U)lev_comp.exe $(INCL)\vis_tab.h \ - $(U)dgn_comp.exe $(U)recover.exe + $(U)dgn_comp.exe @echo utilities made >$@ @echo utilities made. @@ -573,7 +577,7 @@ $(GAMEFILE) : $(ALLOBJ) $(NHRES) @if not exist $(GAMEDIR)\*.* mkdir $(GAMEDIR) @echo Linking.... - $(link) $(LFLAGS) -out:$@ @<<$(GAME).lnk + $(link) $(LFLAGS) user32.lib winmm.lib -out:$@ @<<$(GAME).lnk $(ALLOBJ:^ =^ ) $(NHRES) << @@ -629,7 +633,7 @@ #========================================== $(U)uudecode.exe: $(O)uudecode.o - @$(link) $(LFLAGSU) -out:$@ $(O)\uudecode.o + @$(link) $(LFLAGSU) -out:$@ $(O)uudecode.o $(O)uudecode.o: $(SSYS)\uudecode.c @@ -882,10 +886,10 @@ #========================================== $(U)recover.exe: $(RECOVOBJS) - @$(link) $(LFLAGSU) -out:$@ $(RECOVOBJS) + $(link) $(LFLAGSU) -out:$@ $(RECOVOBJS) $(O)recover.o: $(CONFIG_H) $(U)recover.c $(INCL)\win32api.h - @$(CC) $(CFLAGSU) -Fo$@ $(U)recover.c + $(CC) $(CFLAGSU) -Fo$@ $(U)recover.c #========================================== # Tile Mapping @@ -1090,148 +1094,160 @@ # $(O)nttty.o: $(HACK_H) $(TILE_H) $(INCL)\win32api.h $(NTSYS)\nttty.c - @$(CC) $(CFLAGS) -I$(WSHR) -Fo$@ $(NTSYS)\nttty.c + @@$(CC) $(CFLAGS) -I$(WSHR) -Fo$@ $(NTSYS)\nttty.c $(O)winnt.o: $(HACK_H) $(INCL)\win32api.h $(NTSYS)\winnt.c - @$(CC) $(CFLAGS) -Fo$@ $(NTSYS)\winnt.c + @@$(CC) $(CFLAGS) -Fo$@ $(NTSYS)\winnt.c $(O)ntsound.o: $(HACK_H) $(NTSYS)\ntsound.c - @$(CC) $(CFLAGS) -Fo$@ $(NTSYS)\ntsound.c + @@$(CC) $(CFLAGS) -Fo$@ $(NTSYS)\ntsound.c $(O)mapimail.o: $(HACK_H) $(INCL)\nhlan.h $(NTSYS)\mapimail.c - @$(CC) $(CFLAGS) -DMAPI_VERBOSE -Fo$@ $(NTSYS)\mapimail.c + @@$(CC) $(CFLAGS) -DMAPI_VERBOSE -Fo$@ $(NTSYS)\mapimail.c # # util dependencies # $(O)panic.o: $(U)panic.c $(CONFIG_H) - @$(CC) $(CFLAGS) -Fo$@ $(U)panic.c + @@$(CC) $(CFLAGS) -Fo$@ $(U)panic.c # # The rest are stolen from sys/unix/Makefile.src, -# with slashes changed to back-slashes -# and -c (which is included in CFLAGS) substituted -# with -Fo$@ , but otherwise untouched. That -# means that there is some irrelevant stuff +# with the following changes: +# * ../include changed to $(INCL) +# * slashes changed to back-slashes +# * -c (which is included in CFLAGS) substituted with -Fo$@ +# * targets prefixed with $(O) +# but otherwise untouched. +# That means that there is some irrelevant stuff # in here, but maintenance should be easier. # $(O)tos.o: ..\sys\atari\tos.c $(HACK_H) $(INCL)\tcap.h - $(CC) $(CFLAGS) -Fo$@ ..\sys\atari\tos.c + @$(CC) $(CFLAGS) -Fo$@ ..\sys\atari\tos.c $(O)pcmain.o: ..\sys\share\pcmain.c $(HACK_H) $(INCL)\dlb.h \ $(INCL)\win32api.h - $(CC) $(CFLAGS) -Fo$@ ..\sys\share\pcmain.c + @$(CC) $(CFLAGS) -Fo$@ ..\sys\share\pcmain.c $(O)pcsys.o: ..\sys\share\pcsys.c $(HACK_H) - $(CC) $(CFLAGS) -Fo$@ ..\sys\share\pcsys.c + @$(CC) $(CFLAGS) -Fo$@ ..\sys\share\pcsys.c $(O)pctty.o: ..\sys\share\pctty.c $(HACK_H) - $(CC) $(CFLAGS) -Fo$@ ..\sys\share\pctty.c + @$(CC) $(CFLAGS) -Fo$@ ..\sys\share\pctty.c $(O)pcunix.o: ..\sys\share\pcunix.c $(HACK_H) - $(CC) $(CFLAGS) -Fo$@ ..\sys\share\pcunix.c + @$(CC) $(CFLAGS) -Fo$@ ..\sys\share\pcunix.c $(O)random.o: ..\sys\share\random.c $(HACK_H) - $(CC) $(CFLAGS) -Fo$@ ..\sys\share\random.c + @$(CC) $(CFLAGS) -Fo$@ ..\sys\share\random.c $(O)ioctl.o: ..\sys\share\ioctl.c $(HACK_H) $(INCL)\tcap.h - $(CC) $(CFLAGS) -Fo$@ ..\sys\share\ioctl.c + @$(CC) $(CFLAGS) -Fo$@ ..\sys\share\ioctl.c $(O)unixtty.o: ..\sys\share\unixtty.c $(HACK_H) - $(CC) $(CFLAGS) -Fo$@ ..\sys\share\unixtty.c + @$(CC) $(CFLAGS) -Fo$@ ..\sys\share\unixtty.c $(O)unixmain.o: ..\sys\unix\unixmain.c $(HACK_H) $(INCL)\dlb.h - $(CC) $(CFLAGS) -Fo$@ ..\sys\unix\unixmain.c + @$(CC) $(CFLAGS) -Fo$@ ..\sys\unix\unixmain.c $(O)unixunix.o: ..\sys\unix\unixunix.c $(HACK_H) - $(CC) $(CFLAGS) -Fo$@ ..\sys\unix\unixunix.c + @$(CC) $(CFLAGS) -Fo$@ ..\sys\unix\unixunix.c +$(O)unixres.o: ..\sys\unix\unixres.c $(CONFIG_H) + @$(CC) $(CFLAGS) -Fo$@ ..\sys\unix\unixres.c $(O)bemain.o: ..\sys\be\bemain.c $(HACK_H) $(INCL)\dlb.h - $(CC) $(CFLAGS) -Fo$@ ..\sys\be\bemain.c + @$(CC) $(CFLAGS) -Fo$@ ..\sys\be\bemain.c $(O)getline.o: ..\win\tty\getline.c $(HACK_H) $(INCL)\func_tab.h - $(CC) $(CFLAGS) -Fo$@ ..\win\tty\getline.c + @$(CC) $(CFLAGS) -Fo$@ ..\win\tty\getline.c $(O)termcap.o: ..\win\tty\termcap.c $(HACK_H) $(INCL)\tcap.h - $(CC) $(CFLAGS) -Fo$@ ..\win\tty\termcap.c + @$(CC) $(CFLAGS) -Fo$@ ..\win\tty\termcap.c $(O)topl.o: ..\win\tty\topl.c $(HACK_H) $(INCL)\tcap.h - $(CC) $(CFLAGS) -Fo$@ ..\win\tty\topl.c + @$(CC) $(CFLAGS) -Fo$@ ..\win\tty\topl.c $(O)wintty.o: ..\win\tty\wintty.c $(HACK_H) $(INCL)\dlb.h \ $(INCL)\patchlevel.h $(INCL)\tcap.h - $(CC) $(CFLAGS) -Fo$@ ..\win\tty\wintty.c + @$(CC) $(CFLAGS) -Fo$@ ..\win\tty\wintty.c $(O)Window.o: ..\win\X11\Window.c $(INCL)\xwindowp.h $(INCL)\xwindow.h \ $(CONFIG_H) - $(CC) $(CFLAGS) -Fo$@ ..\win\X11\Window.c + @$(CC) $(CFLAGS) -Fo$@ ..\win\X11\Window.c $(O)dialogs.o: ..\win\X11\dialogs.c $(CONFIG_H) - $(CC) $(CFLAGS) -Fo$@ ..\win\X11\dialogs.c + @$(CC) $(CFLAGS) -Fo$@ ..\win\X11\dialogs.c $(O)winX.o: ..\win\X11\winX.c $(HACK_H) $(INCL)\winX.h $(INCL)\dlb.h \ $(INCL)\patchlevel.h ..\win\X11\nh72icon \ ..\win\X11\nh56icon ..\win\X11\nh32icon - $(CC) $(CFLAGS) -Fo$@ ..\win\X11\winX.c + @$(CC) $(CFLAGS) -Fo$@ ..\win\X11\winX.c $(O)winmap.o: ..\win\X11\winmap.c $(INCL)\xwindow.h $(HACK_H) $(INCL)\dlb.h \ $(INCL)\winX.h $(INCL)\tile2x11.h - $(CC) $(CFLAGS) -Fo$@ ..\win\X11\winmap.c + @$(CC) $(CFLAGS) -Fo$@ ..\win\X11\winmap.c $(O)winmenu.o: ..\win\X11\winmenu.c $(HACK_H) $(INCL)\winX.h - $(CC) $(CFLAGS) -Fo$@ ..\win\X11\winmenu.c + @$(CC) $(CFLAGS) -Fo$@ ..\win\X11\winmenu.c $(O)winmesg.o: ..\win\X11\winmesg.c $(INCL)\xwindow.h $(HACK_H) $(INCL)\winX.h - $(CC) $(CFLAGS) -Fo$@ ..\win\X11\winmesg.c + @$(CC) $(CFLAGS) -Fo$@ ..\win\X11\winmesg.c $(O)winmisc.o: ..\win\X11\winmisc.c $(HACK_H) $(INCL)\func_tab.h \ $(INCL)\winX.h - $(CC) $(CFLAGS) -Fo$@ ..\win\X11\winmisc.c + @$(CC) $(CFLAGS) -Fo$@ ..\win\X11\winmisc.c $(O)winstat.o: ..\win\X11\winstat.c $(HACK_H) $(INCL)\winX.h - $(CC) $(CFLAGS) -Fo$@ ..\win\X11\winstat.c + @$(CC) $(CFLAGS) -Fo$@ ..\win\X11\winstat.c $(O)wintext.o: ..\win\X11\wintext.c $(HACK_H) $(INCL)\winX.h $(INCL)\xwindow.h - $(CC) $(CFLAGS) -Fo$@ ..\win\X11\wintext.c + @$(CC) $(CFLAGS) -Fo$@ ..\win\X11\wintext.c $(O)winval.o: ..\win\X11\winval.c $(HACK_H) $(INCL)\winX.h - $(CC) $(CFLAGS) -Fo$@ ..\win\X11\winval.c -$(O)tile.o: $(SRC)\tile.c $(HACK_H) + @$(CC) $(CFLAGS) -Fo$@ ..\win\X11\winval.c +$(O)tile.o: tile.c $(HACK_H) $(O)gnaskstr.o: ..\win\gnome\gnaskstr.c ..\win\gnome\gnaskstr.h \ ..\win\gnome\gnmain.h - $(CC) $(CFLAGS) $(GNOMEINC) -c ..\win\gnome\gnaskstr.c + @$(CC) $(CFLAGS) $(GNOMEINC) -Fo$@ ..\win\gnome\gnaskstr.c $(O)gnbind.o: ..\win\gnome\gnbind.c ..\win\gnome\gnbind.h ..\win\gnome\gnmain.h \ ..\win\gnome\gnaskstr.h ..\win\gnome\gnyesno.h - $(CC) $(CFLAGS) $(GNOMEINC) -c ..\win\gnome\gnbind.c -$(O)gnglyph.o: ..\win\gnome\gnglyph.c ..\win\gnome\gnglyph.h - $(CC) $(CFLAGS) $(GNOMEINC) -c ..\win\gnome\gnglyph.c + @$(CC) $(CFLAGS) $(GNOMEINC) -Fo$@ ..\win\gnome\gnbind.c +$(O)gnglyph.o: ..\win\gnome\gnglyph.c ..\win\gnome\gnglyph.h $(INCL)\tile2x11.h + @$(CC) $(CFLAGS) $(GNOMEINC) -Fo$@ ..\win\gnome\gnglyph.c $(O)gnmain.o: ..\win\gnome\gnmain.c ..\win\gnome\gnmain.h ..\win\gnome\gnsignal.h \ ..\win\gnome\gnbind.h ..\win\gnome\gnopts.h $(HACK_H) \ $(INCL)\date.h - $(CC) $(CFLAGS) $(GNOMEINC) -c ..\win\gnome\gnmain.c + @$(CC) $(CFLAGS) $(GNOMEINC) -Fo$@ ..\win\gnome\gnmain.c $(O)gnmap.o: ..\win\gnome\gnmap.c ..\win\gnome\gnmap.h ..\win\gnome\gnglyph.h \ ..\win\gnome\gnsignal.h $(HACK_H) - $(CC) $(CFLAGS) $(GNOMEINC) -c ..\win\gnome\gnmap.c + @$(CC) $(CFLAGS) $(GNOMEINC) -Fo$@ ..\win\gnome\gnmap.c $(O)gnmenu.o: ..\win\gnome\gnmenu.c ..\win\gnome\gnmenu.h ..\win\gnome\gnmain.h \ ..\win\gnome\gnbind.h - $(CC) $(CFLAGS) $(GNOMEINC) -c ..\win\gnome\gnmenu.c + @$(CC) $(CFLAGS) $(GNOMEINC) -Fo$@ ..\win\gnome\gnmenu.c $(O)gnmesg.o: ..\win\gnome\gnmesg.c ..\win\gnome\gnmesg.h ..\win\gnome\gnsignal.h - $(CC) $(CFLAGS) $(GNOMEINC) -c ..\win\gnome\gnmesg.c + @$(CC) $(CFLAGS) $(GNOMEINC) -Fo$@ ..\win\gnome\gnmesg.c $(O)gnopts.o: ..\win\gnome\gnopts.c ..\win\gnome\gnopts.h ..\win\gnome\gnglyph.h \ ..\win\gnome\gnmain.h ..\win\gnome\gnmap.h $(HACK_H) - $(CC) $(CFLAGS) $(GNOMEINC) -c ..\win\gnome\gnopts.c + @$(CC) $(CFLAGS) $(GNOMEINC) -Fo$@ ..\win\gnome\gnopts.c $(O)gnplayer.o: ..\win\gnome\gnplayer.c ..\win\gnome\gnplayer.h \ ..\win\gnome\gnmain.h $(HACK_H) - $(CC) $(CFLAGS) $(GNOMEINC) -c ..\win\gnome\gnplayer.c + @$(CC) $(CFLAGS) $(GNOMEINC) -Fo$@ ..\win\gnome\gnplayer.c $(O)gnsignal.o: ..\win\gnome\gnsignal.c ..\win\gnome\gnsignal.h \ ..\win\gnome\gnmain.h - $(CC) $(CFLAGS) $(GNOMEINC) -c ..\win\gnome\gnsignal.c + @$(CC) $(CFLAGS) $(GNOMEINC) -Fo$@ ..\win\gnome\gnsignal.c $(O)gnstatus.o: ..\win\gnome\gnstatus.c ..\win\gnome\gnstatus.h \ ..\win\gnome\gnsignal.h ..\win\gnome\gn_xpms.h \ ..\win\gnome\gnomeprv.h - $(CC) $(CFLAGS) $(GNOMEINC) -c ..\win\gnome\gnstatus.c + @$(CC) $(CFLAGS) $(GNOMEINC) -Fo$@ ..\win\gnome\gnstatus.c $(O)gntext.o: ..\win\gnome\gntext.c ..\win\gnome\gntext.h ..\win\gnome\gnmain.h \ ..\win\gnome\gn_rip.h - $(CC) $(CFLAGS) $(GNOMEINC) -c ..\win\gnome\gntext.c + @$(CC) $(CFLAGS) $(GNOMEINC) -Fo$@ ..\win\gnome\gntext.c +$(O)gnworn.o: ..\win\gnome\gnworn.c ..\win\gnome\gnworn.h ..\win\gnome\gnglyph.h \ + ..\win\gnome\gnsignal.h ..\win\gnome\gnomeprv.h + @$(CC) $(CFLAGS) $(GNOMEINC) -Fo$@ ..\win\gnome\gnworn.c $(O)gnyesno.o: ..\win\gnome\gnyesno.c ..\win\gnome\gnbind.h ..\win\gnome\gnyesno.h - $(CC) $(CFLAGS) $(GNOMEINC) -c ..\win\gnome\gnyesno.c + @$(CC) $(CFLAGS) $(GNOMEINC) -Fo$@ ..\win\gnome\gnyesno.c $(O)wingem.o: ..\win\gem\wingem.c $(HACK_H) $(INCL)\func_tab.h $(INCL)\dlb.h \ $(INCL)\patchlevel.h $(INCL)\wingem.h - $(CC) $(CFLAGS) -Fo$@ ..\win\gem\wingem.c + @$(CC) $(CFLAGS) -Fo$@ ..\win\gem\wingem.c $(O)wingem1.o: ..\win\gem\wingem1.c $(INCL)\gem_rsc.h $(INCL)\load_img.h \ - $(INCL)\wintype.h $(INCL)\wingem.h - $(CC) $(CFLAGS) -Fo$@ ..\win\gem\wingem1.c + $(INCL)\gr_rect.h $(INCL)\wintype.h $(INCL)\wingem.h + @$(CC) $(CFLAGS) -Fo$@ ..\win\gem\wingem1.c $(O)load_img.o: ..\win\gem\load_img.c $(INCL)\load_img.h - $(CC) $(CFLAGS) -Fo$@ ..\win\gem\load_img.c + @$(CC) $(CFLAGS) -Fo$@ ..\win\gem\load_img.c +$(O)gr_rect.o: ..\win\gem\gr_rect.c $(INCL)\gr_rect.h + @$(CC) $(CFLAGS) -Fo$@ ..\win\gem\gr_rect.c $(O)tile.o: tile.c $(HACK_H) $(O)qt_win.o: ..\win\Qt\qt_win.cpp $(HACK_H) $(INCL)\func_tab.h \ - $(INCL)\dlb.h $(INCL)\patchlevel.h $(INCL)\qt_win.h \ - $(INCL)\qt_clust.h $(INCL)\qt_kde0.h \ - $(INCL)\qt_xpms.h qt_win.moc qt_kde0.moc - $(CXX) $(CXXFLAGS) -c ..\win\Qt\qt_win.cpp + $(INCL)\dlb.h $(INCL)\patchlevel.h $(INCL)\tile2x11.h \ + $(INCL)\qt_win.h $(INCL)\qt_clust.h $(INCL)\qt_kde0.h \ + $(INCL)\qt_xpms.h qt_win.moc qt_kde0.moc qttableview.moc + $(CXX) $(CXXFLAGS) -Fo$@ ..\win\Qt\qt_win.cpp $(O)qt_clust.o: ..\win\Qt\qt_clust.cpp $(INCL)\qt_clust.h - $(CXX) $(CXXFLAGS) -c ..\win\Qt\qt_clust.cpp -$(O)monstr.o: $(SRC)\monstr.c $(CONFIG_H) -$(O)vis_tab.o: $(SRC)\vis_tab.c $(CONFIG_H) $(INCL)\vis_tab.h + $(CXX) $(CXXFLAGS) -Fo$@ ..\win\Qt\qt_clust.cpp +$(O)qttableview.o: ..\win\Qt\qttableview.cpp $(INCL)\qttableview.h + $(CXX) $(CXXFLAGS) -Fo$@ ..\win\Qt\qttableview.cpp +$(O)monstr.o: monstr.c $(CONFIG_H) +$(O)vis_tab.o: vis_tab.c $(CONFIG_H) $(INCL)\vis_tab.h $(O)allmain.o: allmain.c $(HACK_H) $(O)alloc.o: alloc.c $(CONFIG_H) $(O)apply.o: apply.c $(HACK_H) $(INCL)\edog.h $(O)artifact.o: artifact.c $(HACK_H) $(INCL)\artifact.h $(INCL)\artilist.h -$(O)attrib.o: attrib.c $(HACK_H) $(INCL)\artifact.h +$(O)attrib.o: attrib.c $(HACK_H) $(O)ball.o: ball.c $(HACK_H) $(O)bones.o: bones.c $(HACK_H) $(INCL)\lev.h $(O)botl.o: botl.c $(HACK_H) @@ -1261,7 +1277,7 @@ $(O)fountain.o: fountain.c $(HACK_H) $(O)hack.o: hack.c $(HACK_H) $(O)hacklib.o: hacklib.c $(HACK_H) -$(O)invent.o: invent.c $(HACK_H) $(INCL)\artifact.h +$(O)invent.o: invent.c $(HACK_H) $(O)light.o: light.c $(HACK_H) $(INCL)\lev.h $(O)lock.o: lock.c $(HACK_H) $(O)mail.o: mail.c $(HACK_H) $(INCL)\mail.h @@ -1275,11 +1291,12 @@ $(O)mklev.o: mklev.c $(HACK_H) $(O)mkmap.o: mkmap.c $(HACK_H) $(INCL)\sp_lev.h $(O)mkmaze.o: mkmaze.c $(HACK_H) $(INCL)\sp_lev.h $(INCL)\lev.h -$(O)mkobj.o: mkobj.c $(HACK_H) $(INCL)\artifact.h +$(O)mkobj.o: mkobj.c $(HACK_H) $(O)mkroom.o: mkroom.c $(HACK_H) $(O)mon.o: mon.c $(HACK_H) $(INCL)\mfndpos.h $(INCL)\edog.h $(O)mondata.o: mondata.c $(HACK_H) $(INCL)\eshk.h $(INCL)\epri.h -$(O)monmove.o: monmove.c $(HACK_H) $(INCL)\mfndpos.h $(INCL)\artifact.h +$(O)monmove.o: monmove.c $(HACK_H) $(INCL)\mfndpos.h $(INCL)\artifact.h \ + $(INCL)\epri.h $(O)monst.o: monst.c $(CONFIG_H) $(INCL)\permonst.h $(INCL)\align.h \ $(INCL)\monattk.h $(INCL)\monflag.h $(INCL)\monsym.h \ $(INCL)\dungeon.h $(INCL)\eshk.h $(INCL)\vault.h \ @@ -1335,11 +1352,10 @@ $(O)were.o: were.c $(HACK_H) $(O)wield.o: wield.c $(HACK_H) $(O)windows.o: windows.c $(HACK_H) $(INCL)\wingem.h $(INCL)\winGnome.h -$(O)wizard.o: wizard.c $(HACK_H) $(INCL)\qtext.h +$(O)wizard.o: wizard.c $(HACK_H) $(INCL)\qtext.h $(INCL)\epri.h $(O)worm.o: worm.c $(HACK_H) $(INCL)\lev.h $(O)worn.o: worn.c $(HACK_H) $(O)write.o: write.c $(HACK_H) $(O)zap.o: zap.c $(HACK_H) # end of file - diff -Naurd ../nethack-3.4.0/sys/winnt/nethack.def ./sys/winnt/nethack.def --- ../nethack-3.4.0/sys/winnt/nethack.def Wed Mar 20 23:44:02 2002 +++ ./sys/winnt/nethack.def Mon Feb 24 15:25:05 2003 @@ -1,5 +1,5 @@ NAME NETHACK -DESCRIPTION 'NetHack 3.4.0 for Windows NT' +DESCRIPTION 'NetHack 3.4.1 for Windows NT' EXETYPE WINDOWS STUB 'WINSTUB.EXE' CODE PRELOAD MOVEABLE DISCARDABLE diff -Naurd ../nethack-3.4.0/sys/winnt/nhsetup.bat ./sys/winnt/nhsetup.bat --- ../nethack-3.4.0/sys/winnt/nhsetup.bat Wed Mar 20 23:44:02 2002 +++ ./sys/winnt/nhsetup.bat Mon Feb 24 15:25:05 2003 @@ -1,114 +1,114 @@ -@REM SCCS Id: @(#)nhsetup.bat 2002/03/07 -@REM Copyright (c) NetHack PC Development Team 1993, 1996, 2002 -@REM NetHack may be freely redistributed. See license for details. -@REM Win32 setup batch file, see Install.nt for details -@REM -@echo off - -set _pause= - -:nxtcheck -echo Checking to see if directories are set up properly -if not exist ..\..\include\hack.h goto :err_dir -if not exist ..\..\src\hack.c goto :err_dir -if not exist ..\..\dat\wizard.des goto :err_dir -if not exist ..\..\util\makedefs.c goto :err_dir -if not exist ..\..\sys\winnt\winnt.c goto :err_dir -echo Directories look ok. - -:do_tty -if NOT exist ..\..\binary\*.* mkdir ..\..\binary -if NOT exist ..\..\binary\license copy ..\..\dat\license ..\..\binary\license >nul -echo Copying Microsoft Makefile - Makefile.msc to ..\..\src\Makefile. -if NOT exist ..\..\src\Makefile goto :domsc -copy ..\..\src\Makefile ..\..\src\Makefile-orig >nul -echo Your existing -echo ..\..\src\Makefile -echo has been renamed to -echo ..\..\src\Makefile-orig -:domsc -copy Makefile.msc ..\..\src\Makefile >nul -echo Microsoft Makefile copied ok. - -echo Copying Borland Makefile - Makefile.bcc to ..\..\src\Makefile.bcc -if NOT exist ..\..\src\Makefile.bcc goto :dobor -copy ..\..\src\Makefile.bcc ..\..\src\Makefile.bcc-orig >nul -echo Your existing -echo ..\..\src\Makefile.bcc -echo has been renamed to -echo ..\..\src\Makefile.bcc-orig -:dobor -copy Makefile.bcc ..\..\src\Makefile.bcc >nul -echo Borland Makefile copied ok. - -echo Copying MinGW Makefile - Makefile.gcc to ..\..\src\Makefile.gcc -if NOT exist ..\..\src\Makefile.gcc goto :dogcc -copy ..\..\src\Makefile.gcc ..\..\src\Makefile.gcc-orig >nul -echo Your existing -echo ..\..\src\Makefile.gcc -echo has been renamed to -echo ..\..\src\Makefile.gcc-orig -:dogcc -copy Makefile.gcc ..\..\src\Makefile.gcc >nul -echo MinGW Makefile copied ok. - -:do_win -if not exist ..\..\win\win32\nethack.dsw goto :err_win -echo. -echo Copying Visual C project files to ..\..\build directory -echo Copying ..\..\win\win32\nethack.dsw ..\..\nethack.dsw -copy ..\..\win\win32\nethack.dsw ..\.. >nul -if NOT exist ..\..\binary\*.* echo Creating ..\..\binary directory -if NOT exist ..\..\binary\*.* mkdir ..\..\binary -if NOT exist ..\..\binary\license copy ..\..\dat\license ..\..\binary\license >nul -if NOT exist ..\..\build\*.* echo Creating ..\..\build directory -if NOT exist ..\..\build\*.* mkdir ..\..\build -copy ..\..\win\win32\dgncomp.dsp ..\..\build >nul -copy ..\..\win\win32\dgnstuff.dsp ..\..\build >nul -copy ..\..\win\win32\dgnstuff.mak ..\..\build >nul -copy ..\..\win\win32\dlb_main.dsp ..\..\build >nul -copy ..\..\win\win32\levcomp.dsp ..\..\build >nul -copy ..\..\win\win32\levstuff.dsp ..\..\build >nul -copy ..\..\win\win32\levstuff.mak ..\..\build >nul -copy ..\..\win\win32\makedefs.dsp ..\..\build >nul -copy ..\..\win\win32\recover.dsp ..\..\build >nul -copy ..\..\win\win32\tile2bmp.dsp ..\..\build >nul -copy ..\..\win\win32\tiles.dsp ..\..\build >nul -copy ..\..\win\win32\tiles.mak ..\..\build >nul -copy ..\..\win\win32\tilemap.dsp ..\..\build >nul -copy ..\..\win\win32\uudecode.dsp ..\..\build >nul -copy ..\..\win\win32\nethackw.dsp ..\..\build >nul - -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 to build NetHack. -goto :fini - -:err_data -echo A required file ..\..\dat\data.bas seems to be missing. -echo Check "Files." in the root directory for your NetHack distribution -echo and make sure that all required files exist. -goto :fini - -:err_dir -echo Your directories are not set up properly, please re-read the -echo documentation and sys/winnt/Install.nt. -goto :fini - -:done -echo done! -echo. -echo Proceed with the next step documented in Install.nt -echo. - -:fini -:end -set _pause=Y -if "%0"=="nhsetup" set _pause=N -if "%0"=="NHSETUP" set _pause=N -if "%_pause%"=="Y" pause -set _pause= +@REM SCCS Id: @(#)nhsetup.bat 3.4 $Date: 2002/07/24 08:25:21 $ +@REM Copyright (c) NetHack PC Development Team 1993, 1996, 2002 +@REM NetHack may be freely redistributed. See license for details. +@REM Win32 setup batch file, see Install.nt for details +@REM +@echo off + +set _pause= + +:nxtcheck +echo Checking to see if directories are set up properly +if not exist ..\..\include\hack.h goto :err_dir +if not exist ..\..\src\hack.c goto :err_dir +if not exist ..\..\dat\wizard.des goto :err_dir +if not exist ..\..\util\makedefs.c goto :err_dir +if not exist ..\..\sys\winnt\winnt.c goto :err_dir +echo Directories look ok. + +:do_tty +if NOT exist ..\..\binary\*.* mkdir ..\..\binary +if NOT exist ..\..\binary\license copy ..\..\dat\license ..\..\binary\license >nul +echo Copying Microsoft Makefile - Makefile.msc to ..\..\src\Makefile. +if NOT exist ..\..\src\Makefile goto :domsc +copy ..\..\src\Makefile ..\..\src\Makefile-orig >nul +echo Your existing +echo ..\..\src\Makefile +echo has been renamed to +echo ..\..\src\Makefile-orig +:domsc +copy Makefile.msc ..\..\src\Makefile >nul +echo Microsoft Makefile copied ok. + +echo Copying Borland Makefile - Makefile.bcc to ..\..\src\Makefile.bcc +if NOT exist ..\..\src\Makefile.bcc goto :dobor +copy ..\..\src\Makefile.bcc ..\..\src\Makefile.bcc-orig >nul +echo Your existing +echo ..\..\src\Makefile.bcc +echo has been renamed to +echo ..\..\src\Makefile.bcc-orig +:dobor +copy Makefile.bcc ..\..\src\Makefile.bcc >nul +echo Borland Makefile copied ok. + +echo Copying MinGW Makefile - Makefile.gcc to ..\..\src\Makefile.gcc +if NOT exist ..\..\src\Makefile.gcc goto :dogcc +copy ..\..\src\Makefile.gcc ..\..\src\Makefile.gcc-orig >nul +echo Your existing +echo ..\..\src\Makefile.gcc +echo has been renamed to +echo ..\..\src\Makefile.gcc-orig +:dogcc +copy Makefile.gcc ..\..\src\Makefile.gcc >nul +echo MinGW Makefile copied ok. + +:do_win +if not exist ..\..\win\win32\nethack.dsw goto :err_win +echo. +echo Copying Visual C project files to ..\..\build directory +echo Copying ..\..\win\win32\nethack.dsw ..\..\nethack.dsw +copy ..\..\win\win32\nethack.dsw ..\.. >nul +if NOT exist ..\..\binary\*.* echo Creating ..\..\binary directory +if NOT exist ..\..\binary\*.* mkdir ..\..\binary +if NOT exist ..\..\binary\license copy ..\..\dat\license ..\..\binary\license >nul +if NOT exist ..\..\build\*.* echo Creating ..\..\build directory +if NOT exist ..\..\build\*.* mkdir ..\..\build +copy ..\..\win\win32\dgncomp.dsp ..\..\build >nul +copy ..\..\win\win32\dgnstuff.dsp ..\..\build >nul +copy ..\..\win\win32\dgnstuff.mak ..\..\build >nul +copy ..\..\win\win32\dlb_main.dsp ..\..\build >nul +copy ..\..\win\win32\levcomp.dsp ..\..\build >nul +copy ..\..\win\win32\levstuff.dsp ..\..\build >nul +copy ..\..\win\win32\levstuff.mak ..\..\build >nul +copy ..\..\win\win32\makedefs.dsp ..\..\build >nul +copy ..\..\win\win32\recover.dsp ..\..\build >nul +copy ..\..\win\win32\tile2bmp.dsp ..\..\build >nul +copy ..\..\win\win32\tiles.dsp ..\..\build >nul +copy ..\..\win\win32\tiles.mak ..\..\build >nul +copy ..\..\win\win32\tilemap.dsp ..\..\build >nul +copy ..\..\win\win32\uudecode.dsp ..\..\build >nul +copy ..\..\win\win32\nethackw.dsp ..\..\build >nul + +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 to build NetHack. +goto :fini + +:err_data +echo A required file ..\..\dat\data.bas seems to be missing. +echo Check "Files." in the root directory for your NetHack distribution +echo and make sure that all required files exist. +goto :fini + +:err_dir +echo Your directories are not set up properly, please re-read the +echo documentation and sys/winnt/Install.nt. +goto :fini + +:done +echo done! +echo. +echo Proceed with the next step documented in Install.nt +echo. + +:fini +:end +set _pause=Y +if "%0"=="nhsetup" set _pause=N +if "%0"=="NHSETUP" set _pause=N +if "%_pause%"=="Y" pause +set _pause= diff -Naurd ../nethack-3.4.0/sys/winnt/ntsound.c ./sys/winnt/ntsound.c --- ../nethack-3.4.0/sys/winnt/ntsound.c Wed Mar 20 23:44:02 2002 +++ ./sys/winnt/ntsound.c Mon Feb 24 15:25:05 2003 @@ -11,5 +11,18 @@ */ #include "hack.h" +#include "win32api.h" +#include +#ifdef USER_SOUNDS + +void play_usersound(filename, volume) +const char* filename; +int volume; +{ +/* pline("play_usersound: %s (%d).", filename, volume); */ + (void)sndPlaySound(filename, SND_ASYNC | SND_NODEFAULT); +} + +#endif /*USER_SOUNDS*/ /* ntsound.c */ diff -Naurd ../nethack-3.4.0/sys/winnt/nttty.c ./sys/winnt/nttty.c --- ../nethack-3.4.0/sys/winnt/nttty.c Wed Mar 20 23:44:03 2002 +++ ./sys/winnt/nttty.c Mon Feb 24 15:25:05 2003 @@ -72,6 +72,7 @@ char erase_char,kill_char; static char currentcolor = FOREGROUND_GREEN|FOREGROUND_RED|FOREGROUND_BLUE; +static char noninvertedcurrentcolor = FOREGROUND_GREEN|FOREGROUND_RED|FOREGROUND_BLUE; static char currenthilite = 0; static char currentbackground = 0; static boolean colorchange = TRUE; @@ -122,11 +123,12 @@ int *wid, *hgt; { /* int twid = origcsbi.dwSize.X; */ - int twid = origcsbi.srWindow.Right - origcsbi.srWindow.Left; + int twid = origcsbi.srWindow.Right - origcsbi.srWindow.Left + 1; if (twid > 80) twid = 80; *wid = twid; - *hgt = origcsbi.srWindow.Bottom - origcsbi.srWindow.Top; + *hgt = origcsbi.srWindow.Bottom - origcsbi.srWindow.Top + 1; + set_option_mod_status("mouse_support", SET_IN_GAME); } void @@ -162,6 +164,8 @@ } } +extern boolean getreturn_disable; /* from sys/share/pcsys.c */ + static BOOL CtrlHandler(ctrltype) DWORD ctrltype; { @@ -172,6 +176,7 @@ case CTRL_CLOSE_EVENT: case CTRL_LOGOFF_EVENT: case CTRL_SHUTDOWN_EVENT: + getreturn_disable = TRUE; #ifndef NOSAVEONHANGUP hangup(0); #endif @@ -224,16 +229,18 @@ 0, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL,0); #endif GetConsoleMode(hConIn,&cmode); -#ifndef NO_MOUSE_ALLOWED +#ifdef NO_MOUSE_ALLOWED mask = ENABLE_PROCESSED_INPUT | ENABLE_LINE_INPUT | - ENABLE_ECHO_INPUT | ENABLE_WINDOW_INPUT; + ENABLE_MOUSE_INPUT | ENABLE_ECHO_INPUT | ENABLE_WINDOW_INPUT; #else mask = ENABLE_PROCESSED_INPUT | ENABLE_LINE_INPUT | - ENABLE_MOUSE_INPUT | ENABLE_ECHO_INPUT | ENABLE_WINDOW_INPUT; + ENABLE_ECHO_INPUT | ENABLE_WINDOW_INPUT; #endif /* Turn OFF the settings specified in the mask */ cmode &= ~mask; +#ifndef NO_MOUSE_ALLOWED cmode |= ENABLE_MOUSE_INPUT; +#endif SetConsoleMode(hConIn,cmode); if (!SetConsoleCtrlHandler((PHANDLER_ROUTINE)CtrlHandler, TRUE)) { /* Unable to set control handler */ @@ -312,46 +319,43 @@ {'i', 'I', C('i')}, /* Ins */ {'.', ':', ':'} /* Del */ }; -/* - * Unlike Ctrl-letter, the Alt-letter keystrokes have no specific ASCII - * meaning unless assigned one by a keyboard conversion table - * To interpret Alt-letters, we use a - * scan code table to translate the scan code into a letter, then set the - * "meta" bit for it. -3. - */ -#define SCANLO 0x02 - -static const char scanmap[] = { /* ... */ - '1','2','3','4','5','6','7','8','9','0',0,0,0,0, - 'q','w','e','r','t','y','u','i','o','p','[',']', '\n', - 0, 'a','s','d','f','g','h','j','k','l',';','\'', '`', - 0, '\\', 'z','x','c','v','b','n','m',',','.','?' /* ... */ -}; - -static const char *extendedlist = "acdefijlmnopqrstuvw?2"; -#define inmap(x) (SCANLO <= (x) && (x) < SCANLO + SIZE(scanmap)) +#define inmap(x,vk) (((x) > 'A' && (x) < 'Z') || (vk) == 0xBF || (x) == '2') -int FDECL(process_keystroke, (INPUT_RECORD *ir, boolean *valid)); +static BYTE KeyState[256]; + +int FDECL(process_keystroke, (INPUT_RECORD *ir, boolean *valid, int portdebug)); -int process_keystroke(ir, valid) +int process_keystroke(ir, valid, portdebug) INPUT_RECORD *ir; boolean *valid; +int portdebug; { - int metaflags = 0; - unsigned char ch; + int metaflags = 0, k; + int keycode, vk; + unsigned char ch, pre_ch; unsigned short int scan; unsigned long shiftstate; - int altseq; + int altseq = 0; const struct pad *kpad; shiftstate = 0L; - ch = ir->Event.KeyEvent.uChar.AsciiChar; + ch = pre_ch = ir->Event.KeyEvent.uChar.AsciiChar; scan = ir->Event.KeyEvent.wVirtualScanCode; + vk = ir->Event.KeyEvent.wVirtualKeyCode; + keycode = MapVirtualKey(vk, 2); shiftstate = ir->Event.KeyEvent.dwControlKeyState; - altseq=(shiftstate & (LEFT_ALT_PRESSED|RIGHT_ALT_PRESSED) && (ch || inmap(scan))); - if (ch || (iskeypad(scan)) || altseq) - *valid = 1; + KeyState[VK_SHIFT] = (shiftstate & SHIFT_PRESSED) ? 0x81 : 0; + KeyState[VK_CONTROL] = (shiftstate & (LEFT_CTRL_PRESSED|RIGHT_CTRL_PRESSED)) ? + 0x81 : 0; + KeyState[VK_CAPITAL] = (shiftstate & CAPSLOCK_ON) ? 0x81 : 0; + + if (shiftstate & (LEFT_ALT_PRESSED|RIGHT_ALT_PRESSED)) { + if (ch || inmap(keycode,vk)) altseq = 1; + else altseq = -1; /* invalid altseq */ + } + if (ch || (iskeypad(scan)) || (altseq > 0)) + *valid = TRUE; /* if (!valid) return 0; */ /* * shiftstate can be checked to see if various special @@ -379,13 +383,40 @@ ch = kpad[scan - KEYPADLO].normal; } } - else if (altseq) { /* ALT sequence */ - altseq = 0; - if (!ch && inmap(scan)) ch = scanmap[scan - SCANLO]; - if (index(extendedlist, tolower(ch)) != 0) ch = M(tolower(ch)); - else if (scan == (SCANLO + SIZE(scanmap)) - 1) ch = M('?'); + else if (altseq > 0) { /* ALT sequence */ + if (vk == 0xBF) ch = M('?'); + else ch = M(tolower(keycode)); } - return (ch == '\r') ? '\n' : ch; + /* Attempt to work better with international keyboards. */ + else { + WORD chr[2]; + k = ToAscii(vk, scan, KeyState, chr, 0); + if (k <= 2) + switch(k) { + case 2: /* two characters */ + ch = (unsigned char)chr[1]; + *valid = TRUE; + break; + case 1: /* one character */ + ch = (unsigned char)chr[0]; + *valid = TRUE; + break; + case 0: /* no translation */ + default: /* negative */ + *valid = FALSE; + } + } + if (ch == '\r') ch = '\n'; +#ifdef PORT_DEBUG + if (portdebug) { + char buf[BUFSZ]; + Sprintf(buf, + "PORTDEBUG: ch=%u, scan=%u, vk=%d, pre=%d, shiftstate=0x%X (ESC to end)\n", + ch, scan, vk, pre_ch, shiftstate); + xputs(buf); + } +#endif + return ch; } int @@ -395,11 +426,10 @@ boolean valid = 0; int ch; valid = 0; - while (!valid) - { + while (!valid) { ReadConsoleInput(hConIn,&ir,1,&count); if ((ir.EventType == KEY_EVENT) && ir.Event.KeyEvent.bKeyDown) - ch = process_keystroke(&ir, &valid); + ch = process_keystroke(&ir, &valid, 0); } return ch; } @@ -409,10 +439,7 @@ int *x, *y, *mod; { DWORD count; - unsigned short int scan; - unsigned char ch; - unsigned long shiftstate; - int altseq; + int keystroke = 0; int done = 0; boolean valid = 0; while (!done) @@ -420,34 +447,39 @@ count = 0; ReadConsoleInput(hConIn,&ir,1,&count); if (count > 0) { - ch = ir.Event.KeyEvent.uChar.AsciiChar; - scan = ir.Event.KeyEvent.wVirtualScanCode; - shiftstate = ir.Event.KeyEvent.dwControlKeyState; - altseq=(shiftstate & (LEFT_ALT_PRESSED|RIGHT_ALT_PRESSED) && (ch || inmap(scan))); - if (((ir.EventType == KEY_EVENT) && ir.Event.KeyEvent.bKeyDown) && - (ch || (iskeypad(scan)) || altseq)) { - *mod = 0; - return process_keystroke(&ir, &valid); - } else if ((ir.EventType == MOUSE_EVENT && - (ir.Event.MouseEvent.dwButtonState & MOUSEMASK))) { - *x = ir.Event.MouseEvent.dwMousePosition.X + 1; - *y = ir.Event.MouseEvent.dwMousePosition.Y - 1; + if (ir.EventType == KEY_EVENT && ir.Event.KeyEvent.bKeyDown) { + keystroke = process_keystroke(&ir, &valid, 0); + if (valid) return keystroke; + } else if (ir.EventType == MOUSE_EVENT) { + if ((ir.Event.MouseEvent.dwEventFlags == 0) && + (ir.Event.MouseEvent.dwButtonState & MOUSEMASK)) { + *x = ir.Event.MouseEvent.dwMousePosition.X + 1; + *y = ir.Event.MouseEvent.dwMousePosition.Y - 1; - if (ir.Event.MouseEvent.dwButtonState & LEFTBUTTON) + if (ir.Event.MouseEvent.dwButtonState & LEFTBUTTON) *mod = CLICK_1; - else if (ir.Event.MouseEvent.dwButtonState & RIGHTBUTTON) + else if (ir.Event.MouseEvent.dwButtonState & RIGHTBUTTON) *mod = CLICK_2; #if 0 /* middle button */ - else if (ir.Event.MouseEvent.dwButtonState & MIDBUTTON) + else if (ir.Event.MouseEvent.dwButtonState & MIDBUTTON) *mod = CLICK_3; #endif return 0; - - } - } + } + } +#if 0 + /* We ignore these types of console events */ + else if (ir.EventType == FOCUS_EVENT) { + } + else if (ir.EventType == MENU_EVENT) { + } +#endif + } else + done = 1; } - /* Not Reached */ - return '\032'; + /* NOTREACHED */ + *mod = 0; + return 0; } int @@ -459,7 +491,7 @@ unsigned short int scan; unsigned char ch; unsigned long shiftstate; - int altseq; + int altseq = 0, keycode, vk; done = 0; retval = 0; while (!done) @@ -467,23 +499,28 @@ count = 0; PeekConsoleInput(hConIn,&ir,1,&count); if (count > 0) { - ch = ir.Event.KeyEvent.uChar.AsciiChar; - scan = ir.Event.KeyEvent.wVirtualScanCode; - shiftstate = ir.Event.KeyEvent.dwControlKeyState; - altseq=(shiftstate & (LEFT_ALT_PRESSED|RIGHT_ALT_PRESSED) && (ch || inmap(scan))); - if (((ir.EventType == KEY_EVENT) && ir.Event.KeyEvent.bKeyDown) && - (ch || (iskeypad(scan)) || altseq)) { - done = 1; /* Stop looking */ - retval = 1; /* Found what we sought */ + if (ir.EventType == KEY_EVENT && ir.Event.KeyEvent.bKeyDown) { + ch = ir.Event.KeyEvent.uChar.AsciiChar; + scan = ir.Event.KeyEvent.wVirtualScanCode; + shiftstate = ir.Event.KeyEvent.dwControlKeyState; + vk = ir.Event.KeyEvent.wVirtualKeyCode; + keycode = MapVirtualKey(vk, 2); + if (shiftstate & (LEFT_ALT_PRESSED|RIGHT_ALT_PRESSED)) { + if (ch || inmap(keycode,vk)) altseq = 1; + else altseq = -1; /* invalid altseq */ + } + if (ch || iskeypad(scan) || altseq) { + done = 1; /* Stop looking */ + retval = 1; /* Found what we sought */ + } } - - else if ((ir.EventType == MOUSE_EVENT && + else if ((ir.EventType == MOUSE_EVENT && (ir.Event.MouseEvent.dwButtonState & MOUSEMASK))) { done = 1; retval = 1; } - else /* Discard it, its an insignificant event */ + else /* Discard it, it's an insignificant event */ ReadConsoleInput(hConIn,&ir,1,&count); } else /* There are no events in console event queue */ { done = 1; /* Stop looking */ @@ -616,8 +653,6 @@ void backsp() { - DWORD count; - GetConsoleScreenBufferInfo(hConOut,&csbi); if (csbi.dwCursorPosition.X > 0) ntcoord.X = csbi.dwCursorPosition.X-1; @@ -629,8 +664,6 @@ (currentcolor|currenthilite|currentbackground)); colorchange = FALSE; } - WriteConsole(hConOut," ",1,&count,0); - SetConsoleCursorPosition(hConOut,ntcoord); } void @@ -668,7 +701,7 @@ cl_end(); #else if (GetConsoleScreenBufferInfo(hConOut,&csbi)) { - int ccnt; + DWORD ccnt; COORD newcoord; newcoord.X = 0; @@ -754,51 +787,61 @@ } void -term_end_attr(int attr) +term_start_attr(int attr) { switch(attr){ - + case ATR_INVERSE: + if (iflags.wc_inverse) { + noninvertedcurrentcolor = currentcolor; + /* Suggestion by Lee Berger */ + if ((currentcolor & (FOREGROUND_GREEN|FOREGROUND_BLUE|FOREGROUND_RED)) == + (FOREGROUND_GREEN|FOREGROUND_BLUE|FOREGROUND_RED)) + currentcolor = 0; + currentbackground = (BACKGROUND_RED|BACKGROUND_BLUE|BACKGROUND_GREEN); + colorchange = TRUE; + break; + } /* else */ + /*FALLTHRU*/ case ATR_ULINE: case ATR_BOLD: case ATR_BLINK: - standoutend(); + standoutbeg(); break; - case ATR_INVERSE: - if (currentcolor == 0) - currentcolor = FOREGROUND_GREEN|FOREGROUND_BLUE|FOREGROUND_RED; - currentbackground = 0; - colorchange = TRUE; - break; default: +#ifdef DEBUG + impossible("term_start_attr: strange attribute %d", attr); +#endif standoutend(); if (currentcolor == 0) currentcolor = FOREGROUND_GREEN|FOREGROUND_BLUE|FOREGROUND_RED; currentbackground = 0; - currenthilite = 0; break; - } + } } void -term_start_attr(int attr) +term_end_attr(int attr) { switch(attr){ + case ATR_INVERSE: + if (iflags.wc_inverse) { + if (currentcolor == 0 && noninvertedcurrentcolor != 0) + currentcolor = noninvertedcurrentcolor; + noninvertedcurrentcolor = 0; + currentbackground = 0; + colorchange = TRUE; + break; + } /* else */ + /*FALLTHRU*/ case ATR_ULINE: case ATR_BOLD: case ATR_BLINK: - standoutbeg(); - break; - case ATR_INVERSE: - /* Suggestion by Lee Berger */ - if ((currentcolor & (FOREGROUND_GREEN|FOREGROUND_BLUE|FOREGROUND_RED)) == - (FOREGROUND_GREEN|FOREGROUND_BLUE|FOREGROUND_RED)) - currentcolor = 0; - currentbackground = (BACKGROUND_RED|BACKGROUND_BLUE|BACKGROUND_GREEN); - colorchange = TRUE; - break; default: standoutend(); + if (currentcolor == 0) + currentcolor = FOREGROUND_GREEN|FOREGROUND_BLUE|FOREGROUND_RED; + currentbackground = 0; break; } } @@ -851,4 +894,46 @@ colorchange = TRUE; } +#ifndef NO_MOUSE_ALLOWED +void +toggle_mouse_support() +{ + DWORD cmode; + GetConsoleMode(hConIn,&cmode); + if (iflags.wc_mouse_support) + cmode |= ENABLE_MOUSE_INPUT; + else + cmode &= ~ENABLE_MOUSE_INPUT; + SetConsoleMode(hConIn,cmode); +} +#endif + +/* handle tty options updates here */ +void nttty_preference_update(pref) +const char *pref; +{ + if( stricmp( pref, "mouse_support")==0) { +#ifndef NO_MOUSE_ALLOWED + toggle_mouse_support(); +#endif + } + return; +} + +#ifdef PORT_DEBUG +void +win32con_debug_keystrokes() +{ + DWORD count; + boolean valid = 0; + int ch; + xputs("\n"); + while (!valid || ch != 27) { + ReadConsoleInput(hConIn,&ir,1,&count); + if ((ir.EventType == KEY_EVENT) && ir.Event.KeyEvent.bKeyDown) + ch = process_keystroke(&ir, &valid, 1); + } + (void)doredraw(); +} +#endif #endif /* WIN32CON */ diff -Naurd ../nethack-3.4.0/sys/winnt/porthelp ./sys/winnt/porthelp --- ../nethack-3.4.0/sys/winnt/porthelp Wed Mar 20 23:44:03 2002 +++ ./sys/winnt/porthelp Mon Feb 24 15:25:05 2003 @@ -1,4 +1,4 @@ - Microsoft Windows specific help file for NetHack 3.4.0 + Microsoft Windows specific help file for NetHack 3.4.1 Copyright (c) NetHack PC Development Team 1993-2002. NetHack may be freely distributed. See license for details. (Last Revision: March 16, 2002) @@ -242,7 +242,7 @@ the map_mode option. Window Settings - Changes your logged-on user's settings for NetHack. -In 3.4.0, only one setting is available: NetHack mode, which can be +In 3.4.1, only one setting is available: NetHack mode, which can be checked or unchecked. NetHack mode allows you to use the ALT key for game key commands [see list above]. You can use F10 to access the menu bar while in NetHack mode. You can also clear your logged-on diff -Naurd ../nethack-3.4.0/sys/winnt/winnt.c ./sys/winnt/winnt.c --- ../nethack-3.4.0/sys/winnt/winnt.c Wed Mar 20 23:44:03 2002 +++ ./sys/winnt/winnt.c Mon Feb 24 15:25:05 2003 @@ -38,7 +38,6 @@ HANDLE ffhandle = (HANDLE)0; WIN32_FIND_DATA ffd; - /* 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] @@ -151,10 +150,7 @@ } /* - * Windows NT version >= 3.5x and above supports long file names, - * even on FAT volumes (VFAT), so no need for nt_regularize. - * Windows NT 3.1 could not do long file names except on NTFS, - * so nt_regularize was required. + * Strip out troublesome file system characters. */ void @@ -209,9 +205,16 @@ VA_INIT(s, const char *); /* error() may get called before tty is initialized */ if (iflags.window_inited) end_screen(); - putchar('\n'); - Vprintf(s,VA_ARGS); - putchar('\n'); + if (!strncmpi(windowprocs.name, "tty", 3)) { + putchar('\n'); + Vprintf(s,VA_ARGS); + putchar('\n'); + } else { + char buf[BUFSZ]; + (void) vsprintf(buf, s, VA_ARGS); + Strcat(buf, "\n"); + raw_printf(buf); + } VA_END(); exit(EXIT_FAILURE); } @@ -220,6 +223,16 @@ { (void)Sleep(ms); } + +void win32_abort() +{ + +#ifdef WIZARD + if (wizard) + DebugBreak(); +#endif + abort(); +} #endif /* WIN32 */ /*winnt.c*/