From 42e0b794dcb947ee9e7ecdb7d2454c761afaff9d Mon Sep 17 00:00:00 2001 From: "nethack.allison" Date: Fri, 14 Mar 2003 17:26:04 +0000 Subject: [PATCH] win32 Makefile.gcc It looks like someone's mailer ate the tabs out of the patch and turned them into spaces. --- sys/winnt/Makefile.gcc | 352 ++++++++++++++++++++--------------------- 1 file changed, 175 insertions(+), 177 deletions(-) diff --git a/sys/winnt/Makefile.gcc b/sys/winnt/Makefile.gcc index 1ba96c9cf..38a01fb6a 100644 --- a/sys/winnt/Makefile.gcc +++ b/sys/winnt/Makefile.gcc @@ -249,24 +249,24 @@ endif #========================================== $(OBJ)/%.o : /%.c - @$(cc) $(CFLAGS) -o$@ $< + $(cc) $(CFLAGS) -o$@ $< $(OBJ)/%.o : $(SRC)/%.c - @$(cc) $(CFLAGS) -o$@ $< + $(cc) $(CFLAGS) -o$@ $< #========================================== # Rules for files in sys/share #========================================== $(OBJ)/%.o : $(SSYS)/%.c - @$(cc) $(CFLAGS) -o$@ $< + $(cc) $(CFLAGS) -o$@ $< #========================================== # Rules for files in sys/winnt #========================================== $(OBJ)/%.o : $(NTSYS)/%.c - @$(cc) $(CFLAGS) -o$@ $< + $(cc) $(CFLAGS) -o$@ $< $(INCL)/%.h : $(NTSYS)/%.h @copy $< $@ @@ -276,14 +276,14 @@ $(INCL)/%.h : $(NTSYS)/%.h #========================================== $(OBJ)/%.o : $(UTIL)/%.c - @$(cc) $(CFLAGSU) -o$@ $< + $(cc) $(CFLAGSU) -o$@ $< #========================================== # Rules for files in win/share #========================================== $(OBJ)/%.o : $(WSHR)/%.c - @$(cc) $(CFLAGS) -o$@ $< + $(cc) $(CFLAGS) -o$@ $< $(INCL)/%.h : $(WSHR)/%.h @copy $< $@ @@ -296,14 +296,14 @@ $(INCL)/%.h : $(WSHR)/%.h #========================================== $(OBJ)/%.o : $(TTY)/%.c - @$(cc) $(CFLAGS) -o$@ $< + $(cc) $(CFLAGS) -o$@ $< #========================================== # Rules for files in win/win32 #========================================== $(OBJ)/%.o : $(WIN32)/%.c - @$(cc) $(CFLAGS) -o$@ $< + $(cc) $(CFLAGS) -o$@ $< #========================================== #================ MACROS ================== @@ -422,25 +422,25 @@ endif #========================================== CONFIG_H = $(INCL)/config.h $(INCL)/config1.h $(INCL)/tradstdc.h \ - $(INCL)/global.h $(INCL)/coord.h $(INCL)/vmsconf.h \ - $(INCL)/system.h $(INCL)/unixconf.h $(INCL)/os2conf.h \ - $(INCL)/micro.h $(INCL)/pcconf.h $(INCL)/tosconf.h \ - $(INCL)/amiconf.h $(INCL)/macconf.h $(INCL)/beconf.h \ - $(INCL)/ntconf.h $(INCL)/nhlan.h + $(INCL)/global.h $(INCL)/coord.h $(INCL)/vmsconf.h \ + $(INCL)/system.h $(INCL)/unixconf.h $(INCL)/os2conf.h \ + $(INCL)/micro.h $(INCL)/pcconf.h $(INCL)/tosconf.h \ + $(INCL)/amiconf.h $(INCL)/macconf.h $(INCL)/beconf.h \ + $(INCL)/ntconf.h $(INCL)/nhlan.h HACK_H = $(INCL)/hack.h $(CONFIG_H) $(INCL)/align.h \ - $(INCL)/dungeon.h $(INCL)/monsym.h $(INCL)/mkroom.h \ - $(INCL)/objclass.h $(INCL)/youprop.h $(INCL)/prop.h \ - $(INCL)/permonst.h $(INCL)/monattk.h \ - $(INCL)/monflag.h $(INCL)/mondata.h $(INCL)/pm.h \ - $(INCL)/wintype.h $(INCL)/decl.h $(INCL)/quest.h \ - $(INCL)/spell.h $(INCL)/color.h $(INCL)/obj.h \ - $(INCL)/you.h $(INCL)/attrib.h $(INCL)/monst.h \ - $(INCL)/skills.h $(INCL)/onames.h $(INCL)/timeout.h \ - $(INCL)/trap.h $(INCL)/flag.h $(INCL)/rm.h \ - $(INCL)/vision.h $(INCL)/display.h $(INCL)/engrave.h \ - $(INCL)/rect.h $(INCL)/region.h $(INCL)/winprocs.h \ - $(INCL)/wintty.h $(INCL)/trampoli.h + $(INCL)/dungeon.h $(INCL)/monsym.h $(INCL)/mkroom.h \ + $(INCL)/objclass.h $(INCL)/youprop.h $(INCL)/prop.h \ + $(INCL)/permonst.h $(INCL)/monattk.h \ + $(INCL)/monflag.h $(INCL)/mondata.h $(INCL)/pm.h \ + $(INCL)/wintype.h $(INCL)/decl.h $(INCL)/quest.h \ + $(INCL)/spell.h $(INCL)/color.h $(INCL)/obj.h \ + $(INCL)/you.h $(INCL)/attrib.h $(INCL)/monst.h \ + $(INCL)/skills.h $(INCL)/onames.h $(INCL)/timeout.h \ + $(INCL)/trap.h $(INCL)/flag.h $(INCL)/rm.h \ + $(INCL)/vision.h $(INCL)/display.h $(INCL)/engrave.h \ + $(INCL)/rect.h $(INCL)/region.h $(INCL)/winprocs.h \ + $(INCL)/wintty.h $(INCL)/trampoli.h LEV_H = $(INCL)/lev.h DGN_FILE_H = $(INCL)/dgn_file.h @@ -494,7 +494,7 @@ install: graphicschk $(GAME) $(O)install.tag $(O)install.tag: $(DAT)/data $(DAT)/rumors $(DAT)/dungeon \ - $(DAT)/oracles $(DAT)/quest.dat $(O)sp_lev.tag $(DLB) + $(DAT)/oracles $(DAT)/quest.dat $(O)sp_lev.tag $(DLB) ifeq "$(USE_DLB)" "Y" $(subst /,\,copy nhdat $(GAMEDIR)) $(subst /,\,copy $(DAT)/license $(GAMEDIR)) @@ -506,7 +506,7 @@ else 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 /,\,copy $(NTSYS)/defaults.nh $(GAMEDIR)/defaults.nh) + $(subst /,\,copy $(NTSYS)/defaults.nh $(GAMEDIR)/defaults.nh) $(subst /,\,echo install done > $@) # copy $(NTSYS)/winnt.hlp $(GAMEDIR) @@ -516,44 +516,44 @@ recover: $(U)recover.exe $(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 \ - $(DAT)/yendor.des $(DAT)/arch.des $(DAT)/barb.des \ - $(DAT)/caveman.des $(DAT)/healer.des $(DAT)/knight.des \ - $(DAT)/monk.des $(DAT)/priest.des $(DAT)/ranger.des \ - $(DAT)/rogue.des $(DAT)/samurai.des $(DAT)/sokoban.des \ - $(DAT)/tourist.des $(DAT)/valkyrie.des $(DAT)/wizard.des - $(subst /,\,$(U)lev_comp $(DAT)/bigroom.des) - $(subst /,\,$(U)lev_comp $(DAT)/castle.des) - $(subst /,\,$(U)lev_comp $(DAT)/endgame.des) - $(subst /,\,$(U)lev_comp $(DAT)/gehennom.des) - $(subst /,\,$(U)lev_comp $(DAT)/knox.des) - $(subst /,\,$(U)lev_comp $(DAT)/mines.des) - $(subst /,\,$(U)lev_comp $(DAT)/medusa.des) - $(subst /,\,$(U)lev_comp $(DAT)/oracle.des) - $(subst /,\,$(U)lev_comp $(DAT)/sokoban.des) - $(subst /,\,$(U)lev_comp $(DAT)/tower.des) - $(subst /,\,$(U)lev_comp $(DAT)/yendor.des) - $(subst /,\,$(U)lev_comp $(DAT)/arch.des) - $(subst /,\,$(U)lev_comp $(DAT)/barb.des) - $(subst /,\,$(U)lev_comp $(DAT)/caveman.des) - $(subst /,\,$(U)lev_comp $(DAT)/healer.des) - $(subst /,\,$(U)lev_comp $(DAT)/knight.des) - $(subst /,\,$(U)lev_comp $(DAT)/monk.des) - $(subst /,\,$(U)lev_comp $(DAT)/priest.des) - $(subst /,\,$(U)lev_comp $(DAT)/ranger.des) - $(subst /,\,$(U)lev_comp $(DAT)/rogue.des) - $(subst /,\,$(U)lev_comp $(DAT)/samurai.des) - $(subst /,\,$(U)lev_comp $(DAT)/tourist.des) - $(subst /,\,$(U)lev_comp $(DAT)/valkyrie.des) - $(subst /,\,$(U)lev_comp $(DAT)/wizard.des) - $(subst /,\,copy *.lev $(DAT)) - $(subst /,\,del *.lev) + $(DAT)/endgame.des $(DAT)/gehennom.des $(DAT)/knox.des \ + $(DAT)/medusa.des $(DAT)/oracle.des $(DAT)/tower.des \ + $(DAT)/yendor.des $(DAT)/arch.des $(DAT)/barb.des \ + $(DAT)/caveman.des $(DAT)/healer.des $(DAT)/knight.des \ + $(DAT)/monk.des $(DAT)/priest.des $(DAT)/ranger.des \ + $(DAT)/rogue.des $(DAT)/samurai.des $(DAT)/sokoban.des \ + $(DAT)/tourist.des $(DAT)/valkyrie.des $(DAT)/wizard.des + $(subst /,\,$(U)lev_comp $(DAT)/bigroom.des) + $(subst /,\,$(U)lev_comp $(DAT)/castle.des) + $(subst /,\,$(U)lev_comp $(DAT)/endgame.des) + $(subst /,\,$(U)lev_comp $(DAT)/gehennom.des) + $(subst /,\,$(U)lev_comp $(DAT)/knox.des) + $(subst /,\,$(U)lev_comp $(DAT)/mines.des) + $(subst /,\,$(U)lev_comp $(DAT)/medusa.des) + $(subst /,\,$(U)lev_comp $(DAT)/oracle.des) + $(subst /,\,$(U)lev_comp $(DAT)/sokoban.des) + $(subst /,\,$(U)lev_comp $(DAT)/tower.des) + $(subst /,\,$(U)lev_comp $(DAT)/yendor.des) + $(subst /,\,$(U)lev_comp $(DAT)/arch.des) + $(subst /,\,$(U)lev_comp $(DAT)/barb.des) + $(subst /,\,$(U)lev_comp $(DAT)/caveman.des) + $(subst /,\,$(U)lev_comp $(DAT)/healer.des) + $(subst /,\,$(U)lev_comp $(DAT)/knight.des) + $(subst /,\,$(U)lev_comp $(DAT)/monk.des) + $(subst /,\,$(U)lev_comp $(DAT)/priest.des) + $(subst /,\,$(U)lev_comp $(DAT)/ranger.des) + $(subst /,\,$(U)lev_comp $(DAT)/rogue.des) + $(subst /,\,$(U)lev_comp $(DAT)/samurai.des) + $(subst /,\,$(U)lev_comp $(DAT)/tourist.des) + $(subst /,\,$(U)lev_comp $(DAT)/valkyrie.des) + $(subst /,\,$(U)lev_comp $(DAT)/wizard.des) + $(subst /,\,copy *.lev $(DAT)) + $(subst /,\,del *.lev) $(subst /,\,echo sp_levs done > $(O)sp_lev.tag) $(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 $(TILEUTIL16) + $(SRC)/monstr.c $(SRC)/vis_tab.c $(U)lev_comp.exe $(INCL)/vis_tab.h \ + $(U)dgn_comp.exe $(TILEUTIL16) $(subst /,\,@echo utilities made >$@) @echo utilities made. @@ -562,9 +562,9 @@ tileutil: $(U)gif2txt.exe $(U)gif2tx32.exe $(U)txt2ppm.exe 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 + $(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 @@ -575,40 +575,38 @@ endif # The main target. #========================================== $(O)gamedir.tag: - $(subst /,\,@if not exist $(GAMEDIR)/*.* echo creating directory $(GAMEDIR)) - $(subst /,\,@if not exist $(GAMEDIR)/*.* mkdir $(GAMEDIR)) - $(subst /,\,@echo directory created > $@) + $(subst /,\,@if not exist $(GAMEDIR)/*.* echo creating directory $(GAMEDIR)) + $(subst /,\,@if not exist $(GAMEDIR)/*.* mkdir $(GAMEDIR)) + $(subst /,\,@echo directory created > $@) ifeq "$(GRAPHICAL)" "Y" $(GAMEFILE) : $(ALLOBJ) $(NHRES) $(O)gamedir.tag else $(GAMEFILE) : $(ALLOBJ) $(NHRES) $(O)gamedir.tag \ - $(GAMEDIR)/nhdefkey.dll $(GAMEDIR)/nh340key.dll + $(GAMEDIR)/nhdefkey.dll $(GAMEDIR)/nh340key.dll endif @echo Linking.... @$(link) $(lflags) -o$@ $(ALLOBJ) $(NHRES) $(WINPLIBS) $(subst /,\,@if exist $(O)install.tag del $(O)install.tag) - + $(O)nhdefkey.o: - $(cc) $(CFLAGS) -DBUILD_DLL -o$@ $(NTSYS)/nhdefkey.c + $(cc) $(CFLAGS) -DBUILD_DLL -o$@ $(NTSYS)/nhdefkey.c $(GAMEDIR)/nhdefkey.dll : $(O)nhdefkey.o $(O)gamedir.tag - @echo Linking $@ - $(cc) -shared -Wl,--export-all-symbols \ - -Wl,--add-stdcall-alias \ - -o $@ $< + @echo Linking $@ + $(cc) -shared -Wl,--export-all-symbols \ + -Wl,--add-stdcall-alias -o $@ $< $(O)nh340key.o: - $(cc) $(CFLAGS) -DBUILD_DLL -o$@ $(NTSYS)/nh340key.c + $(cc) $(CFLAGS) -DBUILD_DLL -o$@ $(NTSYS)/nh340key.c $(GAMEDIR)/nh340key.dll : $(O)nh340key.o $(O)gamedir.tag - @echo Linking $@ - $(cc) -shared -Wl,--export-all-symbols \ - -Wl,--add-stdcall-alias \ - -o $@ $< + @echo Linking $@ + $(cc) -shared -Wl,--export-all-symbols \ + -Wl,--add-stdcall-alias -o $@ $< $(GAME)_.ico : $(NTSYS)/$(GAME).ico $(subst /,\,@copy $(NTSYS)/$(GAME).ico $@) @@ -637,9 +635,9 @@ $(U)makedefs.exe: $(MAKEOBJS) @$(link) $(LFLAGSU) -o$@ $(MAKEOBJS) $(O)makedefs.o: $(CONFIG_H) $(INCL)/monattk.h $(INCL)/monflag.h \ - $(INCL)/objclass.h $(INCL)/monsym.h $(INCL)/qtext.h \ - $(INCL)/patchlevel.h $(U)makedefs.c $(O)obj.tag - @$(cc) $(CFLAGSU) -o$@ $(U)makedefs.c + $(INCL)/objclass.h $(INCL)/monsym.h $(INCL)/qtext.h \ + $(INCL)/patchlevel.h $(U)makedefs.c $(O)obj.tag + $(cc) $(CFLAGSU) -o$@ $(U)makedefs.c # # date.h should be remade every time any of the source or include @@ -680,42 +678,42 @@ $(U)uudecode.exe: $(O)uudecode.o $(O)uudecode.o: $(SSYS)/uudecode.c $(NTSYS)/NetHack.ico : $(U)uudecode.exe $(NTSYS)/nhico.uu - $(subst /,\,$(U)uudecode.exe $(NTSYS)/nhico.uu) - $(subst /,\,copy NetHack.ico $@) - del NetHack.ico + $(subst /,\,$(U)uudecode.exe $(NTSYS)/nhico.uu) + $(subst /,\,copy NetHack.ico $@) + del NetHack.ico $(WIN32)/NetHack.ico : $(NTSYS)/NetHack.ico - $(subst /,\,copy $< $@) + $(subst /,\,copy $< $@) $(WIN32)/mnsel.bmp: $(U)uudecode.exe $(WIN32)/mnsel.uu - $(subst /,\,$(U)uudecode.exe $(WIN32)/mnsel.uu) - $(subst /,\,copy mnsel.bmp $@) - del mnsel.bmp + $(subst /,\,$(U)uudecode.exe $(WIN32)/mnsel.uu) + $(subst /,\,copy mnsel.bmp $@) + del mnsel.bmp $(WIN32)/mnselcnt.bmp: $(U)uudecode.exe $(WIN32)/mnselcnt.uu - $(subst /,\,$(U)uudecode.exe $(WIN32)/mnselcnt.uu) - $(subst /,\,copy mnselcnt.bmp $@) - del mnselcnt.bmp + $(subst /,\,$(U)uudecode.exe $(WIN32)/mnselcnt.uu) + $(subst /,\,copy mnselcnt.bmp $@) + del mnselcnt.bmp $(WIN32)/mnunsel.bmp: $(U)uudecode.exe $(WIN32)/mnunsel.uu - $(subst /,\,$(U)uudecode.exe $(WIN32)/mnunsel.uu) - $(subst /,\,copy mnunsel.bmp $@) - del mnunsel.bmp + $(subst /,\,$(U)uudecode.exe $(WIN32)/mnunsel.uu) + $(subst /,\,copy mnunsel.bmp $@) + del mnunsel.bmp $(WIN32)/petmark.bmp: $(U)uudecode.exe $(WIN32)/petmark.uu - $(subst /,\,$(U)uudecode.exe $(WIN32)/petmark.uu) - $(subst /,\,copy petmark.bmp $@) - del petmark.bmp + $(subst /,\,$(U)uudecode.exe $(WIN32)/petmark.uu) + $(subst /,\,copy petmark.bmp $@) + del petmark.bmp $(WIN32)/rip.bmp: $(U)uudecode.exe $(WIN32)/rip.uu - $(subst /,\,$(U)uudecode.exe $(WIN32)/rip.uu) - $(subst /,\,copy rip.bmp $@) - del rip.bmp + $(subst /,\,$(U)uudecode.exe $(WIN32)/rip.uu) + $(subst /,\,copy rip.bmp $@) + del rip.bmp $(WIN32)/splash.bmp: $(U)uudecode.exe $(WIN32)/splash.uu - $(subst /,\,$(U)uudecode.exe $(WIN32)/splash.uu) - $(subst /,\,copy splash.bmp $@) - del splash.bmp + $(subst /,\,$(U)uudecode.exe $(WIN32)/splash.uu) + $(subst /,\,copy splash.bmp $@) + del splash.bmp #========================================== @@ -729,23 +727,23 @@ $(U)lev_comp.exe: $(SPLEVOBJS) @$(link) $(LFLAGSU) -o$@ $(SPLEVOBJS) $(O)lev_yacc.o: $(HACK_H) $(SP_LEV_H) $(INCL)/lev_comp.h $(U)lev_yacc.c - @$(cc) $(LEVCFLAGS) -o$@ $(U)lev_yacc.c + $(cc) $(LEVCFLAGS) -o$@ $(U)lev_yacc.c $(O)lev_$(LEX).o: $(HACK_H) $(INCL)/lev_comp.h $(SP_LEV_H) \ - $(U)lev_$(LEX).c - @$(cc) $(LEVCFLAGS) -o$@ $(U)lev_$(LEX).c + $(U)lev_$(LEX).c + $(cc) $(LEVCFLAGS) -o$@ $(U)lev_$(LEX).c $(O)lev_main.o: $(U)lev_main.c $(HACK_H) $(SP_LEV_H) - @$(cc) $(LEVCFLAGS) -o$@ $(U)lev_main.c + $(cc) $(LEVCFLAGS) -o$@ $(U)lev_main.c $(U)lev_yacc.c $(INCL)/lev_comp.h : $(U)lev_comp.y ifeq "$(DO_YACC)" "YACC_ACT" - $(subst /,\,$(YACC) -d $(U)lev_comp.y) - $(subst /,\,copy $(YTABC) $(U)lev_yacc.c) - $(subst /,\,copy $(YTABH) $(INCL)/lev_comp.h) - $(subst /,\,@del $(YTABC)) - $(subst /,\,@del $(YTABH)) + $(subst /,\,$(YACC) -d $(U)lev_comp.y) + $(subst /,\,copy $(YTABC) $(U)lev_yacc.c) + $(subst /,\,copy $(YTABH) $(INCL)/lev_comp.h) + $(subst /,\,@del $(YTABC)) + $(subst /,\,@del $(YTABH)) else @echo $(U)lev_comp.y has changed. @@ -761,9 +759,9 @@ endif $(U)lev_$(LEX).c: $(U)lev_comp.l ifeq "$(DO_LEX)" "LEX_ACT" - $(subst /,\,$(LEX) $(FLEXSKEL) $(U)lev_comp.l) - $(subst /,\,copy $(LEXYYC) $@) - $(subst /,\,@del $(LEXYYC)) + $(subst /,\,$(LEX) $(FLEXSKEL) $(U)lev_comp.l) + $(subst /,\,copy $(LEXYYC) $@) + $(subst /,\,@del $(LEXYYC)) else @echo $(U)lev_comp.l has changed. To update $@ run $(LEX). @echo --- @@ -783,22 +781,22 @@ $(U)dgn_comp.exe: $(DGNCOMPOBJS) $(O)dgn_yacc.o: $(HACK_H) $(DGN_FILE_H) $(INCL)/dgn_comp.h $(U)dgn_yacc.c - @$(cc) $(LEVCFLAGS) -o$@ $(U)dgn_yacc.c + $(cc) $(LEVCFLAGS) -o$@ $(U)dgn_yacc.c $(O)dgn_$(LEX).o: $(HACK_H) $(DGN_FILE_H) $(INCL)/dgn_comp.h \ - $(U)dgn_$(LEX).c - @$(cc) $(LEVCFLAGS) -o$@ $(U)dgn_$(LEX).c + $(U)dgn_$(LEX).c + $(cc) $(LEVCFLAGS) -o$@ $(U)dgn_$(LEX).c $(O)dgn_main.o: $(HACK_H) $(U)dgn_main.c - @$(cc) $(LEVCFLAGS) -o$@ $(U)dgn_main.c + $(cc) $(LEVCFLAGS) -o$@ $(U)dgn_main.c $(U)dgn_yacc.c $(INCL)/dgn_comp.h : $(U)dgn_comp.y ifeq "$(DO_YACC)" "YACC_ACT" - $(subst /,\,$(YACC) -d $(U)dgn_comp.y) - $(subst /,\,copy $(YTABC) $(U)dgn_yacc.c) - $(subst /,\,copy $(YTABH) $(INCL)/dgn_comp.h) - $(subst /,\,@del $(YTABC)) - $(subst /,\,@del $(YTABH)) + $(subst /,\,$(YACC) -d $(U)dgn_comp.y) + $(subst /,\,copy $(YTABC) $(U)dgn_yacc.c) + $(subst /,\,copy $(YTABH) $(INCL)/dgn_comp.h) + $(subst /,\,@del $(YTABC)) + $(subst /,\,@del $(YTABH)) else @echo $(U)dgn_comp.y has changed. To update dgn_yacc.c and @echo $(INCL)/dgn_comp.h run $(YACC). @@ -807,22 +805,22 @@ else @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) - $(subst /,\,echo.>>$(U)dgn_yacc.c) - $(subst /,\,echo.>>$(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 ifeq "$(DO_LEX)" "LEX_ACT" - $(subst /,\,$(LEX) $(FLEXSKEL) $(U)dgn_comp.l) - $(subst /,\,copy $(LEXYYC) $@) - $(subst /,\,@del $(LEXYYC)) + $(subst /,\,$(LEX) $(FLEXSKEL) $(U)dgn_comp.l) + $(subst /,\,copy $(LEXYYC) $@) + $(subst /,\,@del $(LEXYYC)) else @echo $(U)dgn_comp.l has changed. To update $@ run $(LEX). @echo --- @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) - $(subst /,\,echo.>>$@) + $(subst /,\,echo.>>$@) endif #========================================== @@ -856,36 +854,36 @@ $(U)dlb_main.exe: $(DLBOBJ) $(O)dlb.o $(O)dlb.o: $(O)dlb_main.o $(O)alloc.o $(O)panic.o $(INCL)/dlb.h - @$(cc) $(CFLAGS) -o$@ $(SRC)/dlb.c + $(cc) $(CFLAGS) -o$@ $(SRC)/dlb.c $(O)dlb_main.o: $(UTIL)/dlb_main.c $(INCL)/config.h $(INCL)/dlb.h - @$(cc) $(CFLAGS) -o$@ $(UTIL)/dlb_main.c + $(cc) $(CFLAGS) -o$@ $(UTIL)/dlb_main.c $(DAT)/porthelp: $(NTSYS)/porthelp $(subst /,\,@copy $(NTSYS)/porthelp $@ >nul) nhdat: $(U)dlb_main.exe $(DAT)/data $(DAT)/oracles $(OPTIONS_FILE) \ - $(DAT)/quest.dat $(DAT)/rumors $(DAT)/help $(DAT)/hh $(DAT)/cmdhelp \ - $(DAT)/history $(DAT)/opthelp $(DAT)/wizhelp $(DAT)/dungeon \ - $(DAT)/porthelp $(DAT)/license $(O)sp_lev.tag - $(subst /,\,echo data >$(DAT)/dlb.lst) - $(subst /,\,echo oracles >>$(DAT)/dlb.lst) - $(subst /,\,if exist $(DAT)/options echo options >>$(DAT)/dlb.lst) - $(subst /,\,if exist $(DAT)/ttyoptions echo ttyoptions >>$(DAT)/dlb.lst) - $(subst /,\,if exist $(DAT)/guioptions echo guioptions >>$(DAT)/dlb.lst) - $(subst /,\,if exist $(DAT)/porthelp echo porthelp >>$(DAT)/dlb.lst) - $(subst /,\,echo quest.dat >>$(DAT)/dlb.lst) - $(subst /,\,echo rumors >>$(DAT)/dlb.lst) - $(subst /,\,echo help >>$(DAT)/dlb.lst) - $(subst /,\,echo hh >>$(DAT)/dlb.lst) - $(subst /,\,echo cmdhelp >>$(DAT)/dlb.lst) - $(subst /,\,echo history >>$(DAT)/dlb.lst) - $(subst /,\,echo opthelp >>$(DAT)/dlb.lst) - $(subst /,\,echo wizhelp >>$(DAT)/dlb.lst) - $(subst /,\,echo dungeon >>$(DAT)/dlb.lst) - $(subst /,\,echo license >>$(DAT)/dlb.lst) - dir /l /b /-p $(subst /,\,$(DAT)/*.lev >>$(DAT)/dlb.lst) - $(subst /,\,$(U)dlb_main CcIf $(DAT) dlb.lst $(SRC)/nhdat) + $(DAT)/quest.dat $(DAT)/rumors $(DAT)/help $(DAT)/hh $(DAT)/cmdhelp \ + $(DAT)/history $(DAT)/opthelp $(DAT)/wizhelp $(DAT)/dungeon \ + $(DAT)/porthelp $(DAT)/license $(O)sp_lev.tag + $(subst /,\,echo data >$(DAT)/dlb.lst) + $(subst /,\,echo oracles >>$(DAT)/dlb.lst) + $(subst /,\,if exist $(DAT)/options echo options >>$(DAT)/dlb.lst) + $(subst /,\,if exist $(DAT)/ttyoptions echo ttyoptions >>$(DAT)/dlb.lst) + $(subst /,\,if exist $(DAT)/guioptions echo guioptions >>$(DAT)/dlb.lst) + $(subst /,\,if exist $(DAT)/porthelp echo porthelp >>$(DAT)/dlb.lst) + $(subst /,\,echo quest.dat >>$(DAT)/dlb.lst) + $(subst /,\,echo rumors >>$(DAT)/dlb.lst) + $(subst /,\,echo help >>$(DAT)/dlb.lst) + $(subst /,\,echo hh >>$(DAT)/dlb.lst) + $(subst /,\,echo cmdhelp >>$(DAT)/dlb.lst) + $(subst /,\,echo history >>$(DAT)/dlb.lst) + $(subst /,\,echo opthelp >>$(DAT)/dlb.lst) + $(subst /,\,echo wizhelp >>$(DAT)/dlb.lst) + $(subst /,\,echo dungeon >>$(DAT)/dlb.lst) + $(subst /,\,echo license >>$(DAT)/dlb.lst) + dir /l /b /-p $(subst /,\,$(DAT)/*.lev >>$(DAT)/dlb.lst) + $(subst /,\,$(U)dlb_main CcIf $(DAT) dlb.lst $(SRC)/nhdat) #========================================== # Recover Utility @@ -909,28 +907,28 @@ $(U)tilemap.exe: $(O)tilemap.o @$(link) $(LFLAGSU) -o$@ $(O)tilemap.o $(O)tilemap.o: $(WSHR)/tilemap.c $(HACK_H) - @$(cc) $(CFLAGSU) -o$@ $(WSHR)/tilemap.c + $(cc) $(CFLAGSU) -o$@ $(WSHR)/tilemap.c $(O)tiletx32.o: $(WSHR)/tilemap.c $(HACK_H) - @$(CC) $(CFLAGS) -DTILETEXT -DTILE_X=32 -DTILE_Y=32 -o$@ $(WSHR)/tilemap.c + $(cc) $(CFLAGS) -DTILETEXT -DTILE_X=32 -DTILE_Y=32 -o$@ $(WSHR)/tilemap.c $(O)tiletxt.o: $(WSHR)/tilemap.c $(HACK_H) - @$(cc) $(CFLAGS) -DTILETEXT -o$@ $(WSHR)/tilemap.c + $(cc) $(CFLAGS) -DTILETEXT -o$@ $(WSHR)/tilemap.c $(O)gifread.o: $(WSHR)/gifread.c $(CONFIG_H) $(TILE_H) - @$(cc) $(CFLAGS) -I$(WSHR) -o$@ $(WSHR)/gifread.c + $(cc) $(CFLAGS) -I$(WSHR) -o$@ $(WSHR)/gifread.c $(O)gifrd32.o: $(WSHR)/gifread.c $(CONFIG_H) $(TILE_H) - @$(CC) $(CFLAGS) -I$(WSHR) -DTILE_X=32 -DTILE_Y=32 -o$@ $(WSHR)/gifread.c + $(cc) $(CFLAGS) -I$(WSHR) -DTILE_X=32 -DTILE_Y=32 -o$@ $(WSHR)/gifread.c $(O)ppmwrite.o: $(WSHR)/ppmwrite.c $(CONFIG_H) $(TILE_H) - @$(cc) $(CFLAGS) -I$(WSHR) -o$@ $(WSHR)/ppmwrite.c + $(cc) $(CFLAGS) -I$(WSHR) -o$@ $(WSHR)/ppmwrite.c $(O)tiletext.o: $(WSHR)/tiletext.c $(CONFIG_H) $(TILE_H) - @$(cc) $(CFLAGS) -I$(WSHR) -o$@ $(WSHR)/tiletext.c + $(cc) $(CFLAGS) -I$(WSHR) -o$@ $(WSHR)/tiletext.c $(O)tilete32.o: $(WSHR)/tiletext.c $(CONFIG_H) $(TILE_H) - @$(CC) $(CFLAGS) -I$(WSHR) -DTILE_X=32 -DTILE_Y=32 -o$@ $(WSHR)/tiletext.c + $(cc) $(CFLAGS) -I$(WSHR) -DTILE_X=32 -DTILE_Y=32 -o$@ $(WSHR)/tiletext.c #========================================== # Optional Tile Utilities @@ -955,8 +953,8 @@ $(TILEBMP16): $(TILEUTIL16) $(TILEFILES) @echo Creating 16x16 binary tile files (this may take some time) $(subst /,\,@$(U)tile2bmp $(TILEBMP16)) #$(TILEBMP32): $(TILEUTIL32) $(TILEFILES32) -# @echo Creating 32x32 binary tile files (this may take some time) -# $(subst /,\,@$(U)til2bm32 $(TILEBMP32)) +# @echo Creating 32x32 binary tile files (this may take some time) +# $(subst /,\,@$(U)til2bm32 $(TILEBMP32)) else $(TILEBMP16): $(TILEBMP32): @@ -971,10 +969,10 @@ $(U)til2bm32.exe: $(O)til2bm32.o $(TEXT_IO32) @$(link) $(LFLAGSU) -o$@ $(O)til2bm32.o $(TEXT_IO32) $(O)tile2bmp.o: $(WSHR)/tile2bmp.c $(HACK_H) $(TILE_H) $(INCL)/win32api.h - @$(cc) $(CFLAGS) -I$(WSHR) -o$@ $(WSHR)/tile2bmp.c + $(cc) $(CFLAGS) -I$(WSHR) -o$@ $(WSHR)/tile2bmp.c $(O)til2bm32.o: $(WSHR)/til2bm32.c $(HACK_H) $(TILE_H) $(INCL)/win32api.h - @$(cc) $(CFLAGS) -I$(WSHR) -DTILE_X=32 -DTILE_Y=32 -o$@ $(WSHR)/til2bm32.c + $(cc) $(CFLAGS) -I$(WSHR) -DTILE_X=32 -DTILE_Y=32 -o$@ $(WSHR)/til2bm32.c #========================================== # Housekeeping @@ -1032,11 +1030,11 @@ spotless: clean $(subst /,\,if exist $(U)recover.exe del $(U)recover.exe) $(subst /,\,if exist $(DAT)/dlb.lst del $(DAT)/dlb.lst) $(subst /,\,if exist nhdat. del nhdat.) - $(subst /,\,if exist $(O)install.tag del $(O)install.tag) - $(subst /,\,if exist $(O)obj.tag del $(O)obj.tag) - $(subst /,\,if exist $(O)gamedir.tag del $(O)gamedir.tag) + $(subst /,\,if exist $(O)install.tag del $(O)install.tag) + $(subst /,\,if exist $(O)obj.tag del $(O)obj.tag) + $(subst /,\,if exist $(O)gamedir.tag del $(O)gamedir.tag) ifneq "$(OBJ)" "" - $(subst /,\,rmdir $(OBJ)) /s /Q + $(subst /,\,rmdir $(OBJ)) /s /Q endif clean: @@ -1072,27 +1070,27 @@ $(DAT)/oracles: $(O)utility.tag $(DAT)/oracles.txt $(DAT)/dungeon: $(O)utility.tag $(DAT)/dungeon.def $(subst /,\,$(U)makedefs -e) - $(subst /,\,$(U)dgn_comp $(DAT)/dungeon.pdf) + $(subst /,\,$(U)dgn_comp $(DAT)/dungeon.pdf) # # NT dependencies # $(O)nttty.o: $(HACK_H) $(TILE_H) $(INCL)/win32api.h $(NTSYS)/nttty.c - @$(cc) $(CFLAGS) -I$(WSHR) -o$@ $(NTSYS)/nttty.c + $(cc) $(CFLAGS) -I$(WSHR) -o$@ $(NTSYS)/nttty.c $(O)winnt.o: $(HACK_H) $(INCL)/win32api.h $(NTSYS)/winnt.c - @$(cc) $(CFLAGS) -o$@ $(NTSYS)/winnt.c + $(cc) $(CFLAGS) -o$@ $(NTSYS)/winnt.c $(O)ntsound.o: $(HACK_H) $(NTSYS)/ntsound.c - @$(cc) $(CFLAGS) -o$@ $(NTSYS)/ntsound.c + $(cc) $(CFLAGS) -o$@ $(NTSYS)/ntsound.c $(O)mapimail.o: $(HACK_H) $(INCL)/nhlan.h $(NTSYS)/mapimail.c - @$(cc) $(CFLAGS) -DMAPI_VERBOSE -o$@ $(NTSYS)/mapimail.c + $(cc) $(CFLAGS) -DMAPI_VERBOSE -o$@ $(NTSYS)/mapimail.c # # util dependencies # $(O)panic.o: $(U)panic.c $(CONFIG_H) - @$(cc) $(CFLAGS) -o$@ $(U)panic.c + $(cc) $(CFLAGS) -o$@ $(U)panic.c # # The rest are stolen from sys/unix/Makefile.src, -- 2.50.1