From: nhmall Date: Sat, 20 Jun 2015 13:00:20 +0000 (-0400) Subject: more windows instruction cleanup X-Git-Tag: NetHack-3.6.0_RC01~256 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6be4506fb60c604e566e8e44efe117bcc95e702f;p=nethack more windows instruction cleanup --- diff --git a/sys/winnt/Install.nt b/sys/winnt/Install.nt index 84633c395..a67d668e8 100644 --- a/sys/winnt/Install.nt +++ b/sys/winnt/Install.nt @@ -1,11 +1,11 @@ - Copyright (c) NetHack Development Team 1990-2012 + Copyright (c) NetHack Development Team 1990-2015 NetHack may be freely redistributed. See license for details. ============================================================== Instructions for compiling and installing NetHack 3.6 on a Windows system - (Windows XP and Windows 2003 or later only) + (Windows 7/8.x or later only. XP may work but is untested) ============================================================== - Last revision: $NHDT-Date: 1432512793 2015/05/25 00:13:13 $ + Last revision: $NHDT-Date: 1432512793 2015/05/25 00:13:13 $ Credit for the porting of NetHack to the Win32 Console Subsystem goes to the NT Porting Team started by Michael Allison. @@ -22,29 +22,15 @@ 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 Studio 2010 Express + o A copy of Microsoft Visual Studio 2013 Express The current NetHack code has not been tested with earlier versions of the compiler. - 64-bit Note: To build a 64-bit target with the Express edition, you - will also need to download and install the - Windows Software Development Kit version 7.1 - Visual Studio 2010 Express does not include a 64 bit - C compiler by default. - (http://msdn.microsoft.com/en-us/windowsserver/bb980924.aspx) - OR - o [UNTESTED FOR 3.5] 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/ - - OR - - o [UNTESTED FOR 3.5] A copy of MinGW 2.0 or later. MinGW is a collection of header + o A copy of MinGW. MinGW is a collection of header files and import libraries with which native Windows32 programs - can be built; the MinGW 2.0 distribution contains the GNU Compiler + can be built; the MinGW distribution contains the GNU Compiler Collection. You can download MinGW at http://www.mingw.org/ Earlier versions of MinGW will not allow you to build the Windows @@ -107,18 +93,14 @@ I. Dispelling the Myths: We have provided a Makefile for each of the following compilers: - o Microsoft Visual Studio 2010 Express Visual C++ Compiler - o Borland C 5.5.1 + o Microsoft Visual Studio 2013 Express Visual C++ Compiler o MinGW 2.0 (with GCC 3.2) - The Microsoft Visual Studio 2010 Express Makefile was created for use + The Microsoft Visual Studio 2013 Express 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 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 GCC Makefile was created for use with GNU Make version 3.79.1, which comes with the MinGW package. @@ -127,7 +109,7 @@ I. Dispelling the Myths: 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 Windows NT/2000/XP machine: +II. To compile your copy of NetHack on a Windows machine: Setting Up @@ -136,44 +118,18 @@ Setting Up all the necessary environment variables for the compiler environment are set correctly. - For Visual Studio 2010 Express, the installation should have placed + For Visual Studio 2013 Express, the installation should have placed a command prompt option on the Start menus that is properly configured for building: From - Start | All Programs | Microsoft Visual Studio 2010 Express - Select - Visual Studio Command Prompt 2010 - - - 64-bit Note: The additional installation of Microsoft Windows SDK V7.1 - will have placed a command prompt option on the Start menus - that is properly configured for building as well, but - supports the Windows SDK tools. That is what should be - used if you wish to target an x64 build for example. - From - Start | All Programs | Microsoft Windows SDK v7.1 + Start | All Programs | Microsoft Visual Studio 2013 Express Select - Windows SDK 7.1 Command Prompt - - Then, for an x86 (32-bit) target run the following at the - command prompt: - SETENV /x86 - - If you prefer to target an x64 (64-bit) build run the - following at the command prompt: - SETENV /x64 + Visual Studio Command Prompt 2013 For the GCC Makefile, add \bin to your path, where is your MinGW root directory.). - 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". NetHack 3.6.0 has not - yet been tested with the Borland compiler. - - 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, and binary (The @@ -256,42 +212,17 @@ Compiling 5. Now that everything is set up... - For Visual Studio 2010 Express, as mentioned above, the installation should + For Visual Studio 2013 Express, as mentioned above, the installation should have placed a command prompt option on the Start menus that is properly configured for building: From - Start | All Programs | Microsoft Visual Studio 2010 Express + Start | All Programs | Microsoft Visual Studio 2013 Express Select - Visual Studio Command Prompt 2010 + Visual Studio Command Prompt 2013 Change your current directory to the NetHack src directory. Issue this command: nmake install - 64-bit Note: As previously mentioned, you should start your - command prompt from the Windows SDK v7.1 menu - which is properly configured for building using - the Windows SDK tools. - From - Start | All Programs | Microsoft Windows SDK v7.1 - Select - Windows SDK 7.1 Command Prompt - Change your current directory to the NetHack src directory. - - Then, for an x86 (32-bit) target run the following at the - command prompt: - SETENV /x86 - nmake install - - If you prefer to target an x64 (64-bit) build run the - following at the command prompt: - SETENV /x64 - nmake install - - For Borland compiler: - Change your current directory to the NetHack src directory. - Issue this command: - make /f Makefile.bcc install - For GCC: Change your current directory to the NetHack src directory. Issue this command: @@ -316,9 +247,6 @@ Notes: For Microsoft compiler: nmake - For Borland compiler: - make /f Makefile.bcc - For GCC: mingw32-make -f Makefile.gcc @@ -334,7 +262,7 @@ Notes: 2. Depending on the build and compiler and tools used above, the executable produced by the TTY build is either: - a 32-bit (x86), flat-address space, non-overlayed .exe file, - which should run on any true Win32 environment. + which should run on any recent Win32 environment. or - a 64-bit (x64) .exe file, which should run on any 64-bit Windows O/S. @@ -342,11 +270,11 @@ Notes: To run NetHack, proceed to RUNNING NETHACK. /-------------------------------------------------\ -| BUILDING USING VISUAL STUDIO 2010 EXPRESS IDE | +| BUILDING USING VISUAL STUDIO 2013 EXPRESS IDE | \-------------------------------------------------/ Only the native port built on the Windows API, or Graphical -NetHack, can be built using the Visual Studo 2010 Express IDE. +NetHack, can be built using the Visual Studo 2013 Express IDE. I. Dispelling the Myths: @@ -360,17 +288,17 @@ I. Dispelling the Myths: back and do so before proceeding. II. To compile your copy of NetHack for Windows on a Windows machine - using the Visual Studio 2010 Express IDE: + using the Visual Studio 2013 Express IDE: Setting Up 1. It almost goes without saying that you should make sure that your tools are set up and running correctly. (For the Microsoft Visual - Studio 2010 ExpressIDE it should correctly fire up when you choose + Studio 2013 ExpressIDE it should correctly fire up when you choose it: - Start | All Programs | Microsoft Visual Studio 2010 Express + Start | All Programs | Microsoft Visual Studio 2013 Express and select - Visual C++ 2010 Express + Visual C++ 2013 Express 2. Make sure all the NetHack files are in the appropriate directory structure. You should have a main directory with subdirectories @@ -421,12 +349,12 @@ Setting Up as explained above. However, the IDE build has full game functionality. - Start the Visual Studio 2010 Express IDE: - Start | All Programs | Microsoft Visual Studio 2010 Express + Start the Visual Studio 2013 Express IDE: + Start | All Programs | Microsoft Visual Studio 2013 Express and select - Visual C++ 2010 Express + Visual C++ 2013 Express - In the Visual C++ 2010 Express IDE menus, choose: + In the Visual C++ 2013 Express IDE menus, choose: File | Open Project/Solution @@ -435,7 +363,7 @@ Setting Up In the Visual C dialog box, navigate to the top of your NetHack source directory. - In there, highlight "nethack.sln" for Visual C++ 2010 Express Edition + In there, highlight "nethack.sln" for Visual C++ 2013 Express Edition and click on Open. Once the workspace or solution has been opened, you should see @@ -452,11 +380,11 @@ Setting Up + tilemap + uudecode - On the Visual C++ 2010 Express IDE menus, NetHackW should be the startup + On the Visual C++ 2013 Express IDE menus, NetHackW should be the startup project in bold, but if it isn't make it so by right-clicking and choosing "set as Startup Project." - In Visual C 2010 Express IDE menus right-click on + In Visual C 2013 Express IDE menus right-click on "Solution NetHack (12 Projects)" and select "Configuration Manager." Set the "Active Solution Configuration" to either diff --git a/sys/winnt/nhsetup.bat b/sys/winnt/nhsetup.bat index d8b666c31..d477b301c 100755 --- a/sys/winnt/nhsetup.bat +++ b/sys/winnt/nhsetup.bat @@ -60,17 +60,6 @@ echo ..\..\src\Makefile-orig 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