From: nhmall <nhmall@nethack.org>
Date: Mon, 25 Apr 2022 19:16:41 +0000 (-0400)
Subject: rename sys/windows/Makefile.msc
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=63a0a63730cea7a3ce0bac296c5169be32fa7bb7;p=nethack

rename sys/windows/Makefile.msc

rename sys/windows/Makefile.msc to sys/windows/Makefile.nmake
---

diff --git a/outdated/sys/windows/vs/travisci.sh b/outdated/sys/windows/vs/travisci.sh
index 5d530395f..f9f1b5080 100644
--- a/outdated/sys/windows/vs/travisci.sh
+++ b/outdated/sys/windows/vs/travisci.sh
@@ -43,7 +43,7 @@ export ADD_CURSES=Y
 export PDCURSES_TOP=../lib/pdcurses
 export
 cd src
-cp ../sys/windows/Makefile.msc ./Makefile
+cp ../sys/windows/Makefile.nmake ./Makefile
 nmake install
 cd ..
 powershell -Command "Compress-Archive -U -Path binary/* -DestinationPath $TRAVIS_TAG.x86.zip"
diff --git a/sys/windows/Install.windows b/sys/windows/Install.windows
index 50b6e3b02..bde546a30 100644
--- a/sys/windows/Install.windows
+++ b/sys/windows/Install.windows
@@ -122,7 +122,7 @@ Via zip download
         to
             LUATOP = ../lib/lua-5.4.4
 
-      In sys/windows/Makefile.msc
+      In sys/windows/Makefile.nmake
         change from
             PDCURSES_TOP = ..\submodules\pdcurses
         to
@@ -290,7 +290,7 @@ Compiling
 
     For the Visual Studio compiler:
 	Issue these commands:
-            copy ..\sys\windows\Makefile.msc Makefile
+            copy ..\sys\windows\Makefile.nmake Makefile
 	    nmake install
 
     For GCC:
diff --git a/sys/windows/Makefile.msc b/sys/windows/Makefile.nmake
similarity index 99%
rename from sys/windows/Makefile.msc
rename to sys/windows/Makefile.nmake
index a434f7b3e..127f655c5 100644
--- a/sys/windows/Makefile.msc
+++ b/sys/windows/Makefile.nmake
@@ -1,4 +1,4 @@
-# NetHack 3.7 Makefile.msc
+# NetHack 3.7 Makefile.nmake
 #       Copyright (c) NetHack Development Team 1993-2022
 #
 #==============================================================================
@@ -1124,7 +1124,7 @@ $(O)utility.tag: $(INCL)\nhlua.h $(U)tile2bmp.exe $(U)makedefs.exe
 	     @echo utilities made.
 
 $(INCL)\nhlua.h:
-	@echo  /* nhlua.h - generated by Makefile from Makefile.msc */ > $@
+	@echo  /* nhlua.h - generated by Makefile from Makefile.nmake */ > $@
 	@echo #include "lua.h" >> $@
 	@echo LUA_API int   (lua_error) (lua_State *L) NORETURN; >> $@
 	@echo #include "lualib.h" >> $@
diff --git a/sys/windows/nhsetup.bat b/sys/windows/nhsetup.bat
index beaba7bed..2565c2bbe 100755
--- a/sys/windows/nhsetup.bat
+++ b/sys/windows/nhsetup.bat
@@ -35,15 +35,15 @@ REM Some file movemet for those that still want to use MAKE or NMAKE and a Makef
 :do_tty
 if NOT exist %BINPATH%\*.* mkdir %BINPATH%
 if NOT exist %BINPATH%\license copy ..\..\dat\license %BINPATH%\license >nul
-echo Copying Microsoft Makefile - Makefile.msc to ..\..\src\Makefile...
-if NOT exist ..\..\src\Makefile goto :domsc
+echo Copying Microsoft Makefile - Makefile.nmake to ..\..\src\Makefile...
+if NOT exist ..\..\src\Makefile goto :donmake
 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
+:donmake
+copy Makefile.nmake ..\..\src\Makefile >nul
 echo Microsoft Makefile copied ok.
 
 echo Done copying files.