diff --git a/sys/windows/Makefile.nmake b/sys/windows/Makefile.nmake index fe481ecc2..d450ecbe8 100644 --- a/sys/windows/Makefile.nmake +++ b/sys/windows/Makefile.nmake @@ -243,7 +243,7 @@ GAMEDIR = $(R_GAMEDIR)$(BACKSLASH) #U_BinDir = $(BinDir:\=/) #U_PkgDir = $(PkgDir:\=/) #U_SOUNDDIR = $(SOUNDDIR:\=/) -U_GAMEDIR = $(GAMEDIR:\=/) +U_GAMEDIR = $(R_GAMEDIR:\=/) # #!MESSAGE $(U_SRC) #!MESSAGE $(U_GAMEDIR) @@ -466,37 +466,37 @@ DLBDEF = # Object file directories. # -R_OBJTTY_B = objtty -R_OBJGUI_B = objgui -R_OBJUTIL_B = objutil -R_OBJLUA_B = objlua -R_OBJPDC_B = objpdc -R_OBJPDCC_B = objpdcc -R_OBJPDCG_B = objpdcg +R_OBJTTY_B = objtty +R_OBJGUI_B = objgui +R_OBJUTIL_B = objutil +R_OBJLUA_B = objlua +R_OBJPDC_B = objpdc +R_OBJPDCTXT_B = objpdctxt +R_OBJPDCGUI_B = objpdcgui OBJTTY_B = $(R_OBJTTY_B)$(BACKSLASH) OBJGUI_B = $(R_OBJGUI_B)$(BACKSLASH) OBJUTIL_B = $(R_OBJUTIL_B)$(BACKSLASH) OBJLUA_B = $(R_OBJLUA_B)$(BACKSLASH) OBJPDC_B = $(R_OBJPDC_B)$(BACKSLASH) -OBJPDCC_B = $(R_OBJPDCC_B)$(BACKSLASH) -OBJPDCG_B = $(R_OBJPDCG_B)$(BACKSLASH) +OBJPDCTXT_B = $(R_OBJPDCTXT_B)$(BACKSLASH) +OBJPDCGUI_B = $(R_OBJPDCGUI_B)$(BACKSLASH) R_OBJTTY = $(OBJTTY_B)$(TARGET_CPU) R_OBJGUI = $(OBJGUI_B)$(TARGET_CPU) R_OBJUTIL = $(OBJUTIL_B)$(TARGET_CPU) R_OBJLUA = $(OBJLUA_B)$(TARGET_CPU) R_OBJPDC = $(OBJPDC_B)$(TARGET_CPU) -R_OBJPDCC = $(OBJPDCC_B)$(TARGET_CPU) -R_OBJPDCG = $(OBJPDCG_B)$(TARGET_CPU) +R_OBJPDCTXT = $(OBJPDCTXT_B)$(TARGET_CPU) +R_OBJPDCGUI = $(OBJPDCGUI_B)$(TARGET_CPU) OBJTTY = $(R_OBJTTY)$(BACKSLASH) OBJGUI = $(R_OBJGUI)$(BACKSLASH) OBJUTIL = $(R_OBJUTIL)$(BACKSLASH) OBJLUA = $(R_OBJLUA)$(BACKSLASH) OBJPDC = $(R_OBJPDC)$(BACKSLASH) -OBJPDCC = $(R_OBJPDCC)$(BACKSLASH) -OBJPDCG = $(R_OBJPDCG)$(BACKSLASH) +OBJPDCTXT = $(R_OBJPDCTXT)$(BACKSLASH) +OBJPDCGUI = $(R_OBJPDCGUI)$(BACKSLASH) # # Shorten up the location for some files @@ -507,8 +507,8 @@ OGUI = $(OBJGUI) OUTL = $(OBJUTIL) OLUA = $(OBJLUA) OPDC = $(OBJPDC) -OPDCC = $(OBJPDCC) -OPDCG = $(OBJPDCG) +OPDCTXT = $(OBJPDCTXT) +OPDCGUI = $(OBJPDCGUI) U = $(UTIL) @@ -598,20 +598,23 @@ LUAOBJFILES = $(LUAOBJFILES) $(OLUA)lbitlib.o #================================================================= !IF "$(ADD_CURSES)" == "Y" +PDCTXTFOLDER = wincon +#PDCTXTFOLDER = vt PDCURSES_CURSES_H = $(PDCURSES_TOP)curses.h PDCURSES_CURSPRIV_H = $(PDCURSES_TOP)curspriv.h PDCURSES_HEADERS = $(PDCURSES_CURSES_H) $(PDCURSES_CURSPRIV_H) R_PDCSRC = $(PDCURSES_TOP)pdcurses PDCSRC = $(R_PDCSRC)$(BACKSLASH) !IF "$(CURSES_CONSOLE)" == "Y" -R_PDCWINCON = $(PDCURSES_TOP)wincon -PDCWINCON = $(PDCURSES_TOP)wincon$(BACKSLASH) +R_PDCTXT = $(PDCURSES_TOP)$(PDCTXTFOLDER) +PDCTXT = $(PDCURSES_TOP)$(PDCTXTFOLDER)$(BACKSLASH) +#!MESSAGE PDCTXT = $(PDCTXT) !ENDIF !IF "$(CURSES_GRAPHICAL)" == "Y" -R_PDCWINGUI = $(PDCURSES_TOP)wingui -PDCWINGUI = $(PDCURSES_TOP)wingui$(BACKSLASH) +R_PDCGUI = $(PDCURSES_TOP)wingui +PDCGUI = $(PDCURSES_TOP)wingui$(BACKSLASH) !ENDIF -PDCDEP = $(PDCURSES_TOP)curses.h +PDCDEP = $(PDCURSES_TOP)curses.h PDCCOMMONOBJS = $(OPDC)addch.o $(OPDC)addchstr.o $(OPDC)addstr.o $(OPDC)attr.o $(OPDC)beep.o \ $(OPDC)bkgd.o $(OPDC)border.o $(OPDC)clear.o $(OPDC)color.o $(OPDC)debug.o \ @@ -625,23 +628,23 @@ PDCCOMMONOBJS = $(OPDC)addch.o $(OPDC)addchstr.o $(OPDC)addstr.o $(OPDC)attr.o $ $(OPDC)util.o $(OPDC)window.o PDCINCL = /I$(R_PDCURSES_TOP) /I$(R_PDCSRC) !IF "$(CURSES_CONSOLE)" == "Y" -PDCINCLCON = /I$(PDCWINCON) -PDCWINCONOBJS = $(OPDCC)pdcclip.o $(OPDCC)pdcdisp.o $(OPDCC)pdcgetsc.o \ - $(OPDCC)pdckbd.o $(OPDCC)pdcscrn.o $(OPDCC)pdcsetsc.o $(OPDCC)pdcutil.o +PDCINCLTXT = /I$(R_PDCTXT) +PDCTXTOBJS = $(OPDCTXT)pdcclip.o $(OPDCTXT)pdcdisp.o $(OPDCTXT)pdcgetsc.o \ + $(OPDCTXT)pdckbd.o $(OPDCTXT)pdcscrn.o $(OPDCTXT)pdcsetsc.o $(OPDCTXT)pdcutil.o !ENDIF !IF "$(CURSES_GRAPHICAL)" == "Y" -PDCWINGUIOBJS = $(OPDCG)pdcclip.o $(OPDCG)pdcdisp.o $(OPDCG)pdcgetsc.o \ - $(OPDCG)pdckbd.o $(OPDCG)pdcscrn.o $(OPDCG)pdcsetsc.o $(OPDCG)pdcutil.o -PDCINCLGUI = /I$(PDCWINCON) +PDCGUIOBJS = $(OPDCGUI)pdcclip.o $(OPDCGUI)pdcdisp.o $(OPDCGUI)pdcgetsc.o \ + $(OPDCGUI)pdckbd.o $(OPDCGUI)pdcscrn.o $(OPDCGUI)pdcsetsc.o $(OPDCGUI)pdcutil.o +PDCINCLGUI = /I$(R_PDCGUI) !ENDIF !ELSE PDCDEP= PDCCOMMONOBJS= -PDCWINCONOBJS= -PDCWINGUIOBJS= +PDCTXTOBJS= +PDCGUIOBJS= PDCINCL= PDINCLGUI= -PDCINCLCON= +PDCINCLTXT= !ENDIF @@ -804,14 +807,14 @@ CURSESOBJ= $(OTTY)cursdial.o $(OTTY)cursinit.o $(OTTY)cursinvt.o \ $(OTTY)cursstat.o $(OTTY)curswins.o !IF "$(CURSES_CONSOLE)" == "Y" CURSESWINCONOBJS = $(CURSESOBJ) -PDCWINCONLIB = $(LIBDIR)$(PDCDIST)-wincon-$(TARGET_CPU)-static.lib +PDCTXTLIB = $(LIBDIR)$(R_PDCDIST)-$(PDCTXTFOLDER)-$(TARGET_CPU)-static.lib CURSESCONDEF1=-D"CURSES_GRAPHICS" -DPDC_NCMOUSE #CURSESDEF2=-D"CURSES_BRIEF_INCLUDE" -DCHTYPE_32 CURSESDEF2=-DCURSES_UNICODE $(PDCURSESFLAGS) !ENDIF !IF "$(CURSES_GRAPHICAL)" == "Y" CURSESWINGUIOBJS = $(CURSESOBJ) $(OGUI)guitty.o -PDCWINGUILIB = $(LIBDIR)$(PDCDIST)-wingui-$(TARGET_CPU)-static.lib +PDCGUILIB = $(LIBDIR)$(R_PDCDIST)-wingui-$(TARGET_CPU)-static.lib CURSESGUIDEF1=-D"CURSES_GRAPHICS" -DPDC_NCMOUSE #CURSESDEF2=-D"CURSES_BRIEF_INCLUDE" -DCHTYPE_32 CURSESDEF2=-DCURSES_UNICODE $(PDCURSESFLAGS) @@ -823,8 +826,8 @@ CURSESDEF2=-DCURSES_UNICODE $(PDCURSESFLAGS) !UNDEF CURSESOBJ !UNDEF CURSESWINCONOBJS !UNDEF CURSESWINGUIOBJS -!UNDEF PDCWINCONLIB -!UNDEF PDCWINGUILIB +!UNDEF PDCTXTLIB +!UNDEF PDCGUILIB !ENDIF OUTLHACKLIBOBJS = $(OUTL)hacklib.o @@ -1517,7 +1520,7 @@ DLB = #!MESSAGE {$(R_PDCSRC)}.c{$(R_OBJPDC)}.o: #!MESSAGE PDCINCL = $(PDCINCL) #!MESSAGE PDCINCLGUI = $(PDCINCLGUI) -#!MESSAGE PDCINCLCON = $(PDCINCLCON) +#!MESSAGE PDCINCLTXT = $(PDCINCLTXT) #!MESSAGE $(Q)$(CC) /wd4244 /wd4267 /wd4774 $(R_PDCINCL) $(CFLAGS:-w44774= ) $(CURSESDEF2) /wd5262 $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -FoX2 X1 # @@ -1529,15 +1532,15 @@ DLB = $(Q)$(CC) /wd4244 /wd4267 /wd4774 $(PDCINCL) $(CFLAGS:-w44774= ) $(CURSESDEF2) /wd5262 $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ $< !IF "$(CURSES_CONSOLE)" == "Y" -{$(R_PDCWINCON)}.c{$(R_OBJPDCC)}.o: - $(Q)$(CC) /wd4244 /wd4267 /wd4774 $(PDCINCL) $(PDCINCLCON) $(CFLAGS) $(CURSESDEF2) /wd5262 $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ $< -#!MESSAGE {$(R_PDCWINCON)}.c{$(R_OBJPDCC)}.o: +{$(R_PDCTXT)}.c{$(R_OBJPDCTXT)}.o: + $(Q)$(CC) /wd4244 /wd4267 /wd4774 $(PDCINCL) $(PDCINCLTXT) $(CFLAGS) $(CURSESDEF2) /wd5262 $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ $< +#!MESSAGE {$(R_PDCTXT)}.c{$(R_OBJPDCTXT)}.o: !ENDIF !IF "$(CURSES_GRAPHICAL)" == "Y" -{$(R_PDCWINGUI)}.c{$(R_OBJPDCG)}.o: +{$(R_PDCGUI)}.c{$(R_OBJPDCGUI)}.o: $(Q)$(CC) /wd4244 /wd4267 /wd4774 $(PDCINCL) $(PDCINCLGUI) $(CFLAGS) $(CURSESDEF2) /wd5262 $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ $< -#!MESSAGE {$(R_PDCWINGUI)}.c{$(R_OBJPDCG)}.o: +#!MESSAGE {$(R_PDCGUI)}.c{$(R_OBJPDCGUI)}.o: !ENDIF !ENDIF @@ -1678,16 +1681,16 @@ GAMEOBJ=$(GAMEOBJ:^ =^ $(GAMEDIR)NetHack.exe : gamedir.tag $(OTTY)consoletty.o \ $(ALLOBJTTY) $(CURSESWINCONOBJS) \ $(TTYSOUNDOBJS) $(OTTY)date.o $(OTTY)console.res \ - $(LUALIB) $(TTYOBJTTY) $(PDCWINCONLIB) $(PDCWINCONOBJS) $(OTTYHACKLIB) + $(LUALIB) $(TTYOBJTTY) $(PDCTXTLIB) $(PDCTXTOBJS) $(OTTYHACKLIB) @if not exist $(GAMEDIR)*.* mkdir $(R_GAMEDIR) @echo Linking $(@:\=/) $(link) $(LFLAGS) $(conlflags) /STACK:2048 /PDB:$(GAMEDIR)$(@B).PDB /MAP:$(OTTY)$(@B).MAP \ - $(LIBS) $(PDCWINCONLIB) $(LUALIB) $(TTYSOUNDLIBS) $(OTTYHACKLIB) \ + $(LIBS) $(PDCTXTLIB) $(LUALIB) $(TTYSOUNDLIBS) $(OTTYHACKLIB) \ $(conlibs) $(BCRYPT) -out:$@ @<<$(@B).lnk $(GAMEOBJTTY) $(ALLOBJTTY) $(TTYOBJTTY) - $(TTYSOUNDOBJS) $(CURSESWINCONOBJS) $(PDCWINCONOBJS) + $(TTYSOUNDOBJS) $(CURSESWINCONOBJS) $(PDCTXTOBJS) $(OTTY)consoletty.o $(OTTY)date.o $(OTTY)console.res @@ -1702,18 +1705,18 @@ $(GAMEDIR)NetHackW.exe : gamedir.tag $(OGUI)tile.o \ $(ALLOBJGUI) $(GAMEOBJGUI) $(GUIOBJ) $(GUISOUNDOBJS) \ $(CURSESWINGUIOBJS) $(OGUI)date.o \ $(OGUI)NetHackW.res \ - $(LUALIB) $(PDCWINGUILIB) $(PDCWINGUIOBJS) $(OGUIHACKLIB) + $(LUALIB) $(PDCGUILIB) $(PDCGUIOBJS) $(OGUIHACKLIB) @if not exist $(GAMEDIR)*.* mkdir $(R_GAMEDIR) @echo Linking $(@:\=/) $(link) $(LFLAGS) $(guilflags) /STACK:2048 /PDB:$(GAMEDIR)$(@B).PDB \ /MAP:$(OGUI)$(@B).MAP \ - $(LIBS) $(PDCWINGUILIB) $(LUALIB) \ + $(LIBS) $(PDCGUILIB) $(LUALIB) \ $(GUISOUNDLIBS) $(OGUIHACKLIB) \ $(guilibs) $(COMCTRL) $(BCRYPT) -out:$@ @<<$(@B).lnk $(GAMEOBJGUI) $(ALLOBJGUI) $(GUIOBJ) - $(GUISOUNDOBJS) $(CURSESWINGUIOBJS) $(PDCWINGUIOBJS) + $(GUISOUNDOBJS) $(CURSESWINGUIOBJS) $(PDCGUIOBJS) $(OGUI)tile.o $(OGUI)date.o $(OGUI)NetHackW.res @@ -1978,14 +1981,14 @@ opdcdir$(TARGET_CPU).tag: @if not exist $(OBJPDC)*.* mkdir $(R_OBJPDC) @echo directory created >$@ -opdccdir$(TARGET_CPU).tag: - @if not exist $(OBJPDCC)*.* echo creating directory $(OBJPDCC:\=/) - @if not exist $(OBJPDCC)*.* mkdir $(R_OBJPDCC) +opdctxtdir$(TARGET_CPU).tag: + @if not exist $(OBJPDCTXT)*.* echo creating directory $(OBJPDCTXT:\=/) + @if not exist $(OBJPDCTXT)*.* mkdir $(R_OBJPDCTXT) @echo directory created >$@ -opdcgdir$(TARGET_CPU).tag: - @if not exist $(OBJPDCG)*.* echo creating directory $(OBJPDCG:\=/) - @if not exist $(OBJPDCG)*.* mkdir $(R_OBJPDCG) +opdcguidir$(TARGET_CPU).tag: + @if not exist $(OBJPDCGUI)*.* echo creating directory $(OBJPDCGUI:\=/) + @if not exist $(OBJPDCGUI)*.* mkdir $(R_OBJPDCGUI) @echo directory created >$@ libdir.tag: @@ -2323,14 +2326,14 @@ $(SRC)x11tiles: $(U)tile2x11.exe $(WSHR)monsters.txt $(WSHR)objects.txt \ #=============================================================================== !IF "$(ADD_CURSES)" == "Y" !IF "$(CURSES_CONSOLE)" == "Y" -$(PDCWINCONLIB) : $(PDCCOMMONOBJS) $(PDCWINCONOBJS) +$(PDCTXTLIB) : $(PDCCOMMONOBJS) $(PDCTXTOBJS) @echo Building library $@ from $** - @$(librarian) -nologo /out:$@ $(PDCCOMMONOBJS) $(PDCWINCONOBJS) + @$(librarian) -nologo /out:$@ $(PDCCOMMONOBJS) $(PDCTXTOBJS) !ENDIF !IF "$(CURSES_GRAPHICAL)" == "Y" -$(PDCWINGUILIB) : $(PDCCOMMONOBJS) $(PDCWINGUIOBJS) +$(PDCGUILIB) : $(PDCCOMMONOBJS) $(PDCGUIOBJS) @echo Building library $@ from $** - @$(librarian) -nologo /out:$@ $(PDCCOMMONOBJS) $(PDCWINGUIOBJS) + @$(librarian) -nologo /out:$@ $(PDCCOMMONOBJS) $(PDCGUIOBJS) !ENDIF !ENDIF $(OGUI)guitty.o: $(MSWSYS)guitty.c $(WINDHDR) $(HACK_H) $(TILE_H) @@ -2808,7 +2811,7 @@ $(DBGSYMZIP): $(PDBTOZIP) binary: envchk.tag libdir.tag ottydir$(TARGET_CPU).tag \ outldir$(TARGET_CPU).tag oguidir$(TARGET_CPU).tag \ oluadir$(TARGET_CPU).tag opdcdir$(TARGET_CPU).tag \ - opdccdir$(TARGET_CPU).tag opdcgdir$(TARGET_CPU).tag \ + opdctxtdir$(TARGET_CPU).tag opdcguidir$(TARGET_CPU).tag \ $(LUASRC)lua.h $(PDCDEP) \ $(INCL)nhlua.h $(OUTL)utility.tag \ $(DAT)data $(DAT)rumors $(DAT)oracles $(DAT)engrave \ @@ -2821,61 +2824,61 @@ binary: envchk.tag libdir.tag ottydir$(TARGET_CPU).tag \ #=============================================================================== spotless: clean - if exist $(GAMEDIR)NetHack.exe del $(GAMEDIR)NetHack.exe + if exist $(GAMEDIR)NetHack.exe del $(GAMEDIR)NetHack.exe if exist $(GAMEDIR)NetHackW.exe del $(GAMEDIR)NetHackW.exe - if exist $(GAMEDIR)NetHack.pdb del $(GAMEDIR)NetHack.pdb - if exist $(GAMEDIR)nhdat$(NHV) del $(GAMEDIR)nhdat$(NHV) - if exist $(INCL)date.h del $(INCL)date.h - if exist $(INCL)onames.h del $(INCL)onames.h - if exist $(INCL)pm.h del $(INCL)pm.h + if exist $(GAMEDIR)NetHack.pdb del $(GAMEDIR)NetHack.pdb + if exist $(GAMEDIR)nhdat$(NHV) del $(GAMEDIR)nhdat$(NHV) + if exist $(INCL)date.h del $(INCL)date.h + if exist $(INCL)onames.h del $(INCL)onames.h + if exist $(INCL)pm.h del $(INCL)pm.h if exist $(U)*.lnk del $(U)*.lnk if exist $(U)*.map del $(U)*.map - if exist $(DAT)data del $(DAT)data - if exist $(DAT)rumors del $(DAT)rumors - if exist $(DAT)engrave del $(DAT)engrave - if exist $(DAT)epitaph del $(DAT)epitaph - if exist $(DAT)bogusmon del $(DAT)bogusmon - if exist $(DAT)porthelp del $(DAT)porthelp + if exist $(DAT)data del $(DAT)data + if exist $(DAT)rumors del $(DAT)rumors + if exist $(DAT)engrave del $(DAT)engrave + if exist $(DAT)epitaph del $(DAT)epitaph + if exist $(DAT)bogusmon del $(DAT)bogusmon + if exist $(DAT)porthelp del $(DAT)porthelp if exist nhdat$(NHV). del nhdat$(NHV). if exist outldirx86.tag del outldirx86.tag if exist ottydirx86.tag del ottydirx86.tag if exist oguidirx86.tag del oguidirx86.tag if exist oluadirx86.tag del oluadirx86.tag if exist opdcdirx86.tag del opdcdirx86.tag - if exist opdccdirx86.tag del opdccdirx86.tag - if exist opdcgdirx86.tag del opdcgdirx86.tag + if exist opdctxtdirx86.tag del opdctxtdirx86.tag + if exist opdcguidirx86.tag del opdcguidirx86.tag if exist outldirx64.tag del outldirx64.tag if exist ottydirx64.tag del ottydirx64.tag if exist oguidirx64.tag del oguidirx64.tag if exist oluadirx64.tag del oluadirx64.tag if exist opdcdirx64.tag del opdcdirx64.tag - if exist opdccdirx64.tag del opdccdirx64.tag - if exist opdcgdirx64.tag del opdcgdirx64.tag + if exist opdctxtdirx64.tag del opdctxtdirx64.tag + if exist opdcguidirx64.tag del opdcguidirx64.tag if exist outldirarm64.tag del outldirarm64.tag if exist ottydirarm64.tag del ottydirarm64.tag if exist oguidirarm64.tag del oguidirarm64.tag if exist oluadirarm64.tag del oluadirarm64.tag if exist opdcdirarm64.tag del opdcdirarm64.tag - if exist opdccdirarm64.tag del opdccdirarm64.tag - if exist opdcgdirarm64.tag del opdcgdirarm64.tag + if exist opdctxtdirarm64.tag del opdctxtdirarm64.tag + if exist opdcguidirarm64.tag del opdcguidirarm64.tag if exist libdir.tag del libdir.tag if exist gamedir.tag del gamedir.tag - if exist $(MSWIN)mnsel.bmp del $(MSWIN)mnsel.bmp - if exist $(MSWIN)mnselcnt.bmp del $(MSWIN)mnselcnt.bmp - if exist $(MSWIN)mnunsel.bmp del $(MSWIN)mnunsel.bmp - if exist $(MSWIN)petmark.bmp del $(MSWIN)petmark.bmp - if exist $(MSWIN)pilemark.bmp del $(MSWIN)pilemark.bmp - if exist $(MSWIN)rip.bmp del $(MSWIN)rip.bmp - if exist $(MSWIN)splash.bmp del $(MSWIN)splash.bmp - if exist $(MSWIN)nethack.ico del $(MSWIN)nethack.ico - if exist $(MSWSYS)nethack.ico del $(MSWSYS)nethack.ico + if exist $(MSWIN)mnsel.bmp del $(MSWIN)mnsel.bmp + if exist $(MSWIN)mnselcnt.bmp del $(MSWIN)mnselcnt.bmp + if exist $(MSWIN)mnunsel.bmp del $(MSWIN)mnunsel.bmp + if exist $(MSWIN)petmark.bmp del $(MSWIN)petmark.bmp + if exist $(MSWIN)pilemark.bmp del $(MSWIN)pilemark.bmp + if exist $(MSWIN)rip.bmp del $(MSWIN)rip.bmp + if exist $(MSWIN)splash.bmp del $(MSWIN)splash.bmp + if exist $(MSWIN)nethack.ico del $(MSWIN)nethack.ico + if exist $(MSWSYS)nethack.ico del $(MSWSYS)nethack.ico 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.exe del $(U)dlb.exe !IF "$(ADD_CURSES)" == "Y" - if exist $(LIBDIR)$(PDCDIST)-wincon-$(TARGET_CPU)-static.lib del $(LIBDIR)$(PDCDIST)-wincon-$(TARGET_CPU)-static.lib + if exist $(LIBDIR)$(PDCDIST)-$(PDCTXTFOLDER)-$(TARGET_CPU)-static.lib del $(LIBDIR)$(PDCDIST)-$(PDCTXTFOLDER)-$(TARGET_CPU)-static.lib if exist $(LIBDIR)$(PDCDIST)-wingui-$(TARGET_CPU)-static.lib del $(LIBDIR)$(PDCDIST)-wingui-$(TARGET_CPU)-static.lib !ENDIF if exist $(LUALIB) del $(LUALIB) @@ -2886,23 +2889,23 @@ spotless: clean if exist $(DAT)guioptions del $(DAT)guioptions if exist $(DAT)data del $(DAT)data if exist tilemappings.lst del tilemappings.lst - if exist $(SndWavDir)*.wav del $(SndWavDir)*.wav + if exist $(SndWavDir)*.wav del $(SndWavDir)*.wav if exist $(MAINZIP) del $(MAINZIP) if exist $(DBGSYMZIP) del $(DBGSYMZIP) - if exist $(OBJTTY)* rmdir $(OBJTTY) /s /Q - if exist $(OBJGUI)* rmdir $(OBJGUI) /s /Q - if exist $(OBJUTIL)* rmdir $(OBJUTIL) /s /Q - if exist $(OBJLUA)* rmdir $(OBJLUA) /s /Q - if exist $(OBJPDC)* rmdir $(OBJPDC) /s /Q - if exist $(OBJPDCC)* rmdir $(OBJPDCC) /s /Q - if exist $(OBJPDCG)* rmdir $(OBJPDCG) /s /Q - if exist $(OBJTTY_B)* rmdir $(OBJTTY_B) /s /Q - if exist $(OBJGUI_B)* rmdir $(OBJGUI_B) /s /Q - if exist $(OBJUTIL_B)* rmdir $(OBJUTIL_B) /s /Q - if exist $(OBJLUA_B)* rmdir $(OBJLUA_B) /s /Q - if exist $(OBJPDC_B)* rmdir $(OBJPDC_B) /s /Q - if exist $(OBJPDCC_B)* rmdir $(OBJPDCC_B) /s /Q - if exist $(OBJPDCG_B)* rmdir $(OBJPDCG_B) /s /Q + if exist $(OBJTTY)* rmdir $(OBJTTY) /s /Q + if exist $(OBJGUI)* rmdir $(OBJGUI) /s /Q + if exist $(OBJUTIL)* rmdir $(OBJUTIL) /s /Q + if exist $(OBJLUA)* rmdir $(OBJLUA) /s /Q + if exist $(OBJPDC)* rmdir $(OBJPDC) /s /Q + if exist $(OBJPDCTXT)* rmdir $(OBJPDCTXT) /s /Q + if exist $(OBJPDCGUI)* rmdir $(OBJPDCGUI) /s /Q + if exist $(OBJTTY_B)* rmdir $(OBJTTY_B) /s /Q + if exist $(OBJGUI_B)* rmdir $(OBJGUI_B) /s /Q + if exist $(OBJUTIL_B)* rmdir $(OBJUTIL_B) /s /Q + if exist $(OBJLUA_B)* rmdir $(OBJLUA_B) /s /Q + if exist $(OBJPDC_B)* rmdir $(OBJPDC_B) /s /Q + if exist $(OBJPDCTXT_B)* rmdir $(OBJPDCTXT_B) /s /Q + if exist $(OBJPDCGUI_B)* rmdir $(OBJPDCGUI_B) /s /Q clean: if exist binary.tag del binary.tag @@ -2914,28 +2917,28 @@ clean: if exist $(OUTL)utility.tag del $(OUTL)utility.tag if exist $(OTTY)sp_lev.tag del $(OTTY)sp_lev.tag if exist $(OGUI)sp_lev.tag del $(OGUI)sp_lev.tag - if exist $(SRC)tile.c del $(SRC)tile.c - if exist $(INCL)nhlua.h del $(INCL)nhlua.h + if exist $(SRC)tile.c del $(SRC)tile.c + if exist $(INCL)nhlua.h del $(INCL)nhlua.h if exist $(U)makedefs.exe del $(U)makedefs.exe if exist $(U)dlb_main.exe del $(U)dlb_main.exe if exist $(U)tile2bmp.exe del $(U)tile2bmp.exe if exist $(U)tilemap.exe del $(U)tilemap.exe - if exist $(SRC)*.lnk del $(SRC)*.lnk - if exist $(DAT)dlb.lst del $(DAT)dlb.lst + if exist $(SRC)*.lnk del $(SRC)*.lnk + if exist $(DAT)dlb.lst del $(DAT)dlb.lst if exist $(OUTL)*.o del $(OUTL)*.o if exist $(OTTY)*.o del $(OTTY)*.o if exist $(OGUI)*.o del $(OGUI)*.o if exist $(OLUA)*.o del $(OLUA)*.o if exist $(OPDC)*.o del $(OPDC)*.o - if exist $(OPDCC)*.o del $(OPDCC)*.o - if exist $(OPDCG)*.o del $(OPDCG)*.o + if exist $(OPDCTXT)*.o del $(OPDCTXT)*.o + if exist $(OPDCGUI)*.o del $(OPDCGUI)*.o if exist $(OUTL)*.PDB del $(OUTL)*.PDB if exist $(OTTY)*.PDB del $(OTTY)*.PDB if exist $(OGUI)*.PDB del $(OGUI)*.PDB if exist $(OLUA)*.PDB del $(OLUA)*.PDB if exist $(OPDC)*.PDB del $(OPDC)*.PDB - if exist $(OPDCC)*.PDB del $(OPDCC)*.PDB - if exist $(OPDCG)*.PDB del $(OPDCG)*.PDB + if exist $(OPDCTXT)*.PDB del $(OPDCTXT)*.PDB + if exist $(OPDCGUI)*.PDB del $(OPDCGUI)*.PDB if exist $(OUTL)*.MAP del $(OUTL)*.MAP if exist $(OTTY)*.MAP del $(OTTY)*.MAP if exist $(OGUI)*.MAP del $(OGUI)*.MAP @@ -2946,16 +2949,16 @@ clean: if exist $(OGUI)*.LIB del $(OGUI)*.LIB if exist $(OLUA)*.LIB del $(OLUA)*.LIB if exist $(OPDC)*.LIB del $(OPDC)*.LIB - if exist $(OPDCC)*.LIB del $(OPDCC)*.LIB - if exist $(OPDCG)*.LIB del $(OPDCG)*.LIB + if exist $(OPDCTXT)*.LIB del $(OPDCTXT)*.LIB + if exist $(OPDCGUI)*.LIB del $(OPDCGUI)*.LIB if exist $(OUTL)*.EXP del $(OUTL)*.EXP if exist $(OTTY)*.EXP del $(OTTY)*.EXP if exist $(OGUI)*.EXP del $(OGUI)*.EXP if exist $(OLUA)*.EXP del $(OLUA)*.EXP if exist $(OPDC)*.EXP del $(OPDC)*.EXP - if exist $(OPDCC)*.EXP del $(OPDCC)*.EXP - if exist $(OPDCG)*.EXP del $(OPDCG)*.EXP - if exist $(SRC)tiles.bmp del $(SRC)tiles.bmp + if exist $(OPDCTXT)*.EXP del $(OPDCTXT)*.EXP + if exist $(OPDCGUI)*.EXP del $(OPDCGUI)*.EXP + if exist $(SRC)tiles.bmp del $(SRC)tiles.bmp if exist $(OTTY)console.res del $(OTTY)console.res if exist $(OTTY)NetHack.res del $(OTTY)NetHack.res if exist $(OGUI)NetHackW.res del $(OGUI)NetHackW.res