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

rename sys/windows/Makefile.msc

Browse Source 
rename sys/windows/Makefile.msc to sys/windows/Makefile.nmake
This commit is contained in:
nhmall
2022-04-25 15:16:41 -04:00
parent 9c2ca1577f
commit 63a0a63730
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
outdated/sys/windows/vs/travisci.sh
+1 -1
View File
@@ -43,7 +43,7 @@ export ADD_CURSES=Y
export PDCURSES_TOP=../lib/pdcurses export PDCURSES_TOP=../lib/pdcurses
export export
cd src cd src
cp ../sys/windows/Makefile.msc ./Makefile cp ../sys/windows/Makefile.nmake ./Makefile
nmake install nmake install
cd .. cd ..
powershell -Command "Compress-Archive -U -Path binary/* -DestinationPath $TRAVIS_TAG.x86.zip" powershell -Command "Compress-Archive -U -Path binary/* -DestinationPath $TRAVIS_TAG.x86.zip"
sys/windows/Install.windows
+2 -2
View File
@@ -122,7 +122,7 @@ Via zip download
to to
LUATOP = ../lib/lua-5.4.4 LUATOP = ../lib/lua-5.4.4
In sys/windows/Makefile.msc In sys/windows/Makefile.nmake
change from change from
PDCURSES_TOP = ..\submodules\pdcurses PDCURSES_TOP = ..\submodules\pdcurses
to to
@@ -290,7 +290,7 @@ Compiling
For the Visual Studio compiler: For the Visual Studio compiler:
Issue these commands: Issue these commands:
copy ..\sys\windows\Makefile.msc Makefile copy ..\sys\windows\Makefile.nmake Makefile
nmake install nmake install
For GCC: For GCC:
sys/windows/Makefile.msc → sys/windows/Makefile.nmake
+2 -2
View File
@@ -1,4 +1,4 @@
# NetHack 3.7 Makefile.msc # NetHack 3.7 Makefile.nmake
# Copyright (c) NetHack Development Team 1993-2022 # 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. @echo utilities made.
$(INCL)\nhlua.h: $(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 #include "lua.h" >> $@
@echo LUA_API int (lua_error) (lua_State *L) NORETURN; >> $@ @echo LUA_API int (lua_error) (lua_State *L) NORETURN; >> $@
@echo #include "lualib.h" >> $@ @echo #include "lualib.h" >> $@
sys/windows/nhsetup.bat
+4 -4
View File
@@ -35,15 +35,15 @@ REM Some file movemet for those that still want to use MAKE or NMAKE and a Makef
:do_tty :do_tty
if NOT exist %BINPATH%\*.* mkdir %BINPATH% if NOT exist %BINPATH%\*.* mkdir %BINPATH%
if NOT exist %BINPATH%\license copy ..\..\dat\license %BINPATH%\license >nul if NOT exist %BINPATH%\license copy ..\..\dat\license %BINPATH%\license >nul
echo Copying Microsoft Makefile - Makefile.msc to ..\..\src\Makefile... echo Copying Microsoft Makefile - Makefile.nmake to ..\..\src\Makefile...
if NOT exist ..\..\src\Makefile goto :domsc if NOT exist ..\..\src\Makefile goto :donmake
copy ..\..\src\Makefile ..\..\src\Makefile-orig >nul copy ..\..\src\Makefile ..\..\src\Makefile-orig >nul
echo Your existing echo Your existing
echo ..\..\src\Makefile echo ..\..\src\Makefile
echo has been renamed to echo has been renamed to
echo ..\..\src\Makefile-orig echo ..\..\src\Makefile-orig
:domsc :donmake
copy Makefile.msc ..\..\src\Makefile >nul copy Makefile.nmake ..\..\src\Makefile >nul
echo Microsoft Makefile copied ok. echo Microsoft Makefile copied ok.
echo Done copying files. echo Done copying files.