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

more msc makefile tweaks

Browse Source
This commit is contained in:
nhmall
2018-03-04 09:54:29 -05:00
parent 777317224b
commit 939bd356a4
3 changed files with 79 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sys/winnt/Makefile.msc
+10 -7
View File
@@ -1,4 +1,4 @@
# NetHack 3.6 Makefile.msc $NHDT-Date: 1520172650 2018/03/04 14:10:50 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.107 $ */ # NetHack 3.6 Makefile.msc $NHDT-Date: 1520175248 2018/03/04 14:54:08 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.108 $ */
# Copyright (c) NetHack PC Development Team 1993-2018 # Copyright (c) NetHack PC Development Team 1993-2018
# #
#============================================================================== #==============================================================================
@@ -913,10 +913,10 @@ $(MSWIN)\splash.bmp: $(U)uudecode.exe $(MSWIN)\splash.uu
# defer to the steps in ..\win\win32\levstuff.mak # defer to the steps in ..\win\win32\levstuff.mak
# #
$(U)lev_yacc.c: $(U)lev_yacc.c: $(U)lev_comp.y
nmake -nologo -f ..\win\win32\levstuff.mak $(U)lev_yacc.c nmake -nologo -f ..\win\win32\levstuff.mak $(U)lev_yacc.c
$(U)lev_lex.c: $(U)lev_lex.c: $(U)lev_comp.l
nmake -nologo -f ..\win\win32\levstuff.mak $(U)lev_lex.c nmake -nologo -f ..\win\win32\levstuff.mak $(U)lev_lex.c
$(INCL)\lev_comp.h: $(INCL)\lev_comp.h:
@@ -944,13 +944,13 @@ $(U)levcomp.exe: $(LEVCOMPOBJS)
# #
# defer to the steps in ..\win\win32\dgnstuff.mak # defer to the steps in ..\win\win32\dgnstuff.mak
# #
$(U)dgn_yacc.c: $(U)dgn_yacc.c: $(U)dgn_comp.y
nmake -nologo -f ..\win\win32\dgnstuff.mak $(U)dgn_yacc.c nmake -nologo -f ..\win\win32\dgnstuff.mak $(U)dgn_yacc.c
$(INCL)\dgn_comp.h: $(INCL)\dgn_comp.h:
nmake -nologo -f ..\win\win32\dgnstuff.mak $(INCL)\dgn_comp.h nmake -nologo -f ..\win\win32\dgnstuff.mak $(INCL)\dgn_comp.h
$(U)dgn_lex.c: $(U)dgn_lex.c: $(U)dgn_comp.l
nmake -nologo -f ..\win\win32\dgnstuff.mak $(U)dgn_lex.c nmake -nologo -f ..\win\win32\dgnstuff.mak $(U)dgn_lex.c
$(O)dgn_yacc.o: $(HACK_H) $(DGN_FILE_H) $(INCL)\dgn_comp.h $(U)dgn_yacc.c $(O)dgn_yacc.o: $(HACK_H) $(DGN_FILE_H) $(INCL)\dgn_comp.h $(U)dgn_yacc.c
@@ -1233,12 +1233,16 @@ spotless: clean
if exist $(O)sp_lev.tag del $(O)sp_lev.tag if exist $(O)sp_lev.tag del $(O)sp_lev.tag
if exist $(SRC)\monstr.c del $(SRC)\monstr.c if exist $(SRC)\monstr.c del $(SRC)\monstr.c
if exist $(SRC)\vis_tab.c del $(SRC)\vis_tab.c if exist $(SRC)\vis_tab.c del $(SRC)\vis_tab.c
if exist $(U)recover.exe del $(U)recover.exe
if exist nhdat. del nhdat. if exist nhdat. del nhdat.
if exist $(O)obj.tag del $(O)obj.tag if exist $(O)obj.tag del $(O)obj.tag
if exist $(O)gamedir.tag del $(O)gamedir.tag if exist $(O)gamedir.tag del $(O)gamedir.tag
if exist $(O)nh*key.lib del $(O)nh*key.lib if exist $(O)nh*key.lib del $(O)nh*key.lib
if exist $(O)nh*key.exp del $(O)nh*key.exp if exist $(O)nh*key.exp del $(O)nh*key.exp
if exist $(U)recover.exe del $(U)recover.exe
if exist $(U)tile2bmp.exe del $(U)tile2bmp.exe
if exist $(U)tilemap.exe del $(U)tilemap.exe
if exist $(U)uudecode.exe del $(U)uudecode.exe
if exist $(U)dlb_main.exe del $(U)dlb_main.exe
clean: clean:
if exist $(O)*.o del $(O)*.o if exist $(O)*.o del $(O)*.o
if exist $(O)utility.tag del $(O)utility.tag if exist $(O)utility.tag del $(O)utility.tag
@@ -1287,7 +1291,6 @@ clean:
rem defer to the steps in ..\win\win32\dgnstuff.mak rem defer to the steps in ..\win\win32\dgnstuff.mak
rem rem
nmake -nologo -f ..\win\win32\dgnstuff.mak clean nmake -nologo -f ..\win\win32\dgnstuff.mak clean
if exist $(TILEBMP16) del $(TILEBMP16) if exist $(TILEBMP16) del $(TILEBMP16)
if exist $(TILEBMP32) del $(TILEBMP32) if exist $(TILEBMP32) del $(TILEBMP32)
win/win32/dgnstuff.mak
+6 -3
View File
@@ -45,7 +45,8 @@ tools:
!IF "$(YACC)"=="" !IF "$(YACC)"==""
@echo Using pre-built dgn_comp.h @echo Using pre-built dgn_comp.h
chdir ..\include chdir ..\include
copy /b ..\sys\share\dgn_comp.h +,, copy /y ..\sys\share\dgn_comp.h
copy /b dgn_comp.h+,,
chdir ..\src chdir ..\src
!ELSE !ELSE
chdir ..\util chdir ..\util
@@ -61,7 +62,8 @@ tools:
!IF "$(YACC)"=="" !IF "$(YACC)"==""
@echo Using pre-built dgn_yacc.c @echo Using pre-built dgn_yacc.c
chdir ..\util chdir ..\util
copy /b ..\sys\share\dgn_yacc.c +,, copy /y ..\sys\share\dgn_yacc.c
copy /b dgn_yacc.c+,,
chdir ..\src chdir ..\src
!ELSE !ELSE
chdir ..\util chdir ..\util
@@ -77,7 +79,8 @@ tools:
!IF "$(LEX)"=="" !IF "$(LEX)"==""
@echo Using pre-built dgn_lex.c @echo Using pre-built dgn_lex.c
chdir ..\util chdir ..\util
copy /b ..\sys\share\dgn_lex.c +,, copy /y ..\sys\share\dgn_lex.c
copy /b dgn_lex.c+,,
chdir ..\src chdir ..\src
!ELSE !ELSE
chdir ..\util chdir ..\util
win/win32/levstuff.mak
+6 -3
View File
@@ -44,7 +44,8 @@ tools:
!IFNDEF YACC !IFNDEF YACC
@echo Using pre-built lev_comp.h @echo Using pre-built lev_comp.h
chdir ..\include chdir ..\include
copy /b ..\sys\share\lev_comp.h +,, copy /y ..\sys\share\lev_comp.h
copy /b lev_comp.h+,,
chdir ..\src chdir ..\src
!ELSE !ELSE
@echo Generating lev_yacc.c and lev_comp.h @echo Generating lev_yacc.c and lev_comp.h
@@ -61,7 +62,8 @@ tools:
!IFNDEF YACC !IFNDEF YACC
@echo Using pre-built lev_yacc.c @echo Using pre-built lev_yacc.c
chdir ..\util chdir ..\util
copy /b ..\sys\share\lev_yacc.c +,, copy /y ..\sys\share\lev_yacc.c
copy /b lev_yacc.c+,,
chdir ..\src chdir ..\src
!ELSE !ELSE
@echo Generating lev_yacc.c and lev_comp.h @echo Generating lev_yacc.c and lev_comp.h
@@ -78,7 +80,8 @@ tools:
!IFNDEF LEX !IFNDEF LEX
@echo Using pre-built lev_lex.c @echo Using pre-built lev_lex.c
chdir ..\util chdir ..\util
copy /b ..\sys\share\lev_lex.c +,, copy /y ..\sys\share\lev_lex.c
copy /b lev_lex.c+,,
chdir ..\src chdir ..\src
!ELSE !ELSE
@echo Generating lev_lex.c @echo Generating lev_lex.c