From f12d755ba2f1e4687279c4f4f165d48f37109ba3 Mon Sep 17 00:00:00 2001 From: nhmall Date: Sun, 22 Dec 2024 09:43:00 -0500 Subject: [PATCH] Makefile.nmake updates Be more consistent in the use of path separators. Add a second version of Makefile variables that contain paths, one with a trailing separator, and one without (prefixed with R_ for use in Makefile rules). Also, in dat/luahelper, Updates due to correspond to the Makefile.nmake changes. Add Makefile variable AWK to use $(AWK) instead of hardcoded awk. --- dat/luahelper | 15 +- sys/windows/Makefile.nmake | 2153 +++++++++++++++++++----------------- 2 files changed, 1177 insertions(+), 991 deletions(-) diff --git a/dat/luahelper b/dat/luahelper index 94774024a..7f8a653fa 100644 --- a/dat/luahelper +++ b/dat/luahelper @@ -20,7 +20,10 @@ # Xcode project.pbxproj: make -f dat/luahelper devhelp-xcode >file.txt # # + MAKEFLAGS += --no-print-directory +AWK=awk + luanames = asmodeus baalz bigrm-* castle fakewiz? juiblex knox medusa-? \ minend-? minefill minetn-? oracle orcus sanctum soko?-? tower? \ @@ -36,9 +39,9 @@ alllua = $(wildcard $(addsuffix .lua,$(addprefix dat/, $(luanames)))) # devhelp-nmake: @echo "$(notdir $(alllua))" | \ - awk '{for (i=1; i<=NF; ++i)printf "%s%s%s%s", \ - i == 1? "ALL_LUA_FILES = " : "", \ - "$$(DAT)\\", \ + $(AWK) '{for (i=1; i<=NF; ++i)printf "%s%s%s%s", \ + i == 1? "LUA_FILES = " : "", \ + "$$(DAT)", \ $$i, \ i % 3? " ": ((i == NF)? "\n" : " \\\n\t")} \ i % 3{print ""}' @@ -50,7 +53,7 @@ devhelp-nmake: # devhelp-msys2: @echo "$(basename $(notdir $(alllua)))" | \ - awk '{for (i=1; i<=NF; ++i)printf "%s%s%s", \ + $(AWK) '{for (i=1; i<=NF; ++i)printf "%s%s%s", \ i == 1? "LUALIST = " : "", \ $$i, \ i % 5? " ": ((i == NF)? "\n" : " \\\n\t")} \ @@ -67,7 +70,7 @@ xcodeextra = bogusmon cmdhelp data engrave epitaph help hh \ devhelp-xcode: @echo "\t\t\tinputPaths = (" @echo "$(xcodeextra) $(notdir $(alllua))" | \ - awk '{for (i=1; i<=NF; ++i)printf "%s%s%s%s%s", \ + $(AWK) '{for (i=1; i<=NF; ++i)printf "%s%s%s%s%s", \ i == 1? "\t" : "", \ "\t\t\t\042$$(NH_DAT_DIR)/", \ $$i, \ @@ -82,7 +85,7 @@ devhelp-xcode: devhelp-vstudio: @echo " " @echo "$(notdir $(alllua))" | \ - awk '{for (i=1; i<=NF; ++i)printf "%s%s%s%s%s", \ + $(AWK) '{for (i=1; i<=NF; ++i)printf "%s%s%s%s%s", \ i == 1? " " : "", \ " ..\src\allmain.c +# SRC ..\src\ $(SRC)allmain.c => ..\src\allmain.c +# +#============================================================================== # if next line is commented out, full compiler command lines will be output Q=@ @@ -150,29 +165,87 @@ NETHACK_VERSION="3.7.0" NHV=$(NETHACK_VERSION:.=) NHV=$(NHV:"=) +#============================================================================== # # Source directories. Makedefs hardcodes these, don't change them. # -INCL = ..\include # NetHack include files -DAT = ..\dat # NetHack data files -DOC = ..\doc # NetHack documentation files -UTIL = ..\util # Utility source -SRC = ..\src # Main source -SSYS = ..\sys\share # Shared system files -MSWSYS = ..\sys\windows # MS windows specific files -TTY = ..\win\tty # window port files (tty) -MSWIN = ..\win\win32 # window port files (win32) -WCURSES = ..\win\curses # window port files (curses) -WSHR = ..\win\share # Tile support files -QT = ..\win\Qt # QT support files -X11 = ..\win\X11 # X11 support files -LIBDIR = ..\lib # libraries and external bits -SUBM = ..\submodules # NetHack git submodules -SndWavDir = ..\sound\wav # sound files that get integrated -BinDir = ..\binary -PkgDir = ..\package +R_INCL = ..\include # NetHack include files +R_DAT = ..\dat # NetHack data files +R_DOC = ..\doc # NetHack documentation files +R_UTIL = ..\util # Utility source +R_SRC = ..\src # Main source +R_SSYS = ..\sys\share # Shared system files +R_MSWSYS = ..\sys\windows # MS windows specific files +R_TTY = ..\win\tty # window port files (tty) +R_MSWIN = ..\win\win32 # window port files (win32) +R_WCURSES = ..\win\curses # window port files (curses) +R_WSHR = ..\win\share # Tile support files +R_QT = ..\win\Qt # QT support files +R_X11 = ..\win\X11 # X11 support files +R_LIBDIR = ..\lib # libraries and external bits +R_SUBM = ..\submodules # NetHack git submodules +R_SndWavDir = ..\sound\wav # sound files that get integrated +R_BinDir = ..\binary +R_PkgDir = ..\package +R_SOUNDDIR = ..\sound +#R_GAMEDIR is user option up near the top +#!MESSAGE $(R_SRC) +#!MESSAGE $(R_GAMEDIR) +#============================================================================== +# Ordinary path variations with trailing backslash +# +BACKSLASH=^\ +INCL = $(R_INCL)$(BACKSLASH) +DAT = $(R_DAT)$(BACKSLASH) +UTIL = $(R_UTIL)$(BACKSLASH) +SRC = $(R_SRC)$(BACKSLASH) +SSYS = $(R_SSYS)$(BACKSLASH) +MSWSYS = $(R_MSWSYS)$(BACKSLASH) +TTY = $(R_TTY)$(BACKSLASH) +MSWIN = $(R_MSWIN)$(BACKSLASH) +WCURSES = $(R_WCURSES)$(BACKSLASH) +WSHR = $(R_WSHR)$(BACKSLASH) +QT = $(R_QT)$(BACKSLASH) +X11 = $(R_X11)$(BACKSLASH) +LIBDIR = $(R_LIBDIR)$(BACKSLASH) +SUBM = $(R_SUBM)$(BACKSLASH) +DOC = $(R_DOC)$(BACKSLASH) +SndWavDir = $(R_SndWavDir)$(BACKSLASH) +BinDir = $(R_BinDir)$(BACKSLASH) +PkgDir = $(R_PkgDir)$(BACKSLASH) +SOUNDDIR = $(R_SOUNDDIR)$(BACKSLASH) +GAMEDIR = $(R_GAMEDIR)$(BACKSLASH) + +#!MESSAGE $(SRC) +#!MESSAGE $(GAMEDIR) +#============================================================================== +# Unix path variations with trailing forward slash +# +#U_INCL = $(INCL:\=/) +#U_DAT = $(DAT:\=/) +#U_UTIL = $(UTIL:\=/) +#U_SRC = $(SRC:\=/) +#U_SSYS = $(SSYS:\=/) +#U_MSWSYS = $(MSWSYS:\=/) +#U_TTY = $(TTY:\=/) +#U_MSWIN = $(MSWIN:\=/) +#U_WCURSES = $(WCURSES:\=/) +#U_WSHR = $(WSHR:\=/) +#U_QT = $(QT:\=/) +#U_X11 = $(X11:\=/) +#U_LIBDIR = $(LIBDIR:\=/) +#U_SUBM = $(SUBM:\=/) +#U_DOC = $(DOC:\=/) +#U_SndWavDir = $(SndWavDir:\=/) +#U_BinDir = $(BinDir:\=/) +#U_PkgDir = $(PkgDir:\=/) +#U_SOUNDDIR = $(SOUNDDIR:\=/) +U_GAMEDIR = $(GAMEDIR:\=/) +# +#!MESSAGE $(U_SRC) +#!MESSAGE $(U_GAMEDIR) #============================================================================== # Sanity checks for prerequisite Lua and pdcursesmod # @@ -182,12 +255,18 @@ ADD_CURSES=N # First, Lua !IF "$(INTERNET_AVAILABLE)" == "Y" !IF "$(GIT_AVAILABLE)" == "Y" -LUATOP=$(SUBM)\lua -LUASRC=$(LUATOP) +R_LUATOP=$(SUBM)lua +LUATOP=$(SUBM)lua$(BACKSLASH) +R_LUASRC=$(R_LUATOP) +LUASRC=$(R_LUASRC)$(BACKSLASH) LUA_MAY_PROCEED=Y !ELSE # GIT_AVAILABLE -LUATOP = $(LIBDIR)\lua-$(LUAVER) -LUASRC = $(LUATOP)\src +R_LUATOP=$(LIBDIR)lua-$(LUAVER) +LUATOP=$(R_LUATOP)$(BACKSLASH) +#U_LUATOP=$(LUATOP:\=/) +R_LUASRC=$(LUATOP)src +LUASRC=$(R_LUASRC)$(BACKSLASH) +#U_LUASRC=$(LUASRC:\=/) LUA_MAY_PROCEED=Y !ENDIF # GIT_AVAILABLE !ELSE # INTERNET_AVAILABLE is not Y below @@ -195,13 +274,21 @@ LUA_MAY_PROCEED=Y # method (git or download). Check to see if it is available already, with # precedence given to ../submodules, then ../lib. # -!IF EXIST("$(SUBM)\lua\lua.h") -LUATOP=$(SUBM)\lua -LUASRC=$(LUATOP) +!IF EXIST("$(SUBM)lua\lua.h") +R_LUATOP=$(SUBM)lua +LUATOP=$(R_LUATOP)$(BACKSLASH) +#U_LUATOP=$(LUATOP:\=/) +R_LUASRC=$(LUATOP) +LUASRC=$(LUATOP)$(BACKSLASH) +#U_LUASRC=$(LUASRC:\=/) LUA_MAY_PROCEED=Y -!ELSEIF EXIST("$(LIBDIR)\lua-$(LUAVER)\src\lua.h") -LUATOP = $(LIBDIR)\lua-$(LUAVER) -LUASRC = $(LUATOP)\src +!ELSEIF EXIST("$(LIBDIR)lua-$(LUAVER)\src\lua.h") +R_LUATOP=$(LIBDIR)lua-$(LUAVER) +LUATOP=$(R_LUATOP)$(BACKSLASH) +#U_LUATOP=$(LUATOP:\=/) +R_LUASRC=$(LUATOP)src +LUASRC=$(R_LUASRC)$(BACKSLASH) +#U_LUASRC=$(LUASRC:\=/) LUA_MAY_PROCEED=Y !ENDIF # Lua sources !IF "$(LUA_MAY_PROCEED)" == "Y" @@ -210,11 +297,16 @@ LUA_MAY_PROCEED=Y !ENDIF # LUA_MAY_PROCEED !ENDIF # INTERNET_AVAILABLE +#!MESSAGE R_LUATOP=$(R_LUATOP) +#!MESSAGE LUATOP=$(R_LUATOP) +#!MESSAGE R_LUASRC=$(R_LUASRC) +#!MESSAGE LUASRC=$(LUASRC) + !IF "$(LUA_MAY_PROCEED)" != "Y" !IF "$(INTERNET_AVAILABLE)" != "Y" !MESSAGE Your Makefile settings do not allow use of the internet to obtain Lua !ENDIF # INTERNET_AVAILABLE -!MESSAGE and no copy of Lua was found in either $(SUBM)\lua or $(LIBDIR)\lua-$(LUAVER). +!MESSAGE and no copy of Lua was found in either $(SUBM)lua or $(LIBDIR)lua-$(LUAVER). !MESSAGE Change your nmake command line to include: !MESSAGE GIT=1 !MESSAGE or modify your Makefile to set the following: @@ -240,35 +332,57 @@ ADD_CURSES=N # Now, pdcursesmod !IF "$(WANT_CURSES)" == "Y" -PDCDIST=pdcursesmod -!IF "$(INTERNET_AVAILABLE)" == "Y" -!IF "$(GIT_AVAILABLE)" == "Y" -PDCURSES_TOP=$(SUBM)\$(PDCDIST) +R_PDCDIST=pdcursesmod +PDCDIST=$(R_PDCDIST)$(BACKSLASH) +#U_PDCDIST=$(PDCDIST:\=/) +! IF "$(INTERNET_AVAILABLE)" == "Y" +! IF "$(GIT_AVAILABLE)" == "Y" +#!MESSAGE debug spot1 +R_PDCURSES_TOP=$(SUBM)$(R_PDCDIST) +PDCURSES_TOP=$(R_PDCURSES_TOP)$(BACKSLASH) +#U_PDCURSES_TOP=$(PDCURSES_TOP:\=/) ADD_CURSES=Y -!ELSE # GIT_AVAILABLE -PDCURSES_TOP=$(LIBDIR)\$(PDCDIST) +! ELSE # GIT_AVAILABLE +#!MESSAGE debug spot2 +R_PDCURSES_TOP=$(LIBDIR)$(R_PDCDIST) +PDCURSES_TOP=$(R_PDCURSES_TOP)$(BACKSLASH) +#U_PDCURSES_TOP=$(PDCURSES_TOP:\=/) ADD_CURSES=Y -!ENDIF # GIT_AVAILABLE -!ELSE # INTERNET_AVAILABLE is not Y below +! ENDIF # GIT_AVAILABLE +! ELSE # NO internet available # Your Makefile settings do not allow $(PDCDIST) to be obtained by # git or by download. Check to see if it is available at one of # the expected locations already, with precedence given to ../submodules, # then ../lib. -# -!IF EXIST("$(SUBM)\$(PDCDIST)\curses.h") -PDCURSES_TOP=$(SUBM)\$(PDCDIST) +#! MESSAGE debug spot3 +! IF EXIST("$(LIBDIR)$(R_PDCDIST)curses.h") +R_PDCURSES_TOP=$(LIBDIR)$(PDCDIST) +PDCURSES_TOP=$(R_PDCURSES_TOP)$(BACKSLASH) ADD_CURSES=Y -!ELSEIF EXIST("$(LIBDIR)\$(PDCDIST)\curses.h") -PDCURSES_TOP=$(LIBDIR)\$(PDCDIST) +! ELSEIF EXIST("$(SUBM)$(R_PDCDIST)curses.h") +#!MESSAGE debug spot4 +R_PDCURSES_TOP=$(LIBDIR)$(PDCDIST) +PDCURSES_TOP=$(R_PDCURSES_TOP)$(BACKSLASH) ADD_CURSES=Y -!ENDIF # pdcursesmod sources available somewhere -!IF "$(ADD_CURSES)" == "Y" +! ENDIF # pdcursesmod sources available somewhere +! ENDIF # Internet dealt with +! IF "$(ADD_CURSES)" != "Y" +#!MESSAGE debug spot5 !MESSAGE Your Makefile settings do not allow $(PDCDIST) to be !MESSAGE obtained by git or by download, but a copy of pdcursesmod was !MESSAGE found in $(PDCURSES_TOP), !MESSAGE so that will be used. -!ENDIF # ADD_CURSES == Y -!ENDIF # INTERNET_AVAILABLE +! ELSE +#!MESSAGE debug spot6 +! IF EXIST("$(PDCURSES_TOP)curses.h") +INCLCURSES_H=-I$(R_PDCURSES_TOP) +! ELSE +# Cannot do it, sorry + PDCINCL= + INCLCURSES_H= + ADD_CURSES = N +! ENDIF # If we found a copy of curses.h +! ENDIF # ADD_CURSES == Y !ENDIF # WANT_CURSES !IF "$(ADD_CURSES)" != "Y" @@ -346,35 +460,51 @@ DLBDEF = # Object file directories. # -OBJTTY_B = objtty -OBJGUI_B = objgui -OBJUTIL_B = objutil -OBJLUA_B = objlua -OBJPDC_B = objpdc -OBJPDCC_B = objpdcc -OBJPDCG_B = objpdcg +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 -OBJTTY = $(OBJTTY_B)\$(TARGET_CPU) -OBJGUI = $(OBJGUI_B)\$(TARGET_CPU) -OBJUTIL = $(OBJUTIL_B)\$(TARGET_CPU) -OBJLUA = $(OBJLUA_B)\$(TARGET_CPU) -OBJPDC = $(OBJPDC_B)\$(TARGET_CPU) -OBJPDCC = $(OBJPDCC_B)\$(TARGET_CPU) -OBJPDCG = $(OBJPDCG_B)\$(TARGET_CPU) +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) + +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) + +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) # # Shorten up the location for some files # -OTTY = $(OBJTTY)^\ -OGUI = $(OBJGUI)^\ -OUTL = $(OBJUTIL)^\ -OLUA = $(OBJLUA)^\ -OPDC = $(OBJPDC)^\ -OPDCC = $(OBJPDCC)^\ -OPDCG = $(OBJPDCG)^\ +OTTY = $(OBJTTY) +OGUI = $(OBJGUI) +OUTL = $(OBJUTIL) +OLUA = $(OBJLUA) +OPDC = $(OBJPDC) +OPDCC = $(OBJPDCC) +OPDCG = $(OBJPDCG) -U = $(UTIL)^\ +U = $(UTIL) !IFDEF TEST_CROSSCOMPILE HOST=_host @@ -422,9 +552,9 @@ GITPREFIX = -DNETHACK_GIT_PREFIX=\"$(GIT_PREFIX)\" LUAVER=5.4.6 !ENDIF -LUALIB = $(LIBDIR)\lua$(LUAVER)-$(TARGET_CPU)-static.lib -LUADLL = $(LIBDIR)\lua$(LUAVER)-$(TARGET_CPU).dll -LUAINCL = /I$(LUASRC) +LUALIB = $(LIBDIR)lua$(LUAVER)-$(TARGET_CPU)-static.lib +LUADLL = $(LIBDIR)lua$(LUAVER)-$(TARGET_CPU).dll +R_LUAINCL = /I$(R_LUASRC) LUATARGETS = lua.exe $(LUADLL) $(LUALIB) LUASRCFILES = lapi.c lauxlib.c lbaselib.c lcode.c \ @@ -462,17 +592,20 @@ LUAOBJFILES = $(LUAOBJFILES) $(OLUA)lbitlib.o #================================================================= !IF "$(ADD_CURSES)" == "Y" -PDCURSES_CURSES_H = $(PDCURSES_TOP)\curses.h -PDCURSES_CURSPRIV_H = $(PDCURSES_TOP)\curspriv.h +PDCURSES_CURSES_H = $(PDCURSES_TOP)curses.h +PDCURSES_CURSPRIV_H = $(PDCURSES_TOP)curspriv.h PDCURSES_HEADERS = $(PDCURSES_CURSES_H) $(PDCURSES_CURSPRIV_H) -PDCSRC = $(PDCURSES_TOP)\pdcurses +R_PDCSRC = $(PDCURSES_TOP)pdcurses +PDCSRC = $(R_PDCSRC)$(BACKSLASH) !IF "$(CURSES_CONSOLE)" == "Y" -PDCWINCON = $(PDCURSES_TOP)\wincon +R_PDCWINCON = $(PDCURSES_TOP)wincon +PDCWINCON = $(PDCURSES_TOP)wincon$(BACKSLASH) !ENDIF !IF "$(CURSES_GRAPHICAL)" == "Y" -PDCWINGUI = $(PDCURSES_TOP)\wingui +R_PDCWINGUI = $(PDCURSES_TOP)wingui +PDCWINGUI = $(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 \ @@ -484,8 +617,7 @@ PDCCOMMONOBJS = $(OPDC)addch.o $(OPDC)addchstr.o $(OPDC)addstr.o $(OPDC)attr.o $ $(OPDC)printw.o $(OPDC)refresh.o $(OPDC)scanw.o $(OPDC)scr_dump.o \ $(OPDC)scroll.o $(OPDC)slk.o $(OPDC)termattr.o $(OPDC)touch.o \ $(OPDC)util.o $(OPDC)window.o - -PDCINCL = /I$(PDCURSES_TOP) /I$(PDCSRC) +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 \ @@ -508,92 +640,122 @@ PDCINCLCON= #================================================================= -HACKINCL = $(INCL)\align.h $(INCL)\artifact.h $(INCL)\artilist.h \ - $(INCL)\attrib.h $(INCL)\botl.h $(INCL)\color.h $(INCL)\config.h \ - $(INCL)\config1.h $(INCL)\context.h $(INCL)\coord.h $(INCL)\decl.h \ - $(INCL)\display.h $(INCL)\dlb.h $(INCL)\dungeon.h $(INCL)\engrave.h \ - $(INCL)\extern.h $(INCL)\flag.h $(INCL)\fnamesiz.h $(INCL)\func_tab.h \ - $(INCL)\global.h $(INCL)\warnings.h $(INCL)\hack.h $(INCL)\lint.h \ - $(INCL)\mextra.h $(INCL)\mfndpos.h $(INCL)\micro.h $(INCL)\mkroom.h \ - $(INCL)\monattk.h $(INCL)\mondata.h $(INCL)\monflag.h $(INCL)\monst.h \ - $(INCL)\monsters.h $(INCL)\obj.h $(INCL)\objects.h $(INCL)\objclass.h \ - $(INCL)\optlist.h $(INCL)\patchlevel.h $(INCL)\pcconf.h \ - $(INCL)\permonst.h $(INCL)\prop.h $(INCL)\rect.h $(INCL)\region.h \ - $(INCL)\sym.h $(INCL)\defsym.h $(INCL)\rm.h $(INCL)\selvar.h $(INCL)\sp_lev.h \ - $(INCL)\spell.h $(INCL)\stairs.h $(INCL)\sys.h $(INCL)\cstd.h $(INCL)\tcap.h \ - $(INCL)\timeout.h $(INCL)\tradstdc.h $(INCL)\trap.h \ - $(INCL)\unixconf.h $(INCL)\vision.h $(INCL)\vmsconf.h \ - $(INCL)\wintty.h $(INCL)\wincurs.h $(INCL)\winX.h \ - $(INCL)\winprocs.h $(INCL)\sndprocs.h $(INCL)\seffects.h \ - $(INCL)\wintype.h $(INCL)\you.h $(INCL)\youprop.h - # all .c that are part of the main NetHack program and are not operating- or # windowing-system specific -HACKCSRC = allmain.c alloc.c apply.c artifact.c attrib.c ball.c bones.c \ - botl.c calendar.c cmd.c coloratt.c dbridge.c decl.c detect.c dig.c display.c \ - dlb.c do.c do_name.c do_wear.c dog.c dogmove.c dokick.c dothrow.c \ - drawing.c dungeon.c eat.c end.c engrave.c exper.c explode.c \ - files.c fountain.c getpos.c glyphs.c hack.c \ - insight.c invent.c isaac64.c light.c \ - lock.c mail.c makemon.c mcastu.c mdlib.c mhitm.c \ - mhitu.c minion.c mklev.c mkmap.c mkmaze.c mkobj.c mkroom.c mon.c \ - mondata.c monmove.c monst.c mplayer.c mthrowu.c muse.c music.c \ - nhlua.c nhlsel.c nhlobj.c o_init.c objects.c objnam.c \ - options.c pager.c pickup.c pline.c polyself.c potion.c pray.c \ - priest.c quest.c questpgr.c read.c rect.c region.c restore.c \ - rip.c rnd.c role.c rumors.c save.c selvar.c sfstruct.c \ - shk.c shknam.c sit.c sounds.c sp_lev.c spell.c \ - stairs.c steal.c steed.c symbols.c sys.c teleport.c \ - timeout.c topten.c track.c trap.c u_init.c uhitm.c utf8map.c \ - vault.c version.c vision.c weapon.c were.c wield.c \ - windows.c wizard.c worm.c worn.c write.c zap.c -LUA_FILES = $(DAT)\air.lua $(DAT)\Arc-fila.lua $(DAT)\Arc-filb.lua \ - $(DAT)\Arc-goal.lua $(DAT)\Arc-loca.lua $(DAT)\Arc-strt.lua \ - $(DAT)\asmodeus.lua $(DAT)\astral.lua $(DAT)\baalz.lua \ - $(DAT)\Bar-fila.lua $(DAT)\Bar-filb.lua $(DAT)\Bar-goal.lua \ - $(DAT)\Bar-loca.lua $(DAT)\Bar-strt.lua $(DAT)\bigrm-1.lua \ - $(DAT)\bigrm-10.lua $(DAT)\bigrm-11.lua $(DAT)\bigrm-2.lua \ - $(DAT)\bigrm-12.lua \ - $(DAT)\bigrm-3.lua $(DAT)\bigrm-4.lua $(DAT)\bigrm-5.lua \ - $(DAT)\bigrm-6.lua $(DAT)\bigrm-7.lua $(DAT)\bigrm-8.lua \ - $(DAT)\bigrm-9.lua $(DAT)\castle.lua $(DAT)\Cav-fila.lua \ - $(DAT)\Cav-filb.lua $(DAT)\Cav-goal.lua $(DAT)\Cav-loca.lua \ - $(DAT)\Cav-strt.lua $(DAT)\dungeon.lua $(DAT)\earth.lua \ - $(DAT)\fakewiz1.lua $(DAT)\fakewiz2.lua $(DAT)\fire.lua \ - $(DAT)\Hea-fila.lua $(DAT)\Hea-filb.lua $(DAT)\Hea-goal.lua \ - $(DAT)\Hea-loca.lua $(DAT)\Hea-strt.lua $(DAT)\hellfill.lua \ - $(DAT)\juiblex.lua $(DAT)\Kni-fila.lua $(DAT)\Kni-filb.lua \ - $(DAT)\Kni-goal.lua $(DAT)\Kni-loca.lua $(DAT)\Kni-strt.lua \ - $(DAT)\knox.lua $(DAT)\medusa-1.lua $(DAT)\medusa-2.lua \ - $(DAT)\medusa-3.lua $(DAT)\medusa-4.lua $(DAT)\minefill.lua \ - $(DAT)\minend-1.lua $(DAT)\minend-2.lua $(DAT)\minend-3.lua \ - $(DAT)\minetn-1.lua $(DAT)\minetn-2.lua $(DAT)\minetn-3.lua \ - $(DAT)\minetn-4.lua $(DAT)\minetn-5.lua $(DAT)\minetn-6.lua \ - $(DAT)\minetn-7.lua $(DAT)\Mon-fila.lua $(DAT)\Mon-filb.lua \ - $(DAT)\Mon-goal.lua $(DAT)\Mon-loca.lua $(DAT)\Mon-strt.lua \ - $(DAT)\nhcore.lua $(DAT)\nhlib.lua $(DAT)\oracle.lua \ - $(DAT)\orcus.lua $(DAT)\Pri-fila.lua $(DAT)\Pri-filb.lua \ - $(DAT)\Pri-goal.lua $(DAT)\Pri-loca.lua $(DAT)\Pri-strt.lua \ - $(DAT)\quest.lua $(DAT)\Ran-fila.lua $(DAT)\Ran-filb.lua \ - $(DAT)\Ran-goal.lua $(DAT)\Ran-loca.lua $(DAT)\Ran-strt.lua \ - $(DAT)\Rog-fila.lua $(DAT)\Rog-filb.lua $(DAT)\Rog-goal.lua \ - $(DAT)\Rog-loca.lua $(DAT)\Rog-strt.lua $(DAT)\Sam-fila.lua \ - $(DAT)\Sam-filb.lua $(DAT)\Sam-goal.lua $(DAT)\Sam-loca.lua \ - $(DAT)\Sam-strt.lua $(DAT)\sanctum.lua $(DAT)\soko1-1.lua \ - $(DAT)\soko1-2.lua $(DAT)\soko2-1.lua $(DAT)\soko2-2.lua \ - $(DAT)\soko3-1.lua $(DAT)\soko3-2.lua $(DAT)\soko4-1.lua \ - $(DAT)\soko4-2.lua $(DAT)\themerms.lua $(DAT)\Tou-fila.lua \ - $(DAT)\Tou-filb.lua $(DAT)\Tou-goal.lua $(DAT)\Tou-loca.lua \ - $(DAT)\Tou-strt.lua $(DAT)\tower1.lua $(DAT)\tower2.lua \ - $(DAT)\tower3.lua $(DAT)\Val-fila.lua $(DAT)\Val-filb.lua \ - $(DAT)\Val-goal.lua $(DAT)\Val-loca.lua $(DAT)\Val-strt.lua \ - $(DAT)\valley.lua $(DAT)\water.lua $(DAT)\Wiz-fila.lua \ - $(DAT)\Wiz-filb.lua $(DAT)\Wiz-goal.lua $(DAT)\Wiz-loca.lua \ - $(DAT)\Wiz-strt.lua $(DAT)\wizard1.lua $(DAT)\wizard2.lua \ - $(DAT)\wizard3.lua $(DAT)\tut-1.lua $(DAT)\tut-2.lua +HACKCSRC = \ + $(SRC)allmain.c $(SRC)alloc.c $(SRC)apply.c $(SRC)artifact.c \ + $(SRC)attrib.c $(SRC)ball.c $(SRC)bones.c $(SRC)botl.c \ + $(SRC)calendar.c $(SRC)cmd.c $(SRC)coloratt.c $(SRC)dbridge.c \ + $(SRC)decl.c $(SRC)detect.c $(SRC)dig.c $(SRC)display.c \ + $(SRC)dlb.c $(SRC)do.c $(SRC)do_name.c $(SRC)do_wear.c \ + $(SRC)dog.c $(SRC)dogmove.c $(SRC)dokick.c $(SRC)dothrow.c \ + $(SRC)drawing.c $(SRC)dungeon.c $(SRC)eat.c $(SRC)end.c \ + $(SRC)engrave.c $(SRC)exper.c $(SRC)explode.c $(SRC)files.c \ + $(SRC)fountain.c $(SRC)getpos.c $(SRC)glyphs.c $(SRC)hack.c \ + $(SRC)insight.c $(SRC)invent.c $(SRC)isaac64.c $(SRC)light.c \ + $(SRC)lock.c $(SRC)mail.c $(SRC)makemon.c $(SRC)mcastu.c \ + $(SRC)mdlib.c $(SRC)mhitm.c $(SRC)mhitu.c $(SRC)minion.c \ + $(SRC)mklev.c $(SRC)mkmap.c $(SRC)mkmaze.c $(SRC)mkobj.c \ + $(SRC)mkroom.c $(SRC)mon.c $(SRC)mondata.c $(SRC)monmove.c \ + $(SRC)monst.c $(SRC)mplayer.c $(SRC)mthrowu.c $(SRC)muse.c \ + $(SRC)music.c $(SRC)nhlua.c $(SRC)nhlsel.c $(SRC)nhlobj.c \ + $(SRC)o_init.c $(SRC)objects.c $(SRC)objnam.c $(SRC)options.c \ + $(SRC)pager.c $(SRC)pickup.c $(SRC)pline.c $(SRC)polyself.c \ + $(SRC)potion.c $(SRC)pray.c $(SRC)priest.c $(SRC)quest.c \ + $(SRC)questpgr.c $(SRC)read.c $(SRC)rect.c $(SRC)region.c \ + $(SRC)restore.c $(SRC)rip.c $(SRC)rnd.c $(SRC)role.c \ + $(SRC)rumors.c $(SRC)save.c $(SRC)selvar.c $(SRC)sfstruct.c \ + $(SRC)shk.c $(SRC)shknam.c $(SRC)sit.c $(SRC)sounds.c \ + $(SRC)sp_lev.c $(SRC)spell.c $(SRC)stairs.c $(SRC)steal.c \ + $(SRC)steed.c $(SRC)symbols.c $(SRC)sys.c $(SRC)teleport.c \ + $(SRC)timeout.c $(SRC)topten.c $(SRC)track.c $(SRC)trap.c \ + $(SRC)u_init.c $(SRC)uhitm.c $(SRC)utf8map.c $(SRC)vault.c \ + $(SRC)version.c $(SRC)vision.c $(SRC)weapon.c $(SRC)were.c \ + $(SRC)wield.c $(SRC)windows.c $(SRC)wizard.c $(SRC)worm.c \ + $(SRC)worn.c $(SRC)write.c $(SRC)zap.c + +# all .h files except date.h +HACKINCL = \ + $(INCL)align.h $(INCL)artifact.h $(INCL)artilist.h \ + $(INCL)attrib.h $(INCL)botl.h $(INCL)color.h \ + $(INCL)config.h $(INCL)config1.h $(INCL)context.h \ + $(INCL)coord.h $(INCL)cstd.h $(INCL)decl.h \ + $(INCL)display.h $(INCL)dlb.h $(INCL)dungeon.h \ + $(INCL)engrave.h $(INCL)extern.h $(INCL)flag.h \ + $(INCL)fnamesiz.h $(INCL)func_tab.h $(INCL)global.h \ + $(INCL)warnings.h $(INCL)hack.h $(INCL)lint.h \ + $(INCL)mextra.h $(INCL)mfndpos.h $(INCL)micro.h \ + $(INCL)mkroom.h $(INCL)monattk.h $(INCL)mondata.h \ + $(INCL)monflag.h $(INCL)monst.h $(INCL)monsters.h \ + $(INCL)nhmd4.h $(INCL)obj.h $(INCL)objects.h \ + $(INCL)objclass.h $(INCL)optlist.h $(INCL)patchlevel.h \ + $(INCL)pcconf.h $(INCL)permonst.h $(INCL)prop.h \ + $(INCL)rect.h $(INCL)region.h $(INCL)selvar.h \ + $(INCL)sym.h $(INCL)defsym.h $(INCL)rm.h \ + $(INCL)sp_lev.h $(INCL)spell.h $(INCL)sndprocs.h \ + $(INCL)seffects.h $(INCL)stairs.h $(INCL)sys.h \ + $(INCL)tcap.h $(INCL)timeout.h $(INCL)tradstdc.h \ + $(INCL)trap.h $(INCL)unixconf.h $(INCL)vision.h \ + $(INCL)vmsconf.h $(INCL)wintty.h $(INCL)wincurs.h \ + $(INCL)winX.h $(INCL)winprocs.h $(INCL)wintype.h \ + $(INCL)you.h $(INCL)youprop.h + +LUA_FILES = $(DAT)asmodeus.lua $(DAT)baalz.lua $(DAT)bigrm-1.lua \ + $(DAT)bigrm-10.lua $(DAT)bigrm-11.lua $(DAT)bigrm-12.lua \ + $(DAT)bigrm-2.lua $(DAT)bigrm-3.lua $(DAT)bigrm-4.lua \ + $(DAT)bigrm-5.lua $(DAT)bigrm-6.lua $(DAT)bigrm-7.lua \ + $(DAT)bigrm-8.lua $(DAT)bigrm-9.lua $(DAT)castle.lua \ + $(DAT)fakewiz1.lua $(DAT)fakewiz2.lua $(DAT)juiblex.lua \ + $(DAT)knox.lua $(DAT)medusa-1.lua $(DAT)medusa-2.lua \ + $(DAT)medusa-3.lua $(DAT)medusa-4.lua $(DAT)minend-1.lua \ + $(DAT)minend-2.lua $(DAT)minend-3.lua $(DAT)minefill.lua \ + $(DAT)minetn-1.lua $(DAT)minetn-2.lua $(DAT)minetn-3.lua \ + $(DAT)minetn-4.lua $(DAT)minetn-5.lua $(DAT)minetn-6.lua \ + $(DAT)minetn-7.lua $(DAT)oracle.lua $(DAT)orcus.lua \ + $(DAT)sanctum.lua $(DAT)soko1-1.lua $(DAT)soko1-2.lua \ + $(DAT)soko2-1.lua $(DAT)soko2-2.lua $(DAT)soko3-1.lua \ + $(DAT)soko3-2.lua $(DAT)soko4-1.lua $(DAT)soko4-2.lua \ + $(DAT)tower1.lua $(DAT)tower2.lua $(DAT)tower3.lua \ + $(DAT)valley.lua $(DAT)wizard1.lua $(DAT)wizard2.lua \ + $(DAT)wizard3.lua $(DAT)nhcore.lua $(DAT)nhlib.lua \ + $(DAT)themerms.lua $(DAT)astral.lua $(DAT)air.lua \ + $(DAT)earth.lua $(DAT)fire.lua $(DAT)water.lua \ + $(DAT)hellfill.lua $(DAT)tut-1.lua $(DAT)tut-2.lua \ + $(DAT)Arc-goal.lua $(DAT)Bar-goal.lua $(DAT)Cav-goal.lua \ + $(DAT)Hea-goal.lua $(DAT)Kni-goal.lua $(DAT)Mon-goal.lua \ + $(DAT)Pri-goal.lua $(DAT)Ran-goal.lua $(DAT)Rog-goal.lua \ + $(DAT)Sam-goal.lua $(DAT)Tou-goal.lua $(DAT)Val-goal.lua \ + $(DAT)Wiz-goal.lua $(DAT)Arc-fila.lua $(DAT)Arc-filb.lua \ + $(DAT)Bar-fila.lua $(DAT)Bar-filb.lua $(DAT)Cav-fila.lua \ + $(DAT)Cav-filb.lua $(DAT)Hea-fila.lua $(DAT)Hea-filb.lua \ + $(DAT)Kni-fila.lua $(DAT)Kni-filb.lua $(DAT)Mon-fila.lua \ + $(DAT)Mon-filb.lua $(DAT)Pri-fila.lua $(DAT)Pri-filb.lua \ + $(DAT)Ran-fila.lua $(DAT)Ran-filb.lua $(DAT)Rog-fila.lua \ + $(DAT)Rog-filb.lua $(DAT)Sam-fila.lua $(DAT)Sam-filb.lua \ + $(DAT)Tou-fila.lua $(DAT)Tou-filb.lua $(DAT)Val-fila.lua \ + $(DAT)Val-filb.lua $(DAT)Wiz-fila.lua $(DAT)Wiz-filb.lua \ + $(DAT)Arc-loca.lua $(DAT)Bar-loca.lua $(DAT)Cav-loca.lua \ + $(DAT)Hea-loca.lua $(DAT)Kni-loca.lua $(DAT)Mon-loca.lua \ + $(DAT)Pri-loca.lua $(DAT)Ran-loca.lua $(DAT)Rog-loca.lua \ + $(DAT)Sam-loca.lua $(DAT)Tou-loca.lua $(DAT)Val-loca.lua \ + $(DAT)Wiz-loca.lua $(DAT)Arc-strt.lua $(DAT)Bar-strt.lua \ + $(DAT)Cav-strt.lua $(DAT)Hea-strt.lua $(DAT)Kni-strt.lua \ + $(DAT)Mon-strt.lua $(DAT)Pri-strt.lua $(DAT)Ran-strt.lua \ + $(DAT)Rog-strt.lua $(DAT)Sam-strt.lua $(DAT)Tou-strt.lua \ + $(DAT)Val-strt.lua $(DAT)Wiz-strt.lua $(DAT)dungeon.lua \ + $(DAT)quest.lua + +luawildcards = asmodeus.lua baalz.lua bigrm-*.lua castle.lua fakewiz?.lua \ + juiblex.lua knox.lua medusa-?.lua minend-?.lua minefill.lua \ + minetn-?.lua oracle.lua orcus.lua sanctum.lua soko?-?.lua tower?.lua \ + valley.lua wizard?.lua nhcore.lua nhlib.lua themerms.lua astral.lua \ + air.lua earth.lua fire.lua water.lua hellfill.lua tut-?.lua \ + ???-goal.lua ???-fil?.lua ???-loca.lua ???-strt.lua \ + dungeon.lua quest.lua + # -# Utility Objects. +# - Utility # MAKESRC = $(U)makedefs.c @@ -603,7 +765,7 @@ MAKEDEFSOBJS = $(OUTL)makedefs.o $(OUTL)monst$(HOST).o $(OUTL)objects$(HOST).o RECOVOBJS = $(OUTL)recover.o -TILEFILES = $(WSHR)\monsters.txt $(WSHR)\objects.txt $(WSHR)\other.txt +TILEFILES = $(WSHR)monsters.txt $(WSHR)objects.txt $(WSHR)other.txt # # These are not invoked during a normal game build in 3.7 @@ -620,7 +782,7 @@ GIFREADERS32_HOST = $(OUTL)gifrd32.o $(OUTL)alloc$(HOST).o $(OUTL)panic$(HOST) PPMWRITERS = $(OUTL)ppmwrite.o $(OUTL)alloc$(HOST).o $(OUTL)panic$(HOST).o -WINDHDR = $(MSWSYS)\win10.h $(MSWSYS)\winos.h $(MSWSYS)\win32api.h +WINDHDR = $(MSWSYS)win10.h $(MSWSYS)winos.h $(MSWSYS)win32api.h # # - Curses @@ -633,14 +795,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 +PDCWINCONLIB = $(LIBDIR)$(PDCDIST)-wincon-$(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 +PDCWINGUILIB = $(LIBDIR)$(PDCDIST)-wingui-$(TARGET_CPU)-static.lib CURSESGUIDEF1=-D"CURSES_GRAPHICS" -DPDC_NCMOUSE #CURSESDEF2=-D"CURSES_BRIEF_INCLUDE" -DCHTYPE_32 CURSESDEF2=-DCURSES_UNICODE $(PDCURSESFLAGS) @@ -663,14 +825,13 @@ OUTLHACKLIB = $(OUTL)hacklib-$(TARGET_CPU)-static.lib OTTYHACKLIB = $(OTTY)hacklib-$(TARGET_CPU)-static.lib OGUIHACKLIB = $(OGUI)hacklib-$(TARGET_CPU)-static.lib - # # - TTY # TTYDEF= -D"_CONSOLE" -DWIN32CON $(CURSESCONDEF1) $(CURSESGUIDEF1) -RANDOMTTY = $(OTTY)random.o +#RANDOMTTY = $(OTTY)random.o MDLIBTTY = $(OTTY)mdlib.o DLBOBJTTY = $(OTTY)dlb.o REGEXTTY = $(OTTY)cppregex.o @@ -680,46 +841,41 @@ VVOBJTTY = $(OTTY)version.o SOBJTTY = $(OTTY)windmain.o $(OTTY)windsys.o $(OTTY)win10.o \ $(OTTY)safeproc.o -TTYOBJ = $(OTTY)topl.o $(OTTY)getline.o $(OTTY)wintty.o +TTYOBJTTY = $(OTTY)topl.o $(OTTY)getline.o $(OTTY)wintty.o -VTTYOBJ01 = $(OTTY)allmain.o $(OTTY)alloc.o $(OTTY)apply.o $(OTTY)artifact.o -VTTYOBJ02 = $(OTTY)attrib.o $(OTTY)ball.o $(OTTY)bones.o $(OTTY)botl.o -VTTYOBJ03 = $(OTTY)calendar.o $(OTTY)cmd.o $(OTTY)coloratt.o $(OTTY)dbridge.o -VTTYOBJ04 = $(OTTY)decl.o $(OTTY)detect.o $(OTTY)dig.o $(OTTY)display.o $(OTTY)do.o -VTTYOBJ05 = $(OTTY)do_name.o $(OTTY)do_wear.o $(OTTY)dog.o $(OTTY)dogmove.o $(OTTY)dokick.o -VTTYOBJ06 = $(OTTY)dothrow.o $(OTTY)drawing.o $(OTTY)dungeon.o $(OTTY)eat.o -VTTYOBJ07 = $(OTTY)end.o $(OTTY)engrave.o $(OTTY)exper.o $(OTTY)explode.o -VTTYOBJ08 = $(OTTY)extralev.o $(OTTY)files.o $(OTTY)fountain.o $(OTTY)getpos.o -VTTYOBJ09 = $(OTTY)glyphs.o $(OTTY)hack.o $(OTTY)insight.o $(OTTY)invent.o -VTTYOBJ10 = $(OTTY)isaac64.o $(OTTY)light.o $(OTTY)lock.o $(OTTY)mail.o -VTTYOBJ11 = $(OTTY)makemon.o $(OTTY)mcastu.o $(OTTY)mhitm.o $(OTTY)mhitu.o -VTTYOBJ12 = $(OTTY)minion.o $(OTTY)mklev.o $(OTTY)mkmap.o $(OTTY)mkmaze.o -VTTYOBJ13 = $(OTTY)mkobj.o $(OTTY)mkroom.o $(OTTY)mon.o $(OTTY)mondata.o -VTTYOBJ14 = $(OTTY)monmove.o $(OTTY)monst.o $(OTTY)mplayer.o $(OTTY)mthrowu.o -VTTYOBJ15 = $(OTTY)muse.o $(OTTY)music.o $(OTTY)o_init.o $(OTTY)objects.o -VTTYOBJ16 = $(OTTY)objnam.o $(OTTY)options.o $(OTTY)pager.o $(OTTY)pickup.o -VTTYOBJ17 = $(OTTY)pline.o $(OTTY)polyself.o $(OTTY)potion.o $(OTTY)pray.o -VTTYOBJ18 = $(OTTY)priest.o $(OTTY)quest.o $(OTTY)questpgr.o $(RANDOM) -VTTYOBJ19 = $(OTTY)read.o $(OTTY)rect.o $(OTTY)region.o $(OTTY)report.o $(OTTY)restore.o -VTTYOBJ20 = $(OTTY)rip.o $(OTTY)rnd.o $(OTTY)role.o $(OTTY)rumors.o -VTTYOBJ21 = $(OTTY)save.o $(OTTY)selvar.o $(OTTY)sfstruct.o $(OTTY)shk.o -VTTYOBJ22 = $(OTTY)shknam.o $(OTTY)sit.o $(OTTY)sounds.o $(OTTY)sp_lev.o -VTTYOBJ23 = $(OTTY)spell.o $(OTTY)stairs.o $(OTTY)steal.o $(OTTY)steed.o -VTTYOBJ24 = $(OTTY)strutil.o $(OTTY)symbols.o $(OTTY)sys.o $(OTTY)teleport.o $(OTTY)timeout.o -VTTYOBJ25 = $(OTTY)topten.o $(OTTY)track.o $(OTTY)trap.o $(OTTY)u_init.o -VTTYOBJ26 = $(OTTY)uhitm.o $(OTTY)utf8map.o $(OTTY)vault.o $(OTTY)vision.o -VTTYOBJ27 = $(OTTY)weapon.o $(OTTY)were.o $(OTTY)wield.o $(OTTY)windows.o -VTTYOBJ28 = $(OTTY)wizard.o $(OTTY)wizcmds.o $(OTTY)worm.o $(OTTY)worn.o -VTTYOBJ29 = $(OTTY)write.o $(OTTY)zap.o +COREOBJTTY = \ + $(OTTY)allmain.o $(OTTY)alloc.o $(OTTY)apply.o $(OTTY)artifact.o \ + $(OTTY)attrib.o $(OTTY)ball.o $(OTTY)bones.o $(OTTY)botl.o \ + $(OTTY)calendar.o $(OTTY)cmd.o $(OTTY)coloratt.o $(OTTY)dbridge.o \ + $(OTTY)decl.o $(OTTY)detect.o $(OTTY)dig.o $(OTTY)display.o \ + $(OTTY)do.o $(OTTY)do_name.o $(OTTY)do_wear.o $(OTTY)dog.o \ + $(OTTY)dogmove.o $(OTTY)dokick.o $(OTTY)dothrow.o $(OTTY)drawing.o \ + $(OTTY)dungeon.o $(OTTY)eat.o $(OTTY)end.o $(OTTY)engrave.o \ + $(OTTY)exper.o $(OTTY)explode.o $(OTTY)extralev.o $(OTTY)files.o \ + $(OTTY)fountain.o $(OTTY)getpos.o $(OTTY)glyphs.o $(OTTY)hack.o \ + $(OTTY)insight.o $(OTTY)invent.o $(OTTY)isaac64.o $(OTTY)light.o \ + $(OTTY)lock.o $(OTTY)mail.o $(OTTY)makemon.o $(OTTY)mcastu.o \ + $(OTTY)mhitm.o $(OTTY)mhitu.o $(OTTY)minion.o $(OTTY)mklev.o \ + $(OTTY)mkmap.o $(OTTY)mkmaze.o $(OTTY)mkobj.o $(OTTY)mkroom.o \ + $(OTTY)mon.o $(OTTY)mondata.o $(OTTY)monmove.o $(OTTY)monst.o \ + $(OTTY)mplayer.o $(OTTY)mthrowu.o $(OTTY)muse.o $(OTTY)music.o \ + $(OTTY)o_init.o $(OTTY)objects.o $(OTTY)objnam.o $(OTTY)options.o \ + $(OTTY)pager.o $(OTTY)pickup.o $(OTTY)pline.o $(OTTY)polyself.o \ + $(OTTY)potion.o $(OTTY)pray.o $(OTTY)priest.o $(OTTY)quest.o \ + $(OTTY)questpgr.o $(OTTY)read.o $(OTTY)rect.o $(OTTY)region.o \ + $(OTTY)report.o $(OTTY)restore.o $(OTTY)rip.o $(OTTY)rnd.o \ + $(OTTY)role.o $(OTTY)rumors.o $(OTTY)save.o $(OTTY)selvar.o \ + $(OTTY)sfstruct.o $(OTTY)shk.o $(OTTY)shknam.o $(OTTY)sit.o \ + $(OTTY)sounds.o $(OTTY)sp_lev.o $(OTTY)spell.o $(OTTY)stairs.o \ + $(OTTY)steal.o $(OTTY)steed.o $(OTTY)strutil.o $(OTTY)symbols.o \ + $(OTTY)sys.o $(OTTY)teleport.o $(OTTY)timeout.o $(OTTY)topten.o \ + $(OTTY)track.o $(OTTY)trap.o $(OTTY)u_init.o $(OTTY)uhitm.o \ + $(OTTY)utf8map.o $(OTTY)vault.o $(OTTY)vision.o $(OTTY)weapon.o \ + $(OTTY)were.o $(OTTY)wield.o $(OTTY)windows.o $(OTTY)wizard.o \ + $(OTTY)wizcmds.o $(OTTY)worm.o $(OTTY)worn.o $(OTTY)write.o \ + $(OTTY)zap.o -OBJSTTY = $(MDLIBTTY) \ - $(VTTYOBJ01) $(VTTYOBJ02) $(VTTYOBJ03) $(VTTYOBJ04) $(VTTYOBJ05) \ - $(VTTYOBJ06) $(VTTYOBJ07) $(VTTYOBJ08) $(VTTYOBJ09) $(VTTYOBJ10) \ - $(VTTYOBJ11) $(VTTYOBJ12) $(VTTYOBJ13) $(VTTYOBJ14) $(VTTYOBJ15) \ - $(VTTYOBJ16) $(VTTYOBJ17) $(VTTYOBJ18) $(VTTYOBJ19) $(VTTYOBJ20) \ - $(VTTYOBJ21) $(VTTYOBJ22) $(VTTYOBJ23) $(VTTYOBJ24) $(VTTYOBJ25) \ - $(VTTYOBJ26) $(VTTYOBJ27) $(VTTYOBJ28) $(VTTYOBJ29) $(VTTYOBJ30) \ - $(REGEXTTY) +OBJSTTY = $(MDLIBTTY) $(COREOBJTTY) $(REGEXTTY) $(RANDOMTTY) ALLOBJTTY = $(SOBJTTY) $(DLBOBJTTY) $(OBJSTTY) $(VVOBJTTY) $(LUAOBJTTY) @@ -729,13 +885,13 @@ ALLOBJTTY = $(SOBJTTY) $(DLBOBJTTY) $(OBJSTTY) $(VVOBJTTY) $(LUAOBJTTY) GUIDEF= -DTILES -DMSWIN_GRAPHICS -DNOTTYGRAPHICS $(CURSESGUIDEF1) -ALL_GUIHDR = $(MSWIN)\mhaskyn.h $(MSWIN)\mhdlg.h $(MSWIN)\mhfont.h \ - $(MSWIN)\mhinput.h $(MSWIN)\mhmain.h $(MSWIN)\mhmap.h $(MSWIN)\mhmenu.h \ - $(MSWIN)\mhmsg.h $(MSWIN)\mhmsgwnd.h $(MSWIN)\mhrip.h \ - $(MSWIN)\mhsplash.h $(MSWIN)\mhstatus.h \ - $(MSWIN)\mhtext.h $(MSWIN)\resource.h $(MSWIN)\winMS.h +ALL_GUIHDR = $(MSWIN)mhaskyn.h $(MSWIN)mhdlg.h $(MSWIN)mhfont.h \ + $(MSWIN)mhinput.h $(MSWIN)mhmain.h $(MSWIN)mhmap.h $(MSWIN)mhmenu.h \ + $(MSWIN)mhmsg.h $(MSWIN)mhmsgwnd.h $(MSWIN)mhrip.h \ + $(MSWIN)mhsplash.h $(MSWIN)mhstatus.h \ + $(MSWIN)mhtext.h $(MSWIN)resource.h $(MSWIN)winMS.h -RANDOMGUI = $(OGUI)random.o +#RANDOMGUI = $(OGUI)random.o MDLIBGUI = $(OGUI)mdlib.o DLBOBJGUI = $(OGUI)dlb.o REGEXGUI = $(OGUI)cppregex.o @@ -750,44 +906,39 @@ GUIOBJ = $(OGUI)mhaskyn.o $(OGUI)mhdlg.o \ $(OGUI)mhmenu.o $(OGUI)mhmsgwnd.o $(OGUI)mhrip.o $(OGUI)mhsplash.o \ $(OGUI)mhstatus.o $(OGUI)mhtext.o $(OGUI)mswproc.o $(OGUI)NetHackW.o -VGUIOBJ01 = $(OGUI)allmain.o $(OGUI)alloc.o $(OGUI)apply.o $(OGUI)artifact.o -VGUIOBJ02 = $(OGUI)attrib.o $(OGUI)ball.o $(OGUI)bones.o $(OGUI)botl.o -VGUIOBJ03 = $(OGUI)calendar.o $(OGUI)cmd.o $(OGUI)coloratt.o $(OGUI)dbridge.o $(OGUI)decl.o -VGUIOBJ04 = $(OGUI)detect.o $(OGUI)dig.o $(OGUI)display.o $(OGUI)do.o $(OGUI)do_name.o -VGUIOBJ05 = $(OGUI)do_wear.o $(OGUI)dog.o $(OGUI)dogmove.o $(OGUI)dokick.o -VGUIOBJ06 = $(OGUI)dothrow.o $(OGUI)drawing.o $(OGUI)dungeon.o $(OGUI)eat.o -VGUIOBJ07 = $(OGUI)end.o $(OGUI)engrave.o $(OGUI)exper.o $(OGUI)explode.o -VGUIOBJ08 = $(OGUI)extralev.o $(OGUI)files.o $(OGUI)fountain.o $(OGUI)getpos.o -VGUIOBJ09 = $(OGUI)glyphs.o $(OGUI)hack.o $(OGUI)insight.o $(OGUI)invent.o -VGUIOBJ10 = $(OGUI)isaac64.o $(OGUI)light.o $(OGUI)lock.o $(OGUI)mail.o -VGUIOBJ11 = $(OGUI)makemon.o $(OGUI)mcastu.o $(OGUI)mhitm.o $(OGUI)mhitu.o -VGUIOBJ12 = $(OGUI)minion.o $(OGUI)mklev.o $(OGUI)mkmap.o $(OGUI)mkmaze.o -VGUIOBJ13 = $(OGUI)mkobj.o $(OGUI)mkroom.o $(OGUI)mon.o $(OGUI)mondata.o -VGUIOBJ14 = $(OGUI)monmove.o $(OGUI)monst.o $(OGUI)mplayer.o $(OGUI)mthrowu.o -VGUIOBJ15 = $(OGUI)muse.o $(OGUI)music.o $(OGUI)o_init.o $(OGUI)objects.o -VGUIOBJ16 = $(OGUI)objnam.o $(OGUI)options.o $(OGUI)pager.o $(OGUI)pickup.o -VGUIOBJ17 = $(OGUI)pline.o $(OGUI)polyself.o $(OGUI)potion.o $(OGUI)pray.o -VGUIOBJ18 = $(OGUI)priest.o $(OGUI)quest.o $(OGUI)questpgr.o $(RANDOMGUI) -VGUIOBJ19 = $(OGUI)read.o $(OGUI)rect.o $(OGUI)region.o $(OGUI)report.o $(OGUI)restore.o -VGUIOBJ20 = $(OGUI)rip.o $(OGUI)rnd.o $(OGUI)role.o $(OGUI)rumors.o -VGUIOBJ21 = $(OGUI)save.o $(OGUI)selvar.o $(OGUI)sfstruct.o $(OGUI)shk.o -VGUIOBJ22 = $(OGUI)shknam.o $(OGUI)sit.o $(OGUI)sounds.o $(OGUI)sp_lev.o -VGUIOBJ23 = $(OGUI)spell.o $(OGUI)stairs.o $(OGUI)steal.o $(OGUI)steed.o -VGUIOBJ24 = $(OGUI)strutil.o $(OGUI)symbols.o $(OGUI)sys.o $(OGUI)teleport.o $(OGUI)timeout.o -VGUIOBJ25 = $(OGUI)topten.o $(OGUI)track.o $(OGUI)trap.o $(OGUI)u_init.o -VGUIOBJ26 = $(OGUI)uhitm.o $(OGUI)utf8map.o $(OGUI)vault.o $(OGUI)vision.o -VGUIOBJ27 = $(OGUI)weapon.o $(OGUI)were.o $(OGUI)wield.o $(OGUI)windows.o -VGUIOBJ28 = $(OGUI)wizard.o $(OGUI)wizcmds.o $(OGUI)worm.o $(OGUI)worn.o -VGUIOBJ29 = $(OGUI)write.o $(OGUI)zap.o +COREOBJGUI = \ + $(OGUI)allmain.o $(OGUI)alloc.o $(OGUI)apply.o $(OGUI)artifact.o \ + $(OGUI)attrib.o $(OGUI)ball.o $(OGUI)bones.o $(OGUI)botl.o \ + $(OGUI)calendar.o $(OGUI)cmd.o $(OGUI)coloratt.o $(OGUI)dbridge.o \ + $(OGUI)decl.o $(OGUI)detect.o $(OGUI)dig.o $(OGUI)display.o \ + $(OGUI)do.o $(OGUI)do_name.o $(OGUI)do_wear.o $(OGUI)dog.o \ + $(OGUI)dogmove.o $(OGUI)dokick.o $(OGUI)dothrow.o $(OGUI)drawing.o \ + $(OGUI)dungeon.o $(OGUI)eat.o $(OGUI)end.o $(OGUI)engrave.o \ + $(OGUI)exper.o $(OGUI)explode.o $(OGUI)extralev.o $(OGUI)files.o \ + $(OGUI)fountain.o $(OGUI)getpos.o $(OGUI)glyphs.o $(OGUI)hack.o \ + $(OGUI)insight.o $(OGUI)invent.o $(OGUI)isaac64.o $(OGUI)light.o \ + $(OGUI)lock.o $(OGUI)mail.o $(OGUI)makemon.o $(OGUI)mcastu.o \ + $(OGUI)mhitm.o $(OGUI)mhitu.o $(OGUI)minion.o $(OGUI)mklev.o \ + $(OGUI)mkmap.o $(OGUI)mkmaze.o $(OGUI)mkobj.o $(OGUI)mkroom.o \ + $(OGUI)mon.o $(OGUI)mondata.o $(OGUI)monmove.o $(OGUI)monst.o \ + $(OGUI)mplayer.o $(OGUI)mthrowu.o $(OGUI)muse.o $(OGUI)music.o \ + $(OGUI)o_init.o $(OGUI)objects.o $(OGUI)objnam.o $(OGUI)options.o \ + $(OGUI)pager.o $(OGUI)pickup.o $(OGUI)pline.o $(OGUI)polyself.o \ + $(OGUI)potion.o $(OGUI)pray.o $(OGUI)priest.o $(OGUI)quest.o \ + $(OGUI)questpgr.o $(OGUI)read.o $(OGUI)rect.o $(OGUI)region.o \ + $(OGUI)report.o $(OGUI)restore.o $(OGUI)rip.o $(OGUI)rnd.o \ + $(OGUI)role.o $(OGUI)rumors.o $(OGUI)save.o $(OGUI)selvar.o \ + $(OGUI)sfstruct.o $(OGUI)shk.o $(OGUI)shknam.o $(OGUI)sit.o \ + $(OGUI)sounds.o $(OGUI)sp_lev.o $(OGUI)spell.o $(OGUI)stairs.o \ + $(OGUI)steal.o $(OGUI)steed.o $(OGUI)strutil.o $(OGUI)symbols.o \ + $(OGUI)sys.o $(OGUI)teleport.o $(OGUI)timeout.o $(OGUI)topten.o \ + $(OGUI)track.o $(OGUI)trap.o $(OGUI)u_init.o $(OGUI)uhitm.o \ + $(OGUI)utf8map.o $(OGUI)vault.o $(OGUI)vision.o $(OGUI)weapon.o \ + $(OGUI)were.o $(OGUI)wield.o $(OGUI)windows.o $(OGUI)wizard.o \ + $(OGUI)wizcmds.o $(OGUI)worm.o $(OGUI)worn.o $(OGUI)write.o \ + $(OGUI)zap.o -OBJSGUI = $(MDLIBGUI) \ - $(VGUIOBJ01) $(VGUIOBJ02) $(VGUIOBJ03) $(VGUIOBJ04) $(VGUIOBJ05) \ - $(VGUIOBJ06) $(VGUIOBJ07) $(VGUIOBJ08) $(VGUIOBJ09) $(VGUIOBJ10) \ - $(VGUIOBJ11) $(VGUIOBJ12) $(VGUIOBJ13) $(VGUIOBJ14) $(VGUIOBJ15) \ - $(VGUIOBJ16) $(VGUIOBJ17) $(VGUIOBJ18) $(VGUIOBJ19) $(VGUIOBJ20) \ - $(VGUIOBJ21) $(VGUIOBJ22) $(VGUIOBJ23) $(VGUIOBJ24) $(VGUIOBJ25) \ - $(VGUIOBJ26) $(VGUIOBJ27) $(VGUIOBJ28) $(VGUIOBJ29) $(VGUIOBJ30) \ - $(REGEXGUI) +OBJSGUI = $(MDLIBGUI) $(COREOBJGUI) $(REGEXGUI) $(RANDOMGUI) ALLOBJGUI = $(SOBJGUI) $(DLBOBJGUI) $(OBJSGUI) $(VVOBJGUI) $(LUAOBJGUI) @@ -796,7 +947,7 @@ ALLOBJGUI = $(SOBJGUI) $(DLBOBJGUI) $(OBJSGUI) $(VVOBJGUI) $(LUAOBJGUI) # COMCTRL = comctl32.lib -OPTIONS_FILE = $(DAT)\options +OPTIONS_FILE = $(DAT)options !IFDEF TEST_CROSSCOMPILE DLBOBJ_HOST = $(OTTY)dlb$(HOST).o @@ -818,18 +969,21 @@ HAVE_SOUNDLIB=Y NEED_USERSOUNDS=Y NEED_SEAUTOMAP=Y NEED_WAV=Y -SOUNDLIBINCL = $(SOUNDLIBINCL) +R_SOUNDLIBINCL = $(R_SOUNDLIBINCL) +SOUNDLIBINCL = $(R_SOUNDLIBINCL)$(BACKSLASH) SOUNDLIBDEFS = $(SOUNDLIBDEFS) -DSND_LIB_WINDSOUND TTYSOUNDOBJS = $(TTYSOUNDOBJS) $(OTTY)windsound.o GUISOUNDOBJS = $(GUISOUNDOBJS) $(OGUI)windsound.o -#WINDSOUNDLIBDIR = +#WINDSOUNDLIBDIR = #TTYSOUNDLIBS = $(TTYSOUNDLIBS) #GUISOUNDLIBS = $(GUISOUNDLIBS) #WINDSOUNDLIBDIR = #WINDSOUNDLIBDLL = -WINDSOUNDDIR = ..\sound\windsound -SOUNDSRCS = $(SOUNDSRCS) $(WINDSOUNDDIR)\windsound.c -#GAMEDIRDLLS = $(GAMEDIRDLLS) $(GAMEDIR\$(WINDSOUNDLIBDLL) +R_WINDSOUNDDIR = $(SOUNDDIR)windsound +WINDSOUNDDIR=$(R_WINDSOUNDDIR)$(BACKSLASH) +#U_WINDSOUNDDIR = $(WINDSOUNDDIR:\=/) +SOUNDSRCS = $(SOUNDSRCS) $(WINDSOUNDDIR)windsound.c +#GAMEDIRDLLS = $(GAMEDIRDLLS) $(GAMEDIR)$(WINDSOUNDLIBDLL) !ENDIF SNDTEMP= @@ -846,40 +1000,47 @@ HAVE_SOUNDLIB=Y NEED_USERSOUNDS=Y NEED_SEAUTOMAP=Y NEED_WAV=Y -FMODROOT=..\lib\fmod\api\core +R_FMODROOT=..\lib\fmod\api\core +FMODROOT=$(R_FMODROOT)$(BACKSLASH) +U_FMODROOT=$(FMODROOT:\=/) FMODDLLBASENAME = fmod.dll -SOUNDLIBINCL = $(SOUNDLIBINCL) -I$(FMODROOT)/inc +R_SOUNDLIBINCL = $(R_SOUNDLIBINCL) -I$(FMODROOT)inc +SOUNDLIBINCL = $(R_SOUNDLIBINCL)$BACKSLASH) SOUNDLIBDEFS = $(SOUNDLIBDEFS) -DSND_LIB_FMOD TTYSOUNDOBJS = $(TTYSOUNDOBJS) $(OTTY)fmod.o GUISOUNDOBJS = $(GUISOUNDOBJS) $(OGUI)fmod.o -FMODLIBDIR = $(FMODROOT)\lib\$(TARGET_CPU) -FMODLIBDLL = $(FMODLIBDIR)\$(FMODDLLBASENAME) +R_FMODLIBDIR = $(FMODROOT)lib\$(TARGET_CPU) +FMODLIBDIR=$(R_FMODLIBDIR)$(BACKSLASH) +#U_FMODLIBDIR=$(FMODLIBDIR:\=/) +FMODLIBDLL = $(FMODLIBDIR)$(FMODDLLBASENAME) FMODFLAGS = -wd4201 -TTYSOUNDLIBS = $(TTYSOUNDLIBS) $(FMODLIBDIR)\fmod_vc.lib -GUISOUNDLIBS = $(GUISOUNDLIBS) $(FMODLIBDIR)\fmod_vc.lib +TTYSOUNDLIBS = $(TTYSOUNDLIBS) $(FMODLIBDIR)fmod_vc.lib +GUISOUNDLIBS = $(GUISOUNDLIBS) $(FMODLIBDIR)fmod_vc.lib GAMEDIRDLLS = $(GAMEDIRDLLS) $(GAMEDIR)\$(FMODDLLBASENAME) -FMODDIR = ..\sound\fmod -SOUNDSRCS = $(SOUNDSRCS) $(FMODDIR)\fmod.c +R_FMODDIR = $(SOUNDDIR)fmod +FMODDIR=$(R_FMODDIR)$(BACKSLASH) +#U_FMODDIR=$(FMODDIR:\=/) +SOUNDSRCS = $(SOUNDSRCS) $(FMODDIR)fmod.c !MESSAGE --------------------------------------------------------------------- !MESSAGE ** NOTES for fmod sound library integration ** !MESSAGE For fmod integration, this Makefile expects: -!MESSAGE fmod include directory : $(FMODROOT)\inc +!MESSAGE fmod include directory : $(FMODROOT)inc !MESSAGE fmod library directory : $(FMODLIBDIR) -!MESSAGE fmod library to link with : $(FMODLIBDIR)\fmod_vc.lib +!MESSAGE fmod library to link with : $(FMODLIBDIR)fmod_vc.lib !MESSAGE fmod library dll : $(FMODLIBDLL) !MESSAGE --------------------------------------------------------------------- FMOD_MISSING= -!IF !EXIST("$(FMODROOT)\inc") -FMOD_MISSING= $(FMOD_MISSING) $(FMODROOT)\inc -!MESSAGE Error: missing $(FMODROOT)\inc +!IF !EXIST("$(FMODROOT)inc") +FMOD_MISSING= $(FMOD_MISSING) $(FMODROOT)inc +!MESSAGE Error: missing $(FMODROOT)inc !ENDIF !IF !EXIST("$(FMODLIBDIR)") FMOD_MISSING= $(FMOD_MISSING) $(FMODLIBDIR) !MESSAGE Error: missing $(FMODLIBDIR) !ENDIF -!IF !EXIST("$(FMODLIBDIR)\fmod_vc.lib") -FMOD_MISSING= $(FMOD_MISSING) $(FMODLIBDIR)\fmod_vc.lib -!MESSAGE Error: missing $(FMODLIBDIR)\fmod_vc.lib +!IF !EXIST("$(FMODLIBDIR)fmod_vc.lib") +FMOD_MISSING= $(FMOD_MISSING) $(FMODLIBDIR)fmod_vc.lib +!MESSAGE Error: missing $(FMODLIBDIR)fmod_vc.lib !ENDIF !IF !EXIST("$(FMODLIBDLL)") FMOD_MISSING= $(FMOD_MISSING) $(FMODLIBDLL) @@ -895,38 +1056,38 @@ SNDTEMP= # SOUND Support #================================================================= -WAVS = $(SndWavDir)\se_squeak_A.wav $(SndWavDir)\se_squeak_B.wav \ - $(SndWavDir)\se_squeak_B_flat.wav $(SndWavDir)\se_squeak_C.wav \ - $(SndWavDir)\se_squeak_D.wav $(SndWavDir)\se_squeak_D_flat.wav \ - $(SndWavDir)\se_squeak_E.wav $(SndWavDir)\se_squeak_E_flat.wav \ - $(SndWavDir)\se_squeak_F.wav $(SndWavDir)\se_squeak_F_sharp.wav \ - $(SndWavDir)\se_squeak_G.wav $(SndWavDir)\se_squeak_G_sharp.wav \ - $(SndWavDir)\sound_Bell.wav $(SndWavDir)\sound_Bugle_A.wav \ - $(SndWavDir)\sound_Bugle_B.wav $(SndWavDir)\sound_Bugle_C.wav \ - $(SndWavDir)\sound_Bugle_D.wav $(SndWavDir)\sound_Bugle_E.wav \ - $(SndWavDir)\sound_Bugle_F.wav $(SndWavDir)\sound_Bugle_G.wav \ - $(SndWavDir)\sound_Drum_Of_Earthquake.wav \ - $(SndWavDir)\sound_Fire_Horn.wav $(SndWavDir)\sound_Frost_Horn.wav \ - $(SndWavDir)\sound_Leather_Drum.wav $(SndWavDir)\sound_Magic_Harp_A.wav \ - $(SndWavDir)\sound_Magic_Harp_B.wav $(SndWavDir)\sound_Magic_Harp_C.wav \ - $(SndWavDir)\sound_Magic_Harp_D.wav $(SndWavDir)\sound_Magic_Harp_E.wav \ - $(SndWavDir)\sound_Magic_Harp_F.wav $(SndWavDir)\sound_Magic_Harp_G.wav \ - $(SndWavDir)\sound_Magic_Flute_A.wav \ - $(SndWavDir)\sound_Magic_Flute_B.wav $(SndWavDir)\sound_Magic_Flute_C.wav \ - $(SndWavDir)\sound_Magic_Flute_D.wav $(SndWavDir)\sound_Magic_Flute_E.wav \ - $(SndWavDir)\sound_Magic_Flute_F.wav $(SndWavDir)\sound_Magic_Flute_G.wav \ - $(SndWavDir)\sound_Tooled_Horn_A.wav $(SndWavDir)\sound_Tooled_Horn_B.wav \ - $(SndWavDir)\sound_Tooled_Horn_C.wav $(SndWavDir)\sound_Tooled_Horn_D.wav \ - $(SndWavDir)\sound_Tooled_Horn_E.wav $(SndWavDir)\sound_Tooled_Horn_F.wav \ - $(SndWavDir)\sound_Tooled_Horn_G.wav $(SndWavDir)\sound_Wooden_Flute_A.wav \ - $(SndWavDir)\sound_Wooden_Flute_B.wav $(SndWavDir)\sound_Wooden_Flute_C.wav \ - $(SndWavDir)\sound_Wooden_Flute_D.wav $(SndWavDir)\sound_Wooden_Flute_E.wav \ - $(SndWavDir)\sound_Wooden_Flute_F.wav $(SndWavDir)\sound_Wooden_Flute_G.wav \ - $(SndWavDir)\sound_Wooden_Harp_A.wav $(SndWavDir)\sound_Wooden_Harp_B.wav \ - $(SndWavDir)\sound_Wooden_Harp_C.wav $(SndWavDir)\sound_Wooden_Harp_D.wav \ - $(SndWavDir)\sound_Wooden_Harp_E.wav $(SndWavDir)\sound_Wooden_Harp_F.wav \ - $(SndWavDir)\sound_Wooden_Harp_G.wav $(SndWavDir)\sa2_xpleveldown.wav \ - $(SndWavDir)\sa2_xplevelup.wav +WAVS = $(SndWavDir)se_squeak_A.wav $(SndWavDir)se_squeak_B.wav \ + $(SndWavDir)se_squeak_B_flat.wav $(SndWavDir)se_squeak_C.wav \ + $(SndWavDir)se_squeak_D.wav $(SndWavDir)se_squeak_D_flat.wav \ + $(SndWavDir)se_squeak_E.wav $(SndWavDir)se_squeak_E_flat.wav \ + $(SndWavDir)se_squeak_F.wav $(SndWavDir)se_squeak_F_sharp.wav \ + $(SndWavDir)se_squeak_G.wav $(SndWavDir)se_squeak_G_sharp.wav \ + $(SndWavDir)sound_Bell.wav $(SndWavDir)sound_Bugle_A.wav \ + $(SndWavDir)sound_Bugle_B.wav $(SndWavDir)sound_Bugle_C.wav \ + $(SndWavDir)sound_Bugle_D.wav $(SndWavDir)sound_Bugle_E.wav \ + $(SndWavDir)sound_Bugle_F.wav $(SndWavDir)sound_Bugle_G.wav \ + $(SndWavDir)sound_Drum_Of_Earthquake.wav \ + $(SndWavDir)sound_Fire_Horn.wav $(SndWavDir)sound_Frost_Horn.wav \ + $(SndWavDir)sound_Leather_Drum.wav $(SndWavDir)sound_Magic_Harp_A.wav \ + $(SndWavDir)sound_Magic_Harp_B.wav $(SndWavDir)sound_Magic_Harp_C.wav \ + $(SndWavDir)sound_Magic_Harp_D.wav $(SndWavDir)sound_Magic_Harp_E.wav \ + $(SndWavDir)sound_Magic_Harp_F.wav $(SndWavDir)sound_Magic_Harp_G.wav \ + $(SndWavDir)sound_Magic_Flute_A.wav \ + $(SndWavDir)sound_Magic_Flute_B.wav $(SndWavDir)sound_Magic_Flute_C.wav \ + $(SndWavDir)sound_Magic_Flute_D.wav $(SndWavDir)sound_Magic_Flute_E.wav \ + $(SndWavDir)sound_Magic_Flute_F.wav $(SndWavDir)sound_Magic_Flute_G.wav \ + $(SndWavDir)sound_Tooled_Horn_A.wav $(SndWavDir)sound_Tooled_Horn_B.wav \ + $(SndWavDir)sound_Tooled_Horn_C.wav $(SndWavDir)sound_Tooled_Horn_D.wav \ + $(SndWavDir)sound_Tooled_Horn_E.wav $(SndWavDir)sound_Tooled_Horn_F.wav \ + $(SndWavDir)sound_Tooled_Horn_G.wav $(SndWavDir)sound_Wooden_Flute_A.wav \ + $(SndWavDir)sound_Wooden_Flute_B.wav $(SndWavDir)sound_Wooden_Flute_C.wav \ + $(SndWavDir)sound_Wooden_Flute_D.wav $(SndWavDir)sound_Wooden_Flute_E.wav \ + $(SndWavDir)sound_Wooden_Flute_F.wav $(SndWavDir)sound_Wooden_Flute_G.wav \ + $(SndWavDir)sound_Wooden_Harp_A.wav $(SndWavDir)sound_Wooden_Harp_B.wav \ + $(SndWavDir)sound_Wooden_Harp_C.wav $(SndWavDir)sound_Wooden_Harp_D.wav \ + $(SndWavDir)sound_Wooden_Harp_E.wav $(SndWavDir)sound_Wooden_Harp_F.wav \ + $(SndWavDir)sound_Wooden_Harp_G.wav $(SndWavDir)sa2_xpleveldown.wav \ + $(SndWavDir)sa2_xplevelup.wav !IF "$(HAVE_SOUNDLIB)" == "Y" !IF "$(NEED_USERSOUNDS)" == "Y" @@ -943,37 +1104,40 @@ RCFLAGS = $(RCFLAGS) -dRCWAV # Header file macros #========================================== -CONFIG_H = $(INCL)\config.h $(INCL)\config1.h $(INCL)\patchlevel.h \ - $(INCL)\tradstdc.h $(INCL)\global.h $(INCL)\coord.h \ - $(INCL)\vmsconf.h $(INCL)\cstd.h $(INCL)\nhlua.h \ - $(INCL)\unixconf.h $(INCL)\pcconf.h $(INCL)\micro.h \ - $(INCL)\windconf.h $(INCL)\warnings.h \ - $(INCL)\fnamesiz.h +# config.h +CONFIG_H = $(INCL)color.h $(INCL)config.h $(INCL)config1.h \ + $(INCL)coord.h $(INCL)cstd.h $(INCL)fnamesiz.h \ + $(INCL)global.h $(INCL)integer.h $(INCL)micro.h \ + $(INCL)patchlevel.h $(INCL)pcconf.h \ + $(INCL)tradstdc.h $(INCL)unixconf.h \ + $(INCL)vmsconf.h $(INCL)warnings.h \ + $(INCL)windconf.h -HACK_H = $(INCL)\hack.h $(CONFIG_H) $(INCL)\lint.h $(INCL)\align.h \ - $(INCL)\dungeon.h $(INCL)\sym.h $(INCL)\defsym.h \ - $(INCL)\mkroom.h $(INCL)\artilist.h \ - $(INCL)\objclass.h $(INCL)\objects.h \ - $(INCL)\youprop.h $(INCL)\prop.h $(INCL)\permonst.h \ - $(INCL)\monattk.h $(INCL)\monflag.h \ - $(INCL)\monsters.h $(INCL)\mondata.h \ - $(INCL)\wintype.h $(INCL)\context.h $(INCL)\rm.h \ - $(INCL)\botl.h $(INCL)\rect.h $(INCL)\region.h \ - $(INCL)\display.h $(INCL)\vision.h $(INCL)\color.h \ - $(INCL)\decl.h $(INCL)\quest.h $(INCL)\spell.h \ - $(INCL)\obj.h $(INCL)\engrave.h $(INCL)\you.h \ - $(INCL)\attrib.h $(INCL)\monst.h $(INCL)\mextra.h \ - $(INCL)\skills.h $(INCL)\timeout.h $(INCL)\trap.h \ - $(INCL)\flag.h $(INCL)\winprocs.h $(INCL)\sndprocs.h \ - $(INCL)\seffects.h $(INCL)\sys.h +# hack.h +HACK_H = $(CONFIG_H) $(INCL)align.h $(INCL)artilist.h \ + $(INCL)attrib.h $(INCL)botl.h $(INCL)context.h \ + $(INCL)decl.h $(INCL)defsym.h $(INCL)display.h \ + $(INCL)dungeon.h $(INCL)engrave.h $(INCL)flag.h \ + $(INCL)hack.h $(INCL)lint.h $(INCL)mextra.h \ + $(INCL)mkroom.h $(INCL)monattk.h $(INCL)mondata.h \ + $(INCL)monflag.h $(INCL)monst.h $(INCL)monsters.h \ + $(INCL)nhlua.h $(INCL)obj.h $(INCL)objclass.h \ + $(INCL)objects.h $(INCL)permonst.h $(INCL)prop.h \ + $(INCL)quest.h $(INCL)rect.h $(INCL)region.h \ + $(INCL)rm.h $(INCL)seffects.h $(INCL)selvar.h \ + $(INCL)skills.h $(INCL)sndprocs.h $(INCL)spell.h \ + $(INCL)stairs.h $(INCL)sym.h $(INCL)sys.h \ + $(INCL)timeout.h $(INCL)trap.h $(INCL)vision.h \ + $(INCL)winprocs.h $(INCL)wintype.h $(INCL)you.h \ + $(INCL)youprop.h -TILE_H = ..\win\share\tile.h +TILE_H = $(WSHR)tile.h #========================================== # Miscellaneous #========================================== -DATABASE = $(DAT)\data.base +DATABASE = $(DAT)data.base #========================================== #========================================== @@ -986,17 +1150,20 @@ DATABASE = $(DAT)\data.base # #CTAGSCMD=ctags-orig.exe !IF "$(CI_BUILD_DIR)" != "" -CTAGSCMD=$(LIBDIR)\ctags\ctags.exe +R_CTAGSDIR=$(LIBDIR)ctags +CTAGSDIR=$(R_CTAGSDIR)$(BACKSLASH) +#U_CTAGSDIR=$(CTAGSDIR:\=/) !ELSE -CTAGSCMD=..\..\..\ctags\ctags.exe +R_CTAGSDIR=..\..\..\ctags +CTAGSDIR=$(R_CTAGSDIR)$(BACKSLASH) +#U_CTAGSDIR=$(CTAGSDIR:\=/) !ENDIF +CTAGSCMD=$(CTAGSDIR)ctags.exe CTAGSOPT =--language-force=c --sort=no -D"Bitfield(x,n)=unsigned x : n" --excmd=pattern # # ctags wants unix-style pathnames # -TINC = $(INCL:\=/) -TSRC = $(SRC:\=/) cc=cl.exe cpp=cpp.exe @@ -1180,14 +1347,14 @@ conlibs = $(baselibs) guilibs = $(winlibs) # -INCLDIR= /I..\include /I..\sys\windows $(LUAINCL) $(SOUNDLIBINCL) +INCLUSIONS= /I$(R_INCL) /I$(R_MSWSYS) $(R_LUAINCL) $(R_SOUNDLIBINCL) #========================================== # Util and console builds #========================================== -CFLAGS = $(ctmpflags) $(INCLDIR) $(DLBDEF) -DSAFEPROCS $(SOUNDLIBDEFS) -CPPFLAGS = $(cpptmpflags) $(INCLDIR) $(DLBDEF) -DSAFEPROCS $(SOUNDLIBDEFS) +CFLAGS = $(ctmpflags) $(INCLUSIONS) $(DLBDEF) -DSAFEPROCS $(SOUNDLIBDEFS) +CPPFLAGS = $(cpptmpflags) $(INCLUSIONS) $(DLBDEF) -DSAFEPROCS $(SOUNDLIBDEFS) LFLAGS = $(lflags) $(conlibs) $(MACHINE) #========================================== @@ -1212,181 +1379,192 @@ DLB = # Rules for files in src #========================================== -.c{$(OBJTTY)}.o: +.c{$(R_OBJTTY)}.o: $(Q)$(CC) $(CFLAGS) $(TTYDEF) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ $< -.c{$(OBJGUI)}.o: +.c{$(R_OBJGUI)}.o: $(Q)$(CC) $(CFLAGS) $(GUIDEF) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ $< -.c{$(OBJUTIL)}.o: +.c{$(R_OBJUTIL)}.o: $(Q)$(CC) $(CFLAGS) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ $< -{$(SRC)}.c{$(OBJTTY)}.o: +{$(R_SRC)}.c{$(R_OBJTTY)}.o: $(Q)$(CC) $(CFLAGS) $(TTYDEF) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ $< -{$(SRC)}.c{$(OBJGUI)}.o: +{$(R_SRC)}.c{$(R_OBJGUI)}.o: $(Q)$(CC) $(CFLAGS) $(GUIDEF) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ $< -{$(SRC)}.c{$(OBJUTIL)}.o: +{$(R_SRC)}.c{$(R_OBJUTIL)}.o: $(Q)$(CC) $(CFLAGS) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ $< #========================================== # Rules for files in sound\windsound #========================================== -{..\sound\windsound}.c{$(OBJTTY)}.o: - $(Q)$(CC) $(CFLAGS) -I$(WSHR) $(TTYDEF) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ $< +{$(R_WINDSOUNDDIR)}.c{$(R_OBJTTY)}.o: + $(Q)$(CC) $(CFLAGS) -I$(R_WSHR) $(TTYDEF) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ $< -{..\sound\windsound}.c{$(OBJGUI)}.o: - $(Q)$(CC) $(CFLAGS) -I$(WSHR) $(GUIDEF) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ $< +{$(R_WINDSOUNDDIR)}.c{$(R_OBJGUI)}.o: + $(Q)$(CC) $(CFLAGS) -I$(R_WSHR) $(GUIDEF) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ $< #========================================== # Rules for files in sound\sample #========================================== -{..\sound\sample}.c{$(OBJTTY)}.o: - $(Q)$(CC) $(CFLAGS) -I$(WSHR) $(TTYDEF) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ $< +{$(SOUNDDIR)sample}.c{$(R_OBJTTY)}.o: + $(Q)$(CC) $(CFLAGS) -I$(R_WSHR) $(TTYDEF) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ $< -{..\sound\sample}.c{$(OBJGUI)}.o: - $(Q)$(CC) $(CFLAGS) -I$(WSHR) $(GUIDEF) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ $< +{$(SOUNDDIR)sample}.c{$(R_OBJGUI)}.o: + $(Q)$(CC) $(CFLAGS) -I$(R_WSHR) $(GUIDEF) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ $< #========================================== # Rules for files in sys\share #========================================== -{$(SSYS)}.c{$(OBJTTY)}.o: +{$(R_SSYS)}.c{$(R_OBJTTY)}.o: $(Q)$(CC) $(CFLAGS) $(TTYDEF) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ $< -{$(SSYS)}.c{$(OBJGUI)}.o: +{$(R_SSYS)}.c{$(R_OBJGUI)}.o: $(Q)$(CC) $(CFLAGS) $(GUIDEF) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ $< -{$(SSYS)}.c{$(OBJUTIL)}.o: +{$(R_SSYS)}.c{$(R_OBJUTIL)}.o: $(Q)$(CC) $(CFLAGS) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ $< -{$(SSYS)}.cpp{$(OBJTTY)}.o: +{$(R_SSYS)}.cpp{$(R_OBJTTY)}.o: $(Q)$(CC) $(CPPFLAGS) $(TTYDEF) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) /EHsc -Fo$@ $< -{$(SSYS)}.cpp{$(OBJGUI)}.o: +{$(R_SSYS)}.cpp{$(R_OBJGUI)}.o: $(Q)$(CC) $(CPPFLAGS) $(GUIDEF) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) /EHsc -Fo$@ $< -{$(SSYS)}.cpp{$(OBJUTIL)}.o: +{$(R_SSYS)}.cpp{$(R_OBJUTIL)}.o: $(Q)$(CC) $(CPPFLAGS) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) /EHsc -Fo$@ $< #========================================== # Rules for files in sys\windows #========================================== -{$(MSWSYS)}.c{$(OBJTTY)}.o: +{$(R_MSWSYS)}.c{$(R_OBJTTY)}.o: $(Q)$(CC) $(CFLAGS) $(TTYDEF) -Fo$@ $< -{$(MSWSYS)}.c{$(OBJGUI)}.o: +{$(R_MSWSYS)}.c{$(R_OBJGUI)}.o: $(Q)$(CC) $(CFLAGS) -I$(MSWSYS) $(GUIDEF) -Fo$@ $< -{$(MSWSYS)}.uu{$(MSWSYS)}.bmp: +{$(R_MSWSYS)}.uu{$(R_MSWSYS)}.bmp: $(U)uudecode.exe $< - move $(SRC)\$(@B).bmp $@ + move $(SRC)$(@B).bmp $@ #========================================== # Rules for files in util #========================================== -{$(UTIL)}.c{$(OBJUTIL)}.o: +{$(R_UTIL)}.c{$(R_OBJUTIL)}.o: $(Q)$(CC) $(CFLAGS) -Fo$@ $< #========================================== # Rules for files in win\share #========================================== -{$(WSHR)}.c{$(OBJTTY)}.o: - $(Q)$(CC) $(CFLAGS) -I$(WSHR) $(TTYDEF) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ $< +{$(R_WSHR)}.c{$(R_OBJTTY)}.o: + $(Q)$(CC) $(CFLAGS) -I$(R_WSHR) $(TTYDEF) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ $< -{$(WSHR)}.c{$(OBJGUI)}.o: - $(Q)$(CC) $(CFLAGS) -I$(WSHR) $(GUIDEF) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ $< +{$(R_WSHR)}.c{$(R_OBJGUI)}.o: + $(Q)$(CC) $(CFLAGS) -I$(R_WSHR) $(GUIDEF) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ $< -{$(WSHR)}.c{$(OBJUTIL)}.o: - $(Q)$(CC) $(CFLAGS) -I$(WSHR) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ $< +{$(R_WSHR)}.c{$(R_OBJUTIL)}.o: + $(Q)$(CC) $(CFLAGS) -I$(R_WSHR) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ $< #========================================== # Rules for files in win\tty #========================================== -{$(TTY)}.c{$(OBJTTY)}.o: - $(Q)$(CC) $(CFLAGS) $(TTYDEF) -I$(MSWSYS) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ $< +{$(R_TTY)}.c{$(R_OBJTTY)}.o: + $(Q)$(CC) $(CFLAGS) $(TTYDEF) -I$(R_MSWSYS) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ $< #========================================== # Rules for files in win\win32 #========================================== -{$(MSWIN)}.c{$(OBJGUI)}.o: - $(Q)$(CC) $(CFLAGS) $(GUIDEF) -I$(MSWSYS) -I$(MSWIN) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ $< +{$(R_MSWIN)}.c{$(R_OBJGUI)}.o: + $(Q)$(CC) $(CFLAGS) $(GUIDEF) -I$(R_MSWSYS) -I$(R_MSWIN) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ $< -{$(MSWIN)}.uu{$(MSWIN)}.bmp: +{$(R_MSWIN)}.uu{$(R_MSWIN)}.bmp: $(U)uudecode.exe $< - move $(SRC)\$(@B).bmp $@ + move $(SRC)$(@B).bmp $@ #========================================== # Rules for files in win\curses #========================================== -{$(WCURSES)}.c{$(OBJTTY)}.o: - $(Q)$(CC) $(PDCINCL) $(CFLAGS) $(CURSESCONDEF1) $(CURSESGUIDEF1) $(CURSESDEF2) $(TTYDEF) $(GUIDEF) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ $< +#!MESSAGE INCLCURSES_H=$(INCLCURSES_H) + +{$(R_WCURSES)}.c{$(R_OBJTTY)}.o: + $(Q)$(CC) $(INCLCURSES_H) $(CFLAGS) $(CURSESCONDEF1) $(CURSESGUIDEF1) $(CURSESDEF2) $(TTYDEF) $(GUIDEF) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ $< #========================================== # Rules for files in PDCurses #========================================== +#!MESSAGE {$(R_PDCURSES_TOP)}.c{$(R_OBJPDC)}.o: +#!MESSAGE {$(R_PDCSRC)}.c{$(R_OBJPDC)}.o: +#!MESSAGE PDCINCL = $(PDCINCL) +#!MESSAGE PDCINCLGUI = $(PDCINCLGUI) +#!MESSAGE PDCINCLCON = $(PDCINCLCON) +#!MESSAGE $(Q)$(CC) /wd4244 /wd4267 /wd4774 $(R_PDCINCL) $(CFLAGS:-w44774= ) $(CURSESDEF2) /wd5262 $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -FoX2 X1 # !IF "$(ADD_CURSES)" == "Y" -{$(PDCURSES_TOP)}.c{$(OBJPDC)}.o: +{$(R_PDCURSES_TOP)}.c{$(R_OBJPDC)}.o: $(Q)$(CC) /wd4244 $(PDCINCL) $(CFLAGS) $(CURSESDEF2) /wd5262 $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ $< -{$(PDCSRC)}.c{$(OBJPDC)}.o: +{$(R_PDCSRC)}.c{$(R_OBJPDC)}.o: $(Q)$(CC) /wd4244 /wd4267 /wd4774 $(PDCINCL) $(CFLAGS:-w44774= ) $(CURSESDEF2) /wd5262 $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ $< !IF "$(CURSES_CONSOLE)" == "Y" -{$(PDCWINCON)}.c{$(OBJPDCC)}.o: +{$(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: !ENDIF !IF "$(CURSES_GRAPHICAL)" == "Y" -{$(PDCWINGUI)}.c{$(OBJPDCG)}.o: +{$(R_PDCWINGUI)}.c{$(R_OBJPDCG)}.o: $(Q)$(CC) /wd4244 /wd4267 /wd4774 $(PDCINCL) $(PDCINCLGUI) $(CFLAGS) $(CURSESDEF2) /wd5262 $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ $< +#!MESSAGE {$(R_PDCWINGUI)}.c{$(R_OBJPDCG)}.o: !ENDIF !ENDIF + #========================================== # Rules for LUA files #========================================== -{$(LUASRC)}.c{$(OBJLUA)}.o: +{$(R_LUASRC)}.c{$(R_OBJLUA)}.o: $(Q)$(CC) $(CFLAGS) -wd4701 -wd4702 -wd4774 -wd4324 -wd5262 $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ $< #=============================================================================== # Rules for integrated sound files in sound/wav #=============================================================================== -{$(SndWavDir)}.uu{$(SndWavDir)}.wav: - $(U)uudecode.exe $(SndWavDir)\$(@B).uu - move $(SRC)\$(@B).wav $(SndWavDir)\$(@B).wav +{$(R_SndWavDir)}.uu{$(R_SndWavDir)}.wav: + $(U)uudecode.exe $(SndWavDir)$(@B).uu + move $(SRC)$(@B).wav $(SndWavDir)$(@B).wav #========================================== # Rules for files in sound\windsound #========================================== -{$(WINDSOUNDDIR)}.c{$(OBJTTY)}.o: - $(Q)$(CC) $(CFLAGS) -I$(WSHR) $(TTYDEF) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ $< +{$(R_WINDSOUNDDIR)}.c{$(R_OBJTTY)}.o: + $(Q)$(CC) $(CFLAGS) -I$(R_WSHR) $(TTYDEF) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ $< -{$(WINDSOUNDDIR)}.c{$(OBJGUI)}.o: - $(Q)$(CC) $(CFLAGS) -I$(WSHR) $(GUIDEF) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ $< +{$(R_WINDSOUNDDIR)}.c{$(R_OBJGUI)}.o: + $(Q)$(CC) $(CFLAGS) -I$(R_WSHR) $(GUIDEF) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ $< #========================================== # Rules for files in sound\fmod #========================================== -{$(FMODDIR)}.c{$(OBJTTY)}.o: - $(Q)$(CC) $(CFLAGS) $(FMODFLAGS) -I$(WSHR) $(TTYDEF) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ $< +{$(R_FMODDIR)}.c{$(R_OBJTTY)}.o: + $(Q)$(CC) $(CFLAGS) $(FMODFLAGS) -I$(R_WSHR) $(TTYDEF) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ $< -{$(FMODDIR)}.c{$(OBJGUI)}.o: - $(Q)$(CC) $(CFLAGS) $(FMODFLAGS) -I$(WSHR) $(GUIDEF) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ $< +{$(R_FMODDIR)}.c{$(R_OBJGUI)}.o: + $(Q)$(CC) $(CFLAGS) $(FMODFLAGS) -I$(R_WSHR) $(GUIDEF) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ $< #========================================== #=============== TARGETS ================== @@ -1403,17 +1581,17 @@ all : package !IF "$(INTERNET_AVAILABLE)" == "Y" !IF "$(GIT_AVAILABLE)" == "Y" -$(LUASRC)\lua.h: - git submodule init ../submodules/lua - git submodule update ../submodules/lua -# git submodule update --remote ../submodules/lua +$(LUASRC)lua.h: + git submodule init $(SUBM)lua + git submodule update $(SUBM)lua +# git submodule update --remote $(SUBM)lua # #aka PDCDEP !IF "$(ADD_CURSES)" == "Y" -$(PDCURSES_TOP)\curses.h: - git submodule init ../submodules/$(PDCDIST) - git submodule update ../submodules/$(PDCDIST) -# git submodule update --remote ../submodules/$(PDCDIST) +$(PDCURSES_TOP)curses.h: + git submodule init $(SUBM)$(R_PDCDIST) + git submodule update $(SUBM)$(R_PDCDIST) +# git submodule update --remote $(SUBM)$(R_PDCDIST) !ENDIF !ELSE # GIT_AVAILABLE no CURLLUASRC=http://www.lua.org/ftp/lua-5.4.6.tar.gz @@ -1423,26 +1601,26 @@ CURLLUADST=lua-5.4.6.tar.gz CURLPDCSRC=https://github.com/Bill-Gray/PDCursesMod/archive/refs/tags/v4.4.0.zip CURLPDCDST=$(PDCDIST).zip -$(LUASRC)\lua.h: - @if not exist $(LIBDIR)\*.* mkdir $(LIBDIR) - cd $(LIBDIR) +$(LUASRC)lua.h: + @if not exist $(LIBDIR)*.* mkdir $(R_LIBDIR) + cd $(R_LIBDIR) curl -L $(CURLLUASRC) -o $(CURLLUADST) tar -xvf $(CURLLUADST) - cd ..\src + cd $(R_SRC) !IF "$(ADD_CURSES)" == "Y" -$(PDCURSES_TOP)\curses.h: - @if not exist $(LIBDIR)\*.* mkdir $(LIBDIR) +$(PDCURSES_TOP)curses.h: + @if not exist $(LIBDIR)*.* mkdir $(R_LIBDIR) cd $(LIBDIR) curl -L $(CURLPDCSRC) -o $(CURLPDCDST) - if not exist $(PDCDIST)\*.* mkdir $(PDCDIST) - tar -C $(PDCDIST) --strip-components=1 -xvf $(CURLPDCDST) - cd ..\src + if not exist $(PDCDIST)*.* mkdir $(R_PDCDIST) + tar -C $(R_PDCDIST) --strip-components=1 -xvf $(CURLPDCDST) + cd $(R_SRC) !ENDIF # ADD_CURSES !ENDIF # GIT_AVAILABLE !ELSE # INTERNET_AVAILABLE -$(LUASRC)\lua.h: +$(LUASRC)lua.h: !IF "$(ADD_CURSES)" == "Y" -$(PDCURSES_TOP)\curses.h: +$(PDCURSES_TOP)curses.h: !ENDIF !ENDIF # INTERNET_AVAILABLE @@ -1486,18 +1664,18 @@ GAMEOBJ=$(GAMEOBJ:^ =^ #-------- # -$(GAMEDIR)\NetHack.exe : gamedir.tag $(OTTY)consoletty.o \ +$(GAMEDIR)NetHack.exe : gamedir.tag $(OTTY)consoletty.o \ $(ALLOBJTTY) $(CURSESWINCONOBJS) \ $(TTYSOUNDOBJS) $(OTTY)date.o $(OTTY)console.res \ - $(LUALIB) $(TTYOBJ) $(PDCWINCONLIB) $(PDCWINCONOBJS) $(OTTYHACKLIB) - @if not exist $(GAMEDIR)\*.* mkdir $(GAMEDIR) + $(LUALIB) $(TTYOBJTTY) $(PDCWINCONLIB) $(PDCWINCONOBJS) $(OTTYHACKLIB) + @if not exist $(GAMEDIR)*.* mkdir $(R_GAMEDIR) @echo Linking $(@:\=/) - $(link) $(LFLAGS) $(conlflags) /STACK:2048 /PDB:$(GAMEDIR)\$(@B).PDB /MAP:$(OTTY)$(@B).MAP \ + $(link) $(LFLAGS) $(conlflags) /STACK:2048 /PDB:$(GAMEDIR)$(@B).PDB /MAP:$(OTTY)$(@B).MAP \ $(LIBS) $(PDCWINCONLIB) $(LUALIB) $(TTYSOUNDLIBS) $(OTTYHACKLIB) \ $(conlibs) $(BCRYPT) -out:$@ @<<$(@B).lnk $(GAMEOBJTTY) $(ALLOBJTTY) - $(TTYOBJ) + $(TTYOBJTTY) $(TTYSOUNDOBJS) $(CURSESWINCONOBJS) $(PDCWINCONOBJS) $(OTTY)consoletty.o $(OTTY)date.o @@ -1509,14 +1687,14 @@ $(GAMEDIR)\NetHack.exe : gamedir.tag $(OTTY)consoletty.o \ # NetHackW #--------- # -$(GAMEDIR)\NetHackW.exe : gamedir.tag $(OGUI)tile.o \ +$(GAMEDIR)NetHackW.exe : gamedir.tag $(OGUI)tile.o \ $(ALLOBJGUI) $(GAMEOBJGUI) $(GUIOBJ) $(GUISOUNDOBJS) \ $(CURSESWINGUIOBJS) $(OGUI)date.o \ $(OGUI)NetHackW.res \ $(LUALIB) $(PDCWINGUILIB) $(PDCWINGUIOBJS) $(OGUIHACKLIB) - @if not exist $(GAMEDIR)\*.* mkdir $(GAMEDIR) + @if not exist $(GAMEDIR)*.* mkdir $(R_GAMEDIR) @echo Linking $(@:\=/) - $(link) $(LFLAGS) $(guilflags) /STACK:2048 /PDB:$(GAMEDIR)\$(@B).PDB \ + $(link) $(LFLAGS) $(guilflags) /STACK:2048 /PDB:$(GAMEDIR)$(@B).PDB \ /MAP:$(OGUI)$(@B).MAP \ $(LIBS) $(PDCWINGUILIB) $(LUALIB) \ $(GUISOUNDLIBS) $(OGUIHACKLIB) \ @@ -1534,58 +1712,58 @@ $(GAMEDIR)\NetHackW.exe : gamedir.tag $(OGUI)tile.o \ # install #-------- # -binary.tag: $(DAT)\data $(DAT)\rumors $(DAT)\oracles $(DLB) \ +binary.tag: $(DAT)data $(DAT)rumors $(DAT)oracles $(DLB) \ $(HACKCSRC) $(SOUNDSRCS) -! IF ("$(USE_DLB)"=="Y") copy nhdat$(NHV) $(GAMEDIR) - copy $(DAT)\license $(GAMEDIR) - copy $(DAT)\opthelp $(GAMEDIR) + copy $(DAT)license $(GAMEDIR) + if exist $(DAT)opthelp copy $(DAT)opthelp $(GAMEDIR) + if exist $(MSWSYS)sysconf.template copy $(MSWSYS)sysconf.template $(GAMEDIR) + if exist $(DAT)symbols copy $(DAT)symbols $(GAMEDIR)symbols + if exist $(DOC)guidebook.txt copy $(DOC)guidebook.txt $(GAMEDIR)Guidebook.txt + if exist $(DOC)nethack.txt copy $(DOC)nethack.txt $(GAMEDIR)NetHack.txt + @if exist $(GAMEDIR)NetHack.PDB echo NOTE: You may want to remove $(U_GAMEDIR)/NetHack.PDB to conserve space + @if exist $(GAMEDIR)NetHackW.PDB echo NOTE: You may want to remove $(U_GAMEDIR)/NetHackW.PDB to conserve space + -if exist $(MSWSYS)nethackrc.template copy $(MSWSYS)nethackrc.template $(R_GAMEDIR) + -if not exist $(GAMEDIR)record. goto>$(GAMEDIR)record. +! IF ("$(USE_DLB)" == "Y") + copy /Y nhdat$(NHV) $(GAMEDIR) ! ELSE - copy $(DAT)\bogusmon $(GAMEDIR) - copy $(DAT)\cmdhelp $(GAMEDIR) - copy $(DAT)\data $(GAMEDIR) - copy $(DAT)\dungeon $(GAMEDIR) - copy $(DAT)\engrave $(GAMEDIR) - copy $(DAT)\epitaph $(GAMEDIR) - copy $(DAT)\help $(GAMEDIR) - copy $(DAT)\hh $(GAMDEDIR) - copy $(DAT)\history $(GAMEDIR) - copy $(DAT)\license $(GAMEDIR) - copy $(DAT)\optmenu $(GAMEDIR) - copy $(DAT)\oracles $(GAMEDIR) - copy $(DAT)\rumors $(GAMEDIR) - copy $(DAT)\symbols $(GAMEDIR) - copy $(DAT)\tribute $(GAMEDIR) - copy $(DAT)\wizhelp $(GAMEDIR) - copy $(DAT)\*.lua $(GAMEDIR) - if exist $(DAT)\guioptions copy $(DAT)\guioptions $(GAMEDIR) - if exist $(DAT)\keyhelp copy $(DAT)\keyhelp $(GAMEDIR) - if exist $(DAT)\opthelp copy $(DAT)\opthelp $(GAMEDIR) - if exist $(DAT)\options copy $(DAT)\options $(GAMEDIR) - if exist $(DAT)\porthelp copy $(DAT)\porthelp $(GAMEDIR) - if exist $(DAT)\ttyoptions copy $(DAT)\ttyoptions $(GAMEDIR) + copy $(DAT)bogusmon $(GAMEDIR) + copy $(DAT)cmdhelp $(GAMEDIR) + copy $(DAT)data $(GAMEDIR) + copy $(DAT)dungeon $(GAMEDIR) + copy $(DAT)engrave $(GAMEDIR) + copy $(DAT)epitaph $(GAMEDIR) + copy $(DAT)help $(GAMEDIR) + copy $(DAT)hh $(GAMDEDIR) + copy $(DAT)history $(GAMEDIR) + copy $(DAT)license $(GAMEDIR) + copy $(DAT)optmenu $(GAMEDIR) + copy $(DAT)oracles $(GAMEDIR) + copy $(DAT)rumors $(GAMEDIR) + copy $(DAT)symbols $(GAMEDIR) + copy $(DAT)tribute $(GAMEDIR) + copy $(DAT)wizhelp $(GAMEDIR) + copy /Y $(DAT)*.lua $(GAMEDIR) + if exist $(DAT)guioptions copy $(DAT)guioptions $(GAMEDIR) + if exist $(DAT)keyhelp copy $(DAT)keyhelp $(GAMEDIR) + if exist $(DAT)options copy $(DAT)options $(GAMEDIR) + if exist $(DAT)porthelp copy $(DAT)porthelp $(GAMEDIR) + if exist $(DAT)ttyoptions copy $(DAT)ttyoptions $(GAMEDIR) ! ENDIF - if exist $(MSWSYS)\sysconf.template copy $(MSWSYS)\sysconf.template $(GAMEDIR) - if exist $(DAT)\symbols copy $(DAT)\symbols $(GAMEDIR)\symbols - if exist $(DOC)\guidebook.txt copy $(DOC)\guidebook.txt $(GAMEDIR)\Guidebook.txt - if exist $(DOC)\nethack.txt copy $(DOC)\nethack.txt $(GAMEDIR)\NetHack.txt - @if exist $(GAMEDIR)\NetHack.PDB echo NOTE: You may want to remove $(GAMEDIR:\=/)/NetHack.PDB to conserve space - @if exist $(GAMEDIR)\NetHackW.PDB echo NOTE: You may want to remove $(GAMEDIR:\=/)/NetHackW.PDB to conserve space - -if exist $(MSWSYS)\nethackrc.template copy $(MSWSYS)\nethackrc.template $(GAMEDIR) - -if not exist $(GAMEDIR)\record. goto>$(GAMEDIR)\record. echo binary built > $@ -# copy $(MSWSYS)\windsyshlp $(GAMEDIR) +# copy $(MSWSYS)windsyshlp $(GAMEDIR) recover: $(OUTLHACKLIB) $(U)recover.exe if exist $(U)recover.exe copy $(U)recover.exe $(GAMEDIR) - if exist $(DOC)\recover.txt copy $(DOC)\recover.txt $(GAMEDIR)\recover.txt + if exist $(DOC)recover.txt copy $(DOC)recover.txt $(GAMEDIR)recover.txt -$(OUTL)utility.tag: $(INCL)\nhlua.h outldir$(TARGET_CPU).tag $(OUTLHACKLIB) $(U)tile2bmp.exe $(U)makedefs.exe +$(OUTL)utility.tag: $(INCL)nhlua.h outldir$(TARGET_CPU).tag $(OUTLHACKLIB) $(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.nmake */ > $@ @echo #include "lua.h" >> $@ @echo LUA_API int (lua_error) (lua_State *L) NORETURN; >> $@ @@ -1596,16 +1774,16 @@ $(INCL)\nhlua.h: tileutil: $(U)gif2txt.exe $(U)gif2tx32.exe $(U)txt2ppm.exe @echo Optional tile development utilities are up to date. -$(OGUI)NetHackW.res: $(SRC)\tiles.bmp $(MSWIN)\NetHackW.rc $(MSWIN)\NetHack.ico \ - $(MSWIN)\mnsel.bmp $(MSWIN)\mnselcnt.bmp $(MSWIN)\mnunsel.bmp \ - $(MSWIN)\petmark.bmp $(MSWIN)\pilemark.bmp $(MSWIN)\NetHack.ico \ - $(MSWIN)\rip.bmp $(MSWIN)\splash.bmp $(MSWIN)\NetHackW.exe.manifest $(WAV) +$(OGUI)NetHackW.res: $(SRC)tiles.bmp $(MSWIN)NetHackW.rc $(MSWIN)NetHack.ico \ + $(MSWIN)mnsel.bmp $(MSWIN)mnselcnt.bmp $(MSWIN)mnunsel.bmp \ + $(MSWIN)petmark.bmp $(MSWIN)pilemark.bmp $(MSWIN)NetHack.ico \ + $(MSWIN)rip.bmp $(MSWIN)splash.bmp $(MSWIN)NetHackW.exe.manifest $(WAV) @echo Building resource file $@ from $** - $(rc) -nologo -r -fo$@ -i$(MSWIN) -i$(SndWavDir) -dNDEBUG -dVIA_MAKE $(RCFLAGS) $(MSWIN)\NetHackW.rc + $(rc) -nologo -r -fo$@ -i$(MSWIN) -i$(SndWavDir) -dNDEBUG -dVIA_MAKE $(RCFLAGS) $(MSWIN)NetHackW.rc -$(OTTY)console.res: $(MSWSYS)\console.rc $(MSWSYS)\NetHack.ico $(WAV) +$(OTTY)console.res: $(MSWSYS)console.rc $(MSWSYS)NetHack.ico $(WAV) @echo Building resource file $@ from $** - $(rc) -nologo -r -fo$@ -i$(MSWSYS) -i$(SndWavDir) -dNDEBUG $(RCFLAGS) $(MSWSYS)\console.rc + $(rc) -nologo -r -fo$@ -i$(MSWSYS) -i$(SndWavDir) -dNDEBUG $(RCFLAGS) $(MSWSYS)console.rc # # Secondary Targets. @@ -1625,13 +1803,13 @@ $(U)makedefs.exe: $(OUTLHACKLIB) $(MAKEDEFSOBJS) @echo Linking $(@:\=/) @$(link) $(LFLAGS) /PDB:"$(OUTL)$(@B).PDB" /MAP:"$(OUTL)$(@B).MAP" -out:$@ $(MAKEDEFSOBJS) $(OUTLHACKLIB) -$(OUTL)makedefs.o: $(U)makedefs.c $(SRC)\mdlib.c $(CONFIG_H) $(INCL)\permonst.h \ - $(INCL)\objclass.h $(INCL)\sym.h $(INCL)\defsym.h \ - $(INCL)\artilist.h $(INCL)\dungeon.h $(INCL)\obj.h \ - $(INCL)\monst.h $(INCL)\you.h $(INCL)\flag.h \ - $(INCL)\dlb.h - @if not exist $(OBJTTY)\*.* echo creating directory $(OBJTTY:\=/) - @if not exist $(OBJTTY)\*.* mkdir $(OBJTTY) +$(OUTL)makedefs.o: $(U)makedefs.c $(SRC)mdlib.c $(CONFIG_H) $(INCL)permonst.h \ + $(INCL)objclass.h $(INCL)sym.h $(INCL)defsym.h \ + $(INCL)artilist.h $(INCL)dungeon.h $(INCL)obj.h \ + $(INCL)monst.h $(INCL)you.h $(INCL)flag.h \ + $(INCL)dlb.h + @if not exist $(OBJTTY)*.* echo creating directory $(OBJTTY:\=/) + @if not exist $(OBJTTY)*.* mkdir $(R_OBJTTY) $(Q)$(CC) -DENUM_PM $(CFLAGS) $(TTYDEF) $(CROSSCOMPILE) -Fo$@ $(U)makedefs.c # $(Q)$(CC) -DENUM_PM $(CFLAGS) $(TTYDEF) $(CROSSCOMPILE) /EP -Fo$@ $(U)makedefs.c >$(OUTL)makedefs.c.preproc @@ -1692,13 +1870,13 @@ $(OGUI)date.o: $(HACKINCL) $(HACKSRC) $(HACKOBJ) $(ALLOBJGUI) # onames.h is not used with NetHack 3.7 # pm.h is not used with NetHack 3.7 -$(INCL)\date.h $(OPTIONS_FILE) : $(U)makedefs.exe +$(INCL)date.h $(OPTIONS_FILE) : $(U)makedefs.exe $(U)makedefs -v -$(INCL)\onames.h : $(U)makedefs.exe +$(INCL)onames.h : $(U)makedefs.exe $(U)makedefs -o -$(INCL)\pm.h : $(U)makedefs.exe +$(INCL)pm.h : $(U)makedefs.exe $(U)makedefs -p @@ -1724,25 +1902,27 @@ $(OGUIHACKLIB): $(OGUIHACKLIBOBJS) $(U)uudecode.exe: $(OUTL)uudecode.o @echo Linking $(@:\=/) - @$(link) $(LFLAGS) /PDB:"$(OUTL)$(@B).PDB" /MAP:"$(OUTL)$(@B).MAP" -out:$@ $(OUTL)uudecode.o + @$(link) $(LFLAGS) /PDB:"$(OUTL)$(@B).PDB" /MAP:"$(OUTL)$(@B).MAP" \ + -out:$@ $(OUTL)uudecode.o -$(OUTL)uudecode.o: $(SSYS)\uudecode.c - $(Q)$(CC) $(CFLAGS) -wd4702 $(TTYDEF) $(CROSSCOMPILE) /D_CRT_SECURE_NO_DEPRECATE -Fo$@ $(SSYS)\uudecode.c +$(OUTL)uudecode.o: $(SSYS)uudecode.c + $(Q)$(CC) $(CFLAGS) -wd4702 $(TTYDEF) $(CROSSCOMPILE) \ + /D_CRT_SECURE_NO_DEPRECATE -Fo$@ $(SSYS)uudecode.c -$(MSWIN)\mnsel.bmp: $(U)uudecode.exe $(MSWIN)\mnsel.uu -$(MSWIN)\mnselcnt.bmp: $(U)uudecode.exe $(MSWIN)\mnselcnt.uu -$(MSWIN)\mnunsel.bmp: $(U)uudecode.exe $(MSWIN)\mnunsel.uu -$(MSWIN)\petmark.bmp: $(U)uudecode.exe $(MSWIN)\petmark.uu -$(MSWIN)\pilemark.bmp: $(U)uudecode.exe $(MSWIN)\pilemark.uu -$(MSWIN)\rip.bmp: $(U)uudecode.exe $(MSWIN)\rip.uu -$(MSWIN)\splash.bmp: $(U)uudecode.exe $(MSWIN)\splash.uu +$(MSWIN)mnsel.bmp: $(U)uudecode.exe $(MSWIN)mnsel.uu +$(MSWIN)mnselcnt.bmp: $(U)uudecode.exe $(MSWIN)mnselcnt.uu +$(MSWIN)mnunsel.bmp: $(U)uudecode.exe $(MSWIN)mnunsel.uu +$(MSWIN)petmark.bmp: $(U)uudecode.exe $(MSWIN)petmark.uu +$(MSWIN)pilemark.bmp: $(U)uudecode.exe $(MSWIN)pilemark.uu +$(MSWIN)rip.bmp: $(U)uudecode.exe $(MSWIN)rip.uu +$(MSWIN)splash.bmp: $(U)uudecode.exe $(MSWIN)splash.uu -$(MSWIN)\NetHack.ico: $(U)uudecode.exe $(MSWSYS)\nhico.uu - $(U)uudecode.exe $(MSWSYS)\nhico.uu +$(MSWIN)NetHack.ico: $(U)uudecode.exe $(MSWSYS)nhico.uu + $(U)uudecode.exe $(MSWSYS)nhico.uu move nethack.ico $@ -$(MSWSYS)\NetHack.ico: $(U)uudecode.exe $(MSWSYS)\nhico.uu - $(U)uudecode.exe $(MSWSYS)\nhico.uu +$(MSWSYS)NetHack.ico: $(U)uudecode.exe $(MSWSYS)nhico.uu + $(U)uudecode.exe $(MSWSYS)nhico.uu move nethack.ico $@ #================================================= @@ -1750,53 +1930,53 @@ $(MSWSYS)\NetHack.ico: $(U)uudecode.exe $(MSWSYS)\nhico.uu #================================================= gamedir.tag: - @if not exist $(GAMEDIR)\*.* echo creating directory $(GAMEDIR:\=/) - @if not exist $(GAMEDIR)\*.* mkdir $(GAMEDIR) + @if not exist $(GAMEDIR)*.* echo creating directory $(GAMEDIR:\=/) + @if not exist $(GAMEDIR)*.* mkdir $(R_GAMEDIR) @echo directory created > $@ ottydir$(TARGET_CPU).tag: - @if not exist $(OBJTTY)\*.* echo creating directory $(OBJTTY:\=/) - @if not exist $(OBJTTY)\*.* mkdir $(OBJTTY) + @if not exist $(OBJTTY)*.* echo creating directory $(OBJTTY:\=/) + @if not exist $(OBJTTY)*.* mkdir $(R_OBJTTY) @echo directory created >$@ oguidir$(TARGET_CPU).tag: - @if not exist $(OBJGUI)\*.* echo creating directory $(OBJGUI:\=/) - @if not exist $(OBJGUI)\*.* mkdir $(OBJGUI) + @if not exist $(OBJGUI)*.* echo creating directory $(OBJGUI:\=/) + @if not exist $(OBJGUI)*.* mkdir $(R_OBJGUI) @echo directory created >$@ outldir$(TARGET_CPU).tag: - @if not exist $(OBJUTIL)\*.* echo creating directory $(OBJUTIL:\=/) - @if not exist $(OBJUTIL)\*.* mkdir $(OBJUTIL) + @if not exist $(OBJUTIL)*.* echo creating directory $(OBJUTIL:\=/) + @if not exist $(OBJUTIL)*.* mkdir $(R_OBJUTIL) @echo directory created >$@ oluadir$(TARGET_CPU).tag: - @if not exist $(OBJLUA)\*.* echo creating directory $(OBJLUA:\=/) - @if not exist $(OBJLUA)\*.* mkdir $(OBJLUA) + @if not exist $(OBJLUA)*.* echo creating directory $(OBJLUA:\=/) + @if not exist $(OBJLUA)*.* mkdir $(R_OBJLUA) @echo directory created >$@ opdcdir$(TARGET_CPU).tag: - @if not exist $(OBJPDC)\*.* echo creating directory $(OBJPDC:\=/) - @if not exist $(OBJPDC)\*.* mkdir $(OBJPDC) + @if not exist $(OBJPDC)*.* echo creating directory $(OBJPDC:\=/) + @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 $(OBJPDCC) + @if not exist $(OBJPDCC)*.* echo creating directory $(OBJPDCC:\=/) + @if not exist $(OBJPDCC)*.* mkdir $(R_OBJPDCC) @echo directory created >$@ opdcgdir$(TARGET_CPU).tag: - @if not exist $(OBJPDCG)\*.* echo creating directory $(OBJPDCG:\=/) - @if not exist $(OBJPDCG)\*.* mkdir $(OBJPDCG) + @if not exist $(OBJPDCG)*.* echo creating directory $(OBJPDCG:\=/) + @if not exist $(OBJPDCG)*.* mkdir $(R_OBJPDCG) @echo directory created >$@ libdir.tag: - @if not exist $(LIBDIR)\*.* echo creating directory $(LIB:\=/) - @if not exist $(LIBDIR)\*.* mkdir $(LIBDIR) + @if not exist $(LIBDIR)*.* echo creating directory $(LIB:\=/) + @if not exist $(LIBDIR)*.* mkdir $(R_LIBDIR) @echo directory created >$@ pkgdir.tag: - if NOT exist $(PkgDir)\*.* echo creating directory $(PkgDir:\=/) - if NOT exist $(PkgDir)\*.* mkdir $(PkgDir) + if NOT exist $(PkgDir)*.* echo creating directory $(PkgDir:\=/) + if NOT exist $(PkgDir)*.* mkdir $(R_PkgDir) @echo directory created >$@ #========================================== @@ -1806,7 +1986,7 @@ pkgdir.tag: #========================================== envchk.tag: cpu.tag -!IFDEF TTYOBJ +!IFDEF TTYOBJTTY @echo tty window support included ! IF "$(CURSES_CONSOLE)" == "Y" @echo curses console window support also included @@ -1838,18 +2018,18 @@ fetch-lua: fetch-actual-Lua fetch-Lua: fetch-actual-Lua fetch-actual-Lua: - @if not exist $(LIBDIR)\*.* mkdir $(LIBDIR) + @if not exist $(LIBDIR)*.* mkdir $(R_LIBDIR) cd $(LIBDIR) curl -R -O http://www.lua.org/ftp/lua-$(LUAVER).tar.gz tar zxf lua-$(LUAVER).tar.gz if exist lua-$(LUAVER).tar.gz del lua-$(LUAVER).tar.gz if exist lua-$(LUAVER).tar del lua-$(LUAVER).tar - cd ..\src - @echo Lua has been fetched into $(LIBDIR)\lua-$(LUAVER) + cd $(R_SRC) + @echo Lua has been fetched into $(LIBDIR)lua-$(LUAVER) !IF "$(ADD_CURSES)" == "Y" fetch-pdcurses: - @if not exist $(LIBDIR)\*.* mkdir $(LIBDIR) + @if not exist $(LIBDIR)*.* mkdir $(R_LIBDIR) cd $(LIBDIR) # curl -L -R https://codeload.github.com/wmcbrine/PDCurses/zip/master -o pdcurses.zip curl -L -R https://github.com/Bill-Gray/PDCursesMod/archive/refs/tags/v4.3.5.zip -o $(PDCDIST).zip @@ -1859,8 +2039,8 @@ fetch-pdcurses: ren PDCurses-master $(PDCDIST) if exist .\$(PDCDIST)-temp\* rd .\$(PDCDIST)-temp /s /Q if exist .\$(PDCDIST).zip del .\$(PDCDIST).zip - cd ..\src - @echo $(PDCDIST) has been fetched into $(LIBDIR)\$(PDCDIST) + cd $(R_SRC) + @echo $(PDCDIST) has been fetched into $(LIBDIR)$(PDCDIST) !ENDIF #========================================== @@ -1877,35 +2057,36 @@ $(U)dlb.exe: $(DLBOBJ_HOST) $(OUTL)dlb$(HOST).o $(OUTLHACKLIB) << !IFDEF TEST_CROSSCOMPILE -$(OUTL)dlb$(HOST).o: $(OUTL)dlb_main$(HOST).o $(OUTL)alloc$(HOST).o $(OUTL)panic$(HOST).o $(INCL)\dlb.h - $(Q)$(CC) $(CFLAGS) $(TTYDEF) $(CROSSCOMPILE) /Fo$@ $(SRC)\dlb.c +$(OUTL)dlb$(HOST).o: $(OUTL)dlb_main$(HOST).o $(OUTL)alloc$(HOST).o $(OUTL)panic$(HOST).o $(INCL)dlb.h + $(Q)$(CC) $(CFLAGS) $(TTYDEF) $(CROSSCOMPILE) /Fo$@ $(SRC)dlb.c !ENDIF -$(OUTL)dlb.o: $(OUTL)dlb_main.o $(OUTL)alloc.o $(OUTL)panic.o $(INCL)\dlb.h - $(Q)$(CC) $(CFLAGS) $(TTYDEF) /Fo$@ $(SRC)\dlb.c +$(OUTL)dlb.o: $(OUTL)dlb_main.o $(OUTL)alloc.o $(OUTL)panic.o $(INCL)dlb.h + $(Q)$(CC) $(CFLAGS) $(TTYDEF) /Fo$@ $(SRC)dlb.c -$(OTTY)dlb.o: $(OTTY)dlb_main.o $(OTTY)alloc.o $(OTTY)panic.o $(INCL)\dlb.h - $(Q)$(CC) $(CFLAGS) $(TTYDEF) /Fo$@ $(SRC)\dlb.c +$(OTTY)dlb.o: $(OTTY)dlb_main.o $(OTTY)alloc.o $(OTTY)panic.o $(INCL)dlb.h + $(Q)$(CC) $(CFLAGS) $(TTYDEF) /Fo$@ $(SRC)dlb.c -$(OGUI)dlb.o: $(OGUI)dlb_main.o $(OGUI)alloc.o $(OGUI)panic.o $(INCL)\dlb.h - $(Q)$(CC) $(CFLAGS) $(TTYDEF) /Fo$@ $(SRC)\dlb.c +$(OGUI)dlb.o: $(OGUI)dlb_main.o $(OGUI)alloc.o $(OGUI)panic.o $(INCL)dlb.h + $(Q)$(CC) $(CFLAGS) $(TTYDEF) /Fo$@ $(SRC)dlb.c -$(OUTL)dlb_main.o: $(UTIL)\dlb_main.c $(INCL)\config.h $(INCL)\dlb.h - $(Q)$(CC) $(CFLAGS) $(TTYDEF) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) /Fo$@ $(UTIL)\dlb_main.c +$(OUTL)dlb_main.o: $(UTIL)dlb_main.c $(INCL)config.h $(INCL)dlb.h + $(Q)$(CC) $(CFLAGS) $(TTYDEF) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) /Fo$@ $(UTIL)dlb_main.c -$(OTTY)dlb_main.o: $(UTIL)\dlb_main.c $(INCL)\config.h $(INCL)\dlb.h - $(Q)$(CC) $(CFLAGS) $(TTYDEF) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) /Fo$@ $(UTIL)\dlb_main.c +$(OTTY)dlb_main.o: $(UTIL)dlb_main.c $(INCL)config.h $(INCL)dlb.h + $(Q)$(CC) $(CFLAGS) $(TTYDEF) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) /Fo$@ $(UTIL)dlb_main.c -$(OGUI)dlb_main.o: $(UTIL)\dlb_main.c $(INCL)\config.h $(INCL)\dlb.h - $(Q)$(CC) $(CFLAGS) $(TTYDEF) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) /Fo$@ $(UTIL)\dlb_main.c +$(OGUI)dlb_main.o: $(UTIL)dlb_main.c $(INCL)config.h $(INCL)dlb.h + $(Q)$(CC) $(CFLAGS) $(TTYDEF) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) /Fo$@ $(UTIL)dlb_main.c -$(DAT)\porthelp: $(MSWSYS)\porthelp - @copy $(MSWSYS)\porthelp $@ >nul +$(DAT)porthelp: $(MSWSYS)porthelp + @copy $(MSWSYS)porthelp $@ >nul -nhdat$(NHV): $(U)dlb.exe $(DAT)\data $(DAT)\oracles $(OPTIONS_FILE) $(LUA_FILES) \ - $(DAT)\rumors $(DAT)\help $(DAT)\hh $(DAT)\cmdhelp $(DAT)\keyhelp \ - $(DAT)\history $(DAT)\opthelp $(DAT)\optmenu $(DAT)\wizhelp $(DAT)\porthelp \ - $(DAT)\license $(DAT)\engrave $(DAT)\epitaph $(DAT)\bogusmon $(DAT)\tribute +!IF ("$(USE_DLB)"=="Y") +nhdat$(NHV): $(U)dlb.exe $(DAT)data $(DAT)oracles $(OPTIONS_FILE) $(LUA_FILES) \ + $(DAT)rumors $(DAT)help $(DAT)hh $(DAT)cmdhelp $(DAT)keyhelp \ + $(DAT)history $(DAT)opthelp $(DAT)optmenu $(DAT)wizhelp $(DAT)porthelp \ + $(DAT)license $(DAT)engrave $(DAT)epitaph $(DAT)bogusmon $(DAT)tribute @echo Building $@ @cd $(DAT) @echo data >dlb.lst @@ -1928,9 +2109,11 @@ nhdat$(NHV): $(U)dlb.exe $(DAT)\data $(DAT)\oracles $(OPTIONS_FILE) $(LUA_FILES) @echo epitaph >>dlb.lst @echo bogusmon >>dlb.lst @echo tribute >>dlb.lst +# @for %%N in ($(luawildcards)) do dir /b %%N >>dlb.lst @for %%N in (*.lua) do @echo %%N >>dlb.lst - @$(U)dlb cIf dlb.lst $(SRC)\nhdat + @$(U)dlb cIf dlb.lst $(SRC)nhdat @cd $(SRC) +!ENDIF #========================================== # Recover Utility @@ -1941,7 +2124,7 @@ $(U)recover.exe: $(RECOVOBJS) $(OUTLHACKLIB) @$(link) $(LFLAGS) /PDB:"$(OUTL)$(@B).PDB" /MAP:"$(OUTL)$(@B).MAP" \ -out:$@ $(RECOVOBJS) $(OUTLHACKLIB) -$(OUTL)recover.o: $(CONFIG_H) $(U)recover.c $(MSWSYS)\win32api.h +$(OUTL)recover.o: $(CONFIG_H) $(U)recover.c $(MSWSYS)win32api.h $(Q)$(CC) $(CFLAGS) $(TTYDEF) -Fo$@ $(U)recover.c #========================================== @@ -1957,29 +2140,29 @@ $(U)tilemap.exe: $(OUTL)tilemap.o $(OUTL)monst.o $(OUTL)objects.o $(OUTL)drawing @$(link) $(LFLAGS) /PDB:"$(OUTL)$(@B).PDB" /MAP:"$(OUTL)$(@B).MAP" $(HACKLIB) -out:$@ \ $(OUTL)tilemap.o $(OUTL)monst.o $(OUTL)objects.o $(OUTL)drawing.o $(OUTLHACKLIB) -$(OUTL)tilemap.o: $(WSHR)\tilemap.c $(HACK_H) - $(Q)$(CC) $(CFLAGS) $(CROSSCOMPILE) -Fo$@ $(WSHR)\tilemap.c +$(OUTL)tilemap.o: $(WSHR)tilemap.c $(HACK_H) + $(Q)$(CC) $(CFLAGS) $(CROSSCOMPILE) -Fo$@ $(WSHR)tilemap.c -$(OUTL)tiletx32.o: $(WSHR)\tilemap.c $(HACK_H) - $(Q)$(CC) $(CFLAGS) $(CROSSCOMPILE) /DTILETEXT /DTILE_X=32 /DTILE_Y=32 -Fo$@ $(WSHR)\tilemap.c +$(OUTL)tiletx32.o: $(WSHR)tilemap.c $(HACK_H) + $(Q)$(CC) $(CFLAGS) $(CROSSCOMPILE) /DTILETEXT /DTILE_X=32 /DTILE_Y=32 -Fo$@ $(WSHR)tilemap.c -$(OUTL)tiletxt.o: $(WSHR)\tilemap.c $(HACK_H) - $(Q)$(CC) $(CFLAGS) $(CROSSCOMPILE) /DTILETEXT -Fo$@ $(WSHR)\tilemap.c +$(OUTL)tiletxt.o: $(WSHR)tilemap.c $(HACK_H) + $(Q)$(CC) $(CFLAGS) $(CROSSCOMPILE) /DTILETEXT -Fo$@ $(WSHR)tilemap.c -$(OUTL)gifread.o: $(WSHR)\gifread.c $(CONFIG_H) $(TILE_H) - $(Q)$(CC) $(CFLAGS) $(CROSSCOMPILE) -I$(WSHR) -Fo$@ $(WSHR)\gifread.c +$(OUTL)gifread.o: $(WSHR)gifread.c $(CONFIG_H) $(TILE_H) + $(Q)$(CC) $(CFLAGS) $(CROSSCOMPILE) -I$(WSHR) -Fo$@ $(WSHR)gifread.c -$(OUTL)gifrd32.o: $(WSHR)\gifread.c $(CONFIG_H) $(TILE_H) - $(Q)$(CC) $(CFLAGS) $(CROSSCOMPILE) -I$(WSHR) /DTILE_X=32 /DTILE_Y=32 -Fo$@ $(WSHR)\gifread.c +$(OUTL)gifrd32.o: $(WSHR)gifread.c $(CONFIG_H) $(TILE_H) + $(Q)$(CC) $(CFLAGS) $(CROSSCOMPILE) -I$(WSHR) /DTILE_X=32 /DTILE_Y=32 -Fo$@ $(WSHR)gifread.c -$(OUTL)ppmwrite.o: $(WSHR)\ppmwrite.c $(CONFIG_H) $(TILE_H) - $(Q)$(CC) $(CFLAGS) $(CROSSCOMPILE) -I$(WSHR) -Fo$@ $(WSHR)\ppmwrite.c +$(OUTL)ppmwrite.o: $(WSHR)ppmwrite.c $(CONFIG_H) $(TILE_H) + $(Q)$(CC) $(CFLAGS) $(CROSSCOMPILE) -I$(WSHR) -Fo$@ $(WSHR)ppmwrite.c -$(OUTL)tiletext.o: $(WSHR)\tiletext.c $(CONFIG_H) $(TILE_H) - $(Q)$(CC) $(CFLAGS) $(CROSSCOMPILE) -I$(WSHR) -Fo$@ $(WSHR)\tiletext.c +$(OUTL)tiletext.o: $(WSHR)tiletext.c $(CONFIG_H) $(TILE_H) + $(Q)$(CC) $(CFLAGS) $(CROSSCOMPILE) -I$(WSHR) -Fo$@ $(WSHR)tiletext.c -$(OUTL)tilete32.o: $(WSHR)\tiletext.c $(CONFIG_H) $(TILE_H) - $(Q)$(CC) $(CFLAGS) $(CROSSCOMPILE) -I$(WSHR) /DTILE_X=32 /DTILE_Y=32 -Fo$@ $(WSHR)\tiletext.c +$(OUTL)tilete32.o: $(WSHR)tiletext.c $(CONFIG_H) $(TILE_H) + $(Q)$(CC) $(CFLAGS) $(CROSSCOMPILE) -I$(WSHR) /DTILE_X=32 /DTILE_Y=32 -Fo$@ $(WSHR)tiletext.c #========================================== # Optional Tile Utilities @@ -2012,7 +2195,7 @@ $(U)txt2ppm.exe: $(PPMWRITERS) $(TEXT_IO) ) << -$(SRC)\tiles.bmp: $(U)tile2bmp.exe $(TILEFILES) +$(SRC)tiles.bmp: $(U)tile2bmp.exe $(TILEFILES) @echo Creating 16x16 binary tile files (this may take some time) @$(U)tile2bmp $@ @@ -2034,11 +2217,11 @@ $(U)til2bm32.exe: $(OUTL)til2bm32.o $(TEXT_IO32) ) << -$(OUTL)tile2bmp.o: $(WSHR)\tile2bmp.c $(HACK_H) $(TILE_H) $(MSWSYS)\win32api.h - $(Q)$(CC) $(CFLAGS) $(TTYDEF) $(CROSSCOMPILE) -I$(WSHR) /DPACKED_FILE /Fo$@ $(WSHR)\tile2bmp.c +$(OUTL)tile2bmp.o: $(WSHR)tile2bmp.c $(HACK_H) $(TILE_H) $(MSWSYS)win32api.h + $(Q)$(CC) $(CFLAGS) $(TTYDEF) $(CROSSCOMPILE) -I$(WSHR) /DPACKED_FILE /Fo$@ $(WSHR)tile2bmp.c -#$(OUTL)til2bm32.o: $(WSHR)\tile2bmp.c $(HACK_H) $(TILE_H) $(MSWSYS)\win32api.h -# $(Q)$(CC) $(CFLAGS) $(TTYDEF) $(CROSSCOMPILE) -I$(WSHR) /DPACKED_FILE /DTILE_X=32 /DTILE_Y=32 /Fo$@ $(WSHR)\tile2bmp.c +#$(OUTL)til2bm32.o: $(WSHR)tile2bmp.c $(HACK_H) $(TILE_H) $(MSWSYS)win32api.h +# $(Q)$(CC) $(CFLAGS) $(TTYDEF) $(CROSSCOMPILE) -I$(WSHR) /DPACKED_FILE /DTILE_X=32 /DTILE_Y=32 /Fo$@ $(WSHR)tile2bmp.c $(U)tile2x11.exe: $(OUTL)tile2x11.o $(OUTL)tiletext.o $(OUTL)tiletxt.o $(OUTL)alloc.o \ $(OUTL)panic.o $(OUTL)monst.o $(OUTL)objects.o @@ -2054,15 +2237,15 @@ $(U)tile2x11.exe: $(OUTL)tile2x11.o $(OUTL)tiletext.o $(OUTL)tiletxt.o $(OUTL)al $(OUTL)panic.o << -$(OUTL)tile2x11.o: $(X11)\tile2x11.c $(HACK_H) $(TILE_H) $(INCL)\tile2x11.h - $(Q)$(CC) $(CFLAGS) $(CROSSCOMPILE) -I$(WSHR) /DPACKED_FILE /Fo$@ $(X11)\tile2x11.c +$(OUTL)tile2x11.o: $(X11)tile2x11.c $(HACK_H) $(TILE_H) $(INCL)tile2x11.h + $(Q)$(CC) $(CFLAGS) $(CROSSCOMPILE) -I$(WSHR) /DPACKED_FILE /Fo$@ $(X11)tile2x11.c -$(SRC)\x11tiles: $(U)tile2x11.exe $(WSHR)\monsters.txt $(WSHR)\objects.txt \ - $(WSHR)\other.txt \ - $(WSHR)\monsters.txt - $(U)tile2x11 $(WSHR)\monsters.txt $(WSHR)\objects.txt \ - $(WSHR)\other.txt \ - -grayscale $(WSHR)\monsters.txt +$(SRC)x11tiles: $(U)tile2x11.exe $(WSHR)monsters.txt $(WSHR)objects.txt \ + $(WSHR)other.txt \ + $(WSHR)monsters.txt + $(U)tile2x11 $(WSHR)monsters.txt $(WSHR)objects.txt \ + $(WSHR)other.txt \ + -grayscale $(WSHR)monsters.txt #=============================================================================== # PDCurses @@ -2079,7 +2262,7 @@ $(PDCWINGUILIB) : $(PDCCOMMONOBJS) $(PDCWINGUIOBJS) @$(librarian) -nologo /out:$@ $(PDCCOMMONOBJS) $(PDCWINGUIOBJS) !ENDIF !ENDIF -$(OGUI)guitty.o: $(MSWSYS)\guitty.c $(WINDHDR) $(HACK_H) $(TILE_H) +$(OGUI)guitty.o: $(MSWSYS)guitty.c $(WINDHDR) $(HACK_H) $(TILE_H) #=============================================================================== # LUA @@ -2093,91 +2276,91 @@ lua.exe: $(OLUA)lua.o $(LUALIB) # @echo Linking $(@:\=/) # @$(link) /OUT:$@ $(OLUA)luac.o $(LUALIB) -$(LIBDIR)\lua$(LUAVER)-$(TARGET_CPU).dll: $(LUAOBJFILES) +$(LIBDIR)lua$(LUAVER)-$(TARGET_CPU).dll: $(LUAOBJFILES) @echo Linking $(@:\=/) - @$(link) /DLL /IMPLIB:$(LIBDIR)\lua$(LUAVER).lib /OUT:$@ $(LUAOBJFILES) + @$(link) /DLL /IMPLIB:$(LIBDIR)lua$(LUAVER).lib /OUT:$@ $(LUAOBJFILES) -$(LIBDIR)\lua$(LUAVER)-$(TARGET_CPU)-static.lib: $(LUAOBJFILES) +$(LIBDIR)lua$(LUAVER)-$(TARGET_CPU)-static.lib: $(LUAOBJFILES) @echo Building library $@ from $** @$(librarian) /OUT:$@ $(LUAOBJFILES) -$(OLUA)lua.o: $(LUASRC)\lua.c -#$(OLUA)luac.o: $(LUASRC)\luac.c -$(OLUA)lapi.o: $(LUASRC)\lapi.c - $(Q)$(CC) $(CFLAGS) $(TTYDEF) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -wd4244 -wd4701 -wd4702 -Fo$@ $(LUASRC)\lapi.c +$(OLUA)lua.o: $(LUASRC)lua.c +#$(OLUA)luac.o: $(LUASRC)luac.c +$(OLUA)lapi.o: $(LUASRC)lapi.c + $(Q)$(CC) $(CFLAGS) $(TTYDEF) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -wd4244 -wd4701 -wd4702 -Fo$@ $(LUASRC)lapi.c #=================================================================== # windsound dependencies #=================================================================== !IF "$(SOUND_WINDSOUND)" == "Y" -$(OTTY)windsound.o: ..\sound\windsound\windsound.c $(HACK_H) -$(OGUI)windsound.o: ..\sound\windsound\windsound.c $(HACK_H) +$(OTTY)windsound.o: $(WINDSOUNDDIR)windsound.c $(HACK_H) +$(OGUI)windsound.o: $(WINDSOUNDDIR)windsound.c $(HACK_H) !ENDIF #=================================================================== # fmod dependencies #=================================================================== !IF "$(SOUND_FMOD)" == "Y" -$(OTTY)fmod.o: $(FMODDIR)\fmod.c $(HACK_H) -$(OGUI)fmod.o: $(FMODDIR)\fmod.c $(HACK_H) +$(OTTY)fmod.o: $(FMODDIR)fmod.c $(HACK_H) +$(OGUI)fmod.o: $(FMODDIR)fmod.c $(HACK_H) # Copy the DLL to GAMEDIR -$(GAMEDIR)\$(FMODDLLBASENAME): +$(GAMEDIR)$(FMODDLLBASENAME): copy $(FMODLIBDLL) $@ !ENDIF #=================================================================== # sys/windows dependencies #=================================================================== -$(OTTY)consoletty.o: $(MSWSYS)\consoletty.c $(WINDHDR) $(HACK_H) $(TILE_H) -$(OTTY)win10.o: $(MSWSYS)\win10.c $(WINDHDR) $(HACK_H) -$(OTTY)windsys.o: $(MSWSYS)\windsys.c $(WINDHDR) $(HACK_H) -$(OTTY)windsound.o: ..\sound\windsound\windsound.c $(HACK_H) -#$(OTTY)sample.o: ..\sound\sample\sample.c $(HACK_H) -$(OTTY)windmain.o: $(MSWSYS)\windmain.c $(WINDHDR) $(HACK_H) -$(OTTY)safeproc.o: $(WSHR)\safeproc.c $(WINDHDR) $(HACK_H) +$(OTTY)consoletty.o: $(MSWSYS)consoletty.c $(WINDHDR) $(HACK_H) $(TILE_H) +$(OTTY)win10.o: $(MSWSYS)win10.c $(WINDHDR) $(HACK_H) +$(OTTY)windsys.o: $(MSWSYS)windsys.c $(WINDHDR) $(HACK_H) +$(OTTY)windsound.o: $(WINDSOUNDDIR)windsound.c $(HACK_H) +#$(OTTY)sample.o: $(SOUNDDIR)sample.c $(HACK_H) +$(OTTY)windmain.o: $(MSWSYS)windmain.c $(WINDHDR) $(HACK_H) +$(OTTY)safeproc.o: $(WSHR)safeproc.c $(WINDHDR) $(HACK_H) -$(OGUI)consoletty.o: $(MSWSYS)\consoletty.c $(WINDHDR) $(HACK_H) $(TILE_H) -$(OGUI)win10.o: $(MSWSYS)\win10.c $(WINDHDR) $(HACK_H) -$(OGUI)windsys.o: $(MSWSYS)\windsys.c $(WINDHDR) $(HACK_H) -$(OGUI)windsound.o: ..\sound\windsound\windsound.c $(HACK_H) -$(OGUI)windmain.o: $(MSWSYS)\windmain.c $(WINDHDR) $(HACK_H) -$(OGUI)safeproc.o: $(WSHR)\safeproc.c $(WINDHDR) $(HACK_H) +$(OGUI)consoletty.o: $(MSWSYS)consoletty.c $(WINDHDR) $(HACK_H) $(TILE_H) +$(OGUI)win10.o: $(MSWSYS)win10.c $(WINDHDR) $(HACK_H) +$(OGUI)windsys.o: $(MSWSYS)windsys.c $(WINDHDR) $(HACK_H) +$(OGUI)windsound.o: $(WINDSOUNDDIR)windsound.c $(HACK_H) +$(OGUI)windmain.o: $(MSWSYS)windmain.c $(WINDHDR) $(HACK_H) +$(OGUI)safeproc.o: $(WSHR)safeproc.c $(WINDHDR) $(HACK_H) #=================================================================== # win/win32 dependencies #=================================================================== -$(OGUI)mhaskyn.o: $(MSWIN)\mhaskyn.c $(MSWIN)\$(@B).h $(WINDHDR) $(HACK_H) -$(OGUI)mhdlg.o: $(MSWIN)\mhdlg.c $(MSWIN)\$(@B).h $(MSWIN)\resource.h $(WINDHDR) $(HACK_H) -$(OGUI)mhfont.o: $(MSWIN)\mhfont.c $(MSWIN)\$(@B).h $(WINDHDR) $(HACK_H) -$(OGUI)mhinput.o: $(MSWIN)\mhinput.c $(MSWIN)\$(@B).h $(MSWIN)\winMS.h $(WINDHDR) $(HACK_H) -$(OGUI)mhmain.o: $(MSWIN)\mhmain.c $(ALL_GUIHDR) $(WINDHDR) $(HACK_H) -$(OGUI)mhmap.o: $(MSWIN)\mhmap.c $(MSWIN)\$(@B).h $(MSWIN)\mhfont.h $(MSWIN)\mhinput.h \ - $(MSWIN)\mhmsg.h $(MSWIN)\resource.h $(WINDHDR) $(HACK_H) -$(OGUI)mhmenu.o: $(MSWIN)\mhmenu.c $(MSWIN)\$(@B).h $(MSWIN)\mhmain.h $(MSWIN)\mhmsg.h \ - $(MSWIN)\mhfont.h $(MSWIN)\mhdlg.h $(MSWIN)\resource.h $(WINDHDR) $(HACK_H) -$(OGUI)mhmsgwnd.o: $(MSWIN)\mhmsgwnd.c $(MSWIN)\$(@B).h $(MSWIN)\mhmsg.h $(MSWIN)\mhfont.h \ - $(MSWIN)\winMS.h $(WINDHDR) $(HACK_H) -$(OGUI)mhrip.o: $(MSWIN)\mhrip.c $(MSWIN)\$(@B).h $(MSWIN)\mhmsg.h $(MSWIN)\mhfont.h \ - $(MSWIN)\resource.h $(WINDHDR) $(HACK_H) -$(OGUI)mhsplash.o: $(MSWIN)\mhsplash.c $(MSWIN)\$(@B).h $(MSWIN)\mhmsg.h $(MSWIN)\mhfont.h \ - $(MSWIN)\resource.h $(WINDHDR) $(HACK_H) -$(OGUI)mhstatus.o: $(MSWIN)\mhstatus.c $(MSWIN)\$(@B).h $(MSWIN)\mhmsg.h $(MSWIN)\mhfont.h \ +$(OGUI)mhaskyn.o: $(MSWIN)mhaskyn.c $(MSWIN)$(@B).h $(WINDHDR) $(HACK_H) +$(OGUI)mhdlg.o: $(MSWIN)mhdlg.c $(MSWIN)$(@B).h $(MSWIN)resource.h $(WINDHDR) $(HACK_H) +$(OGUI)mhfont.o: $(MSWIN)mhfont.c $(MSWIN)$(@B).h $(WINDHDR) $(HACK_H) +$(OGUI)mhinput.o: $(MSWIN)mhinput.c $(MSWIN)$(@B).h $(MSWIN)winMS.h $(WINDHDR) $(HACK_H) +$(OGUI)mhmain.o: $(MSWIN)mhmain.c $(ALL_GUIHDR) $(WINDHDR) $(HACK_H) +$(OGUI)mhmap.o: $(MSWIN)mhmap.c $(MSWIN)$(@B).h $(MSWIN)mhfont.h $(MSWIN)mhinput.h \ + $(MSWIN)mhmsg.h $(MSWIN)resource.h $(WINDHDR) $(HACK_H) +$(OGUI)mhmenu.o: $(MSWIN)mhmenu.c $(MSWIN)$(@B).h $(MSWIN)mhmain.h $(MSWIN)mhmsg.h \ + $(MSWIN)mhfont.h $(MSWIN)mhdlg.h $(MSWIN)resource.h $(WINDHDR) $(HACK_H) +$(OGUI)mhmsgwnd.o: $(MSWIN)mhmsgwnd.c $(MSWIN)$(@B).h $(MSWIN)mhmsg.h $(MSWIN)mhfont.h \ + $(MSWIN)winMS.h $(WINDHDR) $(HACK_H) +$(OGUI)mhrip.o: $(MSWIN)mhrip.c $(MSWIN)$(@B).h $(MSWIN)mhmsg.h $(MSWIN)mhfont.h \ + $(MSWIN)resource.h $(WINDHDR) $(HACK_H) +$(OGUI)mhsplash.o: $(MSWIN)mhsplash.c $(MSWIN)$(@B).h $(MSWIN)mhmsg.h $(MSWIN)mhfont.h \ + $(MSWIN)resource.h $(WINDHDR) $(HACK_H) +$(OGUI)mhstatus.o: $(MSWIN)mhstatus.c $(MSWIN)$(@B).h $(MSWIN)mhmsg.h $(MSWIN)mhfont.h \ $(WINDHDR) $(HACK_H) -$(OGUI)mhtext.o: $(MSWIN)\mhtext.c $(MSWIN)\$(@B).h $(MSWIN)\mhmsg.h $(MSWIN)\mhfont.h \ +$(OGUI)mhtext.o: $(MSWIN)mhtext.c $(MSWIN)$(@B).h $(MSWIN)mhmsg.h $(MSWIN)mhfont.h \ $(WINDHDR) $(HACK_H) -$(OGUI)mswproc.o: $(MSWIN)\mswproc.c $(ALL_GUIHDR) $(MSWIN)\resource.h $(WINDHDR) $(HACK_H) -$(OGUI)NetHackW.o: $(MSWIN)\NetHackW.c $(ALL_GUIHDR) $(MSWIN)\resource.h $(WINDHDR) $(HACK_H) +$(OGUI)mswproc.o: $(MSWIN)mswproc.c $(ALL_GUIHDR) $(MSWIN)resource.h $(WINDHDR) $(HACK_H) +$(OGUI)NetHackW.o: $(MSWIN)NetHackW.c $(ALL_GUIHDR) $(MSWIN)resource.h $(WINDHDR) $(HACK_H) #=================================================================== # sys/share dependencies #=================================================================== -#$(OTTY)cppregex.o: $(SSYS)\cppregex.cpp $(HACK_H) -# $(Q)$(CC) $(CPPFLAGS) $(TTYDEF) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ $(SSYS)\cppregex.cpp +#$(OTTY)cppregex.o: $(SSYS)cppregex.cpp $(HACK_H) +# $(Q)$(CC) $(CPPFLAGS) $(TTYDEF) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ $(SSYS)cppregex.cpp -#$(OGUI)cppregex.o: $(SSYS)\cppregex.cpp $(HACK_H) -# $(Q)$(CC) $(CPPFLAGS) $(GUIDEF) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ $(SSYS)\cppregex.cpp +#$(OGUI)cppregex.o: $(SSYS)cppregex.cpp $(HACK_H) +# $(Q)$(CC) $(CPPFLAGS) $(GUIDEF) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ $(SSYS)cppregex.cpp #=============================================================================== # CROSSCOMPILE @@ -2194,13 +2377,13 @@ $(OGUI)NetHackW.o: $(MSWIN)\NetHackW.c $(ALL_GUIHDR) $(MSWIN)\resource.h $(WINDH # !IFDEF TEST_CROSSCOMPILE -$(OUTL)mdlib$(HOST).o: $(SRC)\mdlib.c - $(Q)$(CC) $(CFLAGS) $(TTYDEF) $(CROSSCOMPILE) -Fo$@ $(SRC)\mdlib.c +$(OUTL)mdlib$(HOST).o: $(SRC)mdlib.c + $(Q)$(CC) $(CFLAGS) $(TTYDEF) $(CROSSCOMPILE) -Fo$@ $(SRC)mdlib.c !ENDIF -$(OUTL)mdlib.o: $(SRC)\mdlib.c - $(Q)$(CC) $(CFLAGS) $(TTYDEF) -Fo$@ $(SRC)\mdlib.c -# $(Q)$(CC) $(CFLAGS) $(TTYDEF) /EP -Fo$@ $(SRC)\mdlib.c >$(OUTL)mdlib.c.preproc +$(OUTL)mdlib.o: $(SRC)mdlib.c + $(Q)$(CC) $(CFLAGS) $(TTYDEF) -Fo$@ $(SRC)mdlib.c +# $(Q)$(CC) $(CFLAGS) $(TTYDEF) /EP -Fo$@ $(SRC)mdlib.c >$(OUTL)mdlib.c.preproc #============================================ # util dual-role CROSSCOMPILE dependencies @@ -2221,28 +2404,28 @@ $(OGUI)panic.o: $(U)panic.c $(CONFIG_H) #$(OUTL)drawing_host.o: drawing.c $(CONFIG_H) # $(Q)$(CC) $(CFLAGS) $(CROSSCOMPILE) -Fo$@ drawing.c -$(OUTL)drawing.o: drawing.c $(CONFIG_H) $(INCL)\color.h \ - $(INCL)\sym.h $(INCL)\defsym.h $(INCL)\rm.h \ - $(INCL)\objclass.h +$(OUTL)drawing.o: drawing.c $(CONFIG_H) $(INCL)color.h \ + $(INCL)sym.h $(INCL)defsym.h $(INCL)rm.h \ + $(INCL)objclass.h $(Q)$(CC) $(CFLAGS) -Fo$@ drawing.c -#$(OUTL)monst_host.o: monst.c $(CONFIG_H) $(INCL)\permonst.h $(INCL)\align.h \ -# $(INCL)\monattk.h $(INCL)\monflag.h $(INCL)\sym.h \ -# $(INCL)\defsym.h $(INCL)\color.h +#$(OUTL)monst_host.o: monst.c $(CONFIG_H) $(INCL)permonst.h $(INCL)align.h \ +# $(INCL)monattk.h $(INCL)monflag.h $(INCL)sym.h \ +# $(INCL)defsym.h $(INCL)color.h # $(Q)$(CC) $(CFLAGS) $(TTYDEF) -Fo$@ monst.c -$(OUTL)monst.o: monst.c $(CONFIG_H) $(INCL)\permonst.h $(INCL)\align.h \ - $(INCL)\monattk.h $(INCL)\monflag.h $(INCL)\sym.h \ - $(INCL)\defsym.h $(INCL)\color.h +$(OUTL)monst.o: monst.c $(CONFIG_H) $(INCL)permonst.h $(INCL)align.h \ + $(INCL)monattk.h $(INCL)monflag.h $(INCL)sym.h \ + $(INCL)defsym.h $(INCL)color.h $(Q)$(CC) $(CFLAGS) -Fo$@ monst.c -#$(OUTL)objects_host.o: objects.c $(CONFIG_H) $(INCL)\obj.h $(INCL)\objclass.h \ -# $(INCL)\prop.h $(INCL)\skills.h $(INCL)\color.h +#$(OUTL)objects_host.o: objects.c $(CONFIG_H) $(INCL)obj.h $(INCL)objclass.h \ +# $(INCL)prop.h $(INCL)skills.h $(INCL)color.h # $(Q)$(CC) $(CFLAGS) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) /EP $(@B).c > $(OUTL)$(@B).c.preproc # $(Q)$(CC) $(CFLAGS) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ $(@B).c -$(OUTL)objects.o: objects.c $(CONFIG_H) $(INCL)\obj.h $(INCL)\objclass.h \ - $(INCL)\prop.h $(INCL)\skills.h $(INCL)\color.h +$(OUTL)objects.o: objects.c $(CONFIG_H) $(INCL)obj.h $(INCL)objclass.h \ + $(INCL)prop.h $(INCL)skills.h $(INCL)color.h $(Q)$(CC) $(CFLAGS) /EP $(@B).c > $(OUTL)$(@B).c.preproc $(Q)$(CC) $(CFLAGS) -Fo$@ $(@B).c @@ -2260,88 +2443,88 @@ $(OUTL)alloc.o: alloc.c $(CONFIG_H) # dat dependencies # -$(DAT)\data: $(U)makedefs.exe $(DATABASE) +$(DAT)data: $(U)makedefs.exe $(DATABASE) $(U)makedefs -d -$(DAT)\rumors: $(U)makedefs.exe $(DAT)\rumors.tru $(DAT)\rumors.fal +$(DAT)rumors: $(U)makedefs.exe $(DAT)rumors.tru $(DAT)rumors.fal $(U)makedefs -r -$(DAT)\oracles: $(U)makedefs.exe $(DAT)\oracles.txt +$(DAT)oracles: $(U)makedefs.exe $(DAT)oracles.txt $(U)makedefs -h -$(DAT)\engrave: $(U)makedefs.exe $(DAT)\engrave.txt - $(U)makedefs -s +$(DAT)engrave: $(U)makedefs.exe $(DAT)engrave.txt + $(U)makedefs -2 -$(DAT)\epitaph: $(U)makedefs.exe $(DAT)\epitaph.txt - $(U)makedefs -s +$(DAT)epitaph: $(U)makedefs.exe $(DAT)epitaph.txt + $(U)makedefs -1 -$(DAT)\bogusmon: $(U)makedefs.exe $(DAT)\bogusmon.txt - $(U)makedefs -s +$(DAT)bogusmon: $(U)makedefs.exe $(DAT)bogusmon.txt + $(U)makedefs -3 #=============================================================================== # Integrated sound files #=============================================================================== -$(SndWavDir)\se_squeak_A.wav: $(SndWavDir)\se_squeak_A.uu $(U)uudecode.exe -$(SndWavDir)\se_squeak_B.wav: $(SndWavDir)\se_squeak_B.uu $(U)uudecode.exe -$(SndWavDir)\se_squeak_B_flat.wav: $(SndWavDir)\se_squeak_B_flat.uu $(U)uudecode.exe -$(SndWavDir)\se_squeak_C.wav: $(SndWavDir)\se_squeak_C.uu $(U)uudecode.exe -$(SndWavDir)\se_squeak_D.wav: $(SndWavDir)\se_squeak_D.uu $(U)uudecode.exe -$(SndWavDir)\se_squeak_D_flat.wav: $(SndWavDir)\se_squeak_D_flat.uu $(U)uudecode.exe -$(SndWavDir)\se_squeak_E.wav: $(SndWavDir)\se_squeak_E.uu $(U)uudecode.exe -$(SndWavDir)\se_squeak_E_flat.wav: $(SndWavDir)\se_squeak_E_flat.uu $(U)uudecode.exe -$(SndWavDir)\se_squeak_F.wav: $(SndWavDir)\se_squeak_F.uu $(U)uudecode.exe -$(SndWavDir)\se_squeak_F_sharp.wav: $(SndWavDir)\se_squeak_F_sharp.uu $(U)uudecode.exe -$(SndWavDir)\se_squeak_G.wav: $(SndWavDir)\se_squeak_G.uu $(U)uudecode.exe -$(SndWavDir)\se_squeak_G_sharp.wav: $(SndWavDir)\se_squeak_G_sharp.uu $(U)uudecode.exe -$(SndWavDir)\sound_Bell.wav: $(SndWavDir)\sound_Bell.uu $(U)uudecode.exe -$(SndWavDir)\sound_Bugle_A.wav: $(SndWavDir)\sound_Bugle_A.uu $(U)uudecode.exe -$(SndWavDir)\sound_Bugle_B.wav: $(SndWavDir)\sound_Bugle_B.uu $(U)uudecode.exe -$(SndWavDir)\sound_Bugle_C.wav: $(SndWavDir)\sound_Bugle_C.uu $(U)uudecode.exe -$(SndWavDir)\sound_Bugle_D.wav: $(SndWavDir)\sound_Bugle_D.uu $(U)uudecode.exe -$(SndWavDir)\sound_Bugle_E.wav: $(SndWavDir)\sound_Bugle_E.uu $(U)uudecode.exe -$(SndWavDir)\sound_Bugle_F.wav: $(SndWavDir)\sound_Bugle_F.uu $(U)uudecode.exe -$(SndWavDir)\sound_Bugle_G.wav: $(SndWavDir)\sound_Bugle_G.uu $(U)uudecode.exe -$(SndWavDir)\sound_Drum_Of_Earthquake.wav: $(SndWavDir)\sound_Drum_Of_Earthquake.uu $(U)uudecode.exe -$(SndWavDir)\sound_Fire_Horn.wav: $(SndWavDir)\sound_Fire_Horn.uu $(U)uudecode.exe -$(SndWavDir)\sound_Frost_Horn.wav: $(SndWavDir)\sound_Frost_Horn.uu $(U)uudecode.exe -$(SndWavDir)\sound_Leather_Drum.wav: $(SndWavDir)\sound_Leather_Drum.uu $(U)uudecode.exe -$(SndWavDir)\sound_Magic_Harp_A.wav: $(SndWavDir)\sound_Magic_Harp_A.uu $(U)uudecode.exe -$(SndWavDir)\sound_Magic_Harp_B.wav: $(SndWavDir)\sound_Magic_Harp_B.uu $(U)uudecode.exe -$(SndWavDir)\sound_Magic_Harp_C.wav: $(SndWavDir)\sound_Magic_Harp_C.uu $(U)uudecode.exe -$(SndWavDir)\sound_Magic_Harp_D.wav: $(SndWavDir)\sound_Magic_Harp_D.uu $(U)uudecode.exe -$(SndWavDir)\sound_Magic_Harp_E.wav: $(SndWavDir)\sound_Magic_Harp_E.uu $(U)uudecode.exe -$(SndWavDir)\sound_Magic_Harp_F.wav: $(SndWavDir)\sound_Magic_Harp_F.uu $(U)uudecode.exe -$(SndWavDir)\sound_Magic_Harp_G.wav: $(SndWavDir)\sound_Magic_Harp_G.uu $(U)uudecode.exe -$(SndWavDir)\sound_Magic_Flute_A.wav: $(SndWavDir)\sound_Magic_Flute_A.uu $(U)uudecode.exe -$(SndWavDir)\sound_Magic_Flute_B.wav: $(SndWavDir)\sound_Magic_Flute_B.uu $(U)uudecode.exe -$(SndWavDir)\sound_Magic_Flute_C.wav: $(SndWavDir)\sound_Magic_Flute_C.uu $(U)uudecode.exe -$(SndWavDir)\sound_Magic_Flute_D.wav: $(SndWavDir)\sound_Magic_Flute_D.uu $(U)uudecode.exe -$(SndWavDir)\sound_Magic_Flute_E.wav: $(SndWavDir)\sound_Magic_Flute_E.uu $(U)uudecode.exe -$(SndWavDir)\sound_Magic_Flute_F.wav: $(SndWavDir)\sound_Magic_Flute_F.uu $(U)uudecode.exe -$(SndWavDir)\sound_Magic_Flute_G.wav: $(SndWavDir)\sound_Magic_Flute_G.uu $(U)uudecode.exe -$(SndWavDir)\sound_Tooled_Horn_A.wav: $(SndWavDir)\sound_Tooled_Horn_A.uu $(U)uudecode.exe -$(SndWavDir)\sound_Tooled_Horn_B.wav: $(SndWavDir)\sound_Tooled_Horn_B.uu $(U)uudecode.exe -$(SndWavDir)\sound_Tooled_Horn_C.wav: $(SndWavDir)\sound_Tooled_Horn_C.uu $(U)uudecode.exe -$(SndWavDir)\sound_Tooled_Horn_D.wav: $(SndWavDir)\sound_Tooled_Horn_D.uu $(U)uudecode.exe -$(SndWavDir)\sound_Tooled_Horn_E.wav: $(SndWavDir)\sound_Tooled_Horn_E.uu $(U)uudecode.exe -$(SndWavDir)\sound_Tooled_Horn_F.wav: $(SndWavDir)\sound_Tooled_Horn_F.uu $(U)uudecode.exe -$(SndWavDir)\sound_Tooled_Horn_G.wav: $(SndWavDir)\sound_Tooled_Horn_G.uu $(U)uudecode.exe -$(SndWavDir)\sound_Wooden_Flute_A.wav: $(SndWavDir)\sound_Wooden_Flute_A.uu $(U)uudecode.exe -$(SndWavDir)\sound_Wooden_Flute_B.wav: $(SndWavDir)\sound_Wooden_Flute_B.uu $(U)uudecode.exe -$(SndWavDir)\sound_Wooden_Flute_C.wav: $(SndWavDir)\sound_Wooden_Flute_C.uu $(U)uudecode.exe -$(SndWavDir)\sound_Wooden_Flute_D.wav: $(SndWavDir)\sound_Wooden_Flute_D.uu $(U)uudecode.exe -$(SndWavDir)\sound_Wooden_Flute_E.wav: $(SndWavDir)\sound_Wooden_Flute_E.uu $(U)uudecode.exe -$(SndWavDir)\sound_Wooden_Flute_F.wav: $(SndWavDir)\sound_Wooden_Flute_F.uu $(U)uudecode.exe -$(SndWavDir)\sound_Wooden_Flute_G.wav: $(SndWavDir)\sound_Wooden_Flute_G.uu $(U)uudecode.exe -$(SndWavDir)\sound_Wooden_Harp_A.wav: $(SndWavDir)\sound_Wooden_Harp_A.uu $(U)uudecode.exe -$(SndWavDir)\sound_Wooden_Harp_B.wav: $(SndWavDir)\sound_Wooden_Harp_B.uu $(U)uudecode.exe -$(SndWavDir)\sound_Wooden_Harp_C.wav: $(SndWavDir)\sound_Wooden_Harp_C.uu $(U)uudecode.exe -$(SndWavDir)\sound_Wooden_Harp_D.wav: $(SndWavDir)\sound_Wooden_Harp_D.uu $(U)uudecode.exe -$(SndWavDir)\sound_Wooden_Harp_E.wav: $(SndWavDir)\sound_Wooden_Harp_E.uu $(U)uudecode.exe -$(SndWavDir)\sound_Wooden_Harp_F.wav: $(SndWavDir)\sound_Wooden_Harp_F.uu $(U)uudecode.exe -$(SndWavDir)\sound_Wooden_Harp_G.wav: $(SndWavDir)\sound_Wooden_Harp_G.uu $(U)uudecode.exe -$(SndWavDir)\sa2_xpleveldown.wav: $(SndWavDir)\sa2_xpleveldown.uu $(U)uudecode.exe -$(SndWavDir)\sa2_xplevelup.wav: $(SndWavDir)\sa2_xplevelup.uu $(U)uudecode.exe +$(SndWavDir)se_squeak_A.wav: $(SndWavDir)se_squeak_A.uu $(U)uudecode.exe +$(SndWavDir)se_squeak_B.wav: $(SndWavDir)se_squeak_B.uu $(U)uudecode.exe +$(SndWavDir)se_squeak_B_flat.wav: $(SndWavDir)se_squeak_B_flat.uu $(U)uudecode.exe +$(SndWavDir)se_squeak_C.wav: $(SndWavDir)se_squeak_C.uu $(U)uudecode.exe +$(SndWavDir)se_squeak_D.wav: $(SndWavDir)se_squeak_D.uu $(U)uudecode.exe +$(SndWavDir)se_squeak_D_flat.wav: $(SndWavDir)se_squeak_D_flat.uu $(U)uudecode.exe +$(SndWavDir)se_squeak_E.wav: $(SndWavDir)se_squeak_E.uu $(U)uudecode.exe +$(SndWavDir)se_squeak_E_flat.wav: $(SndWavDir)se_squeak_E_flat.uu $(U)uudecode.exe +$(SndWavDir)se_squeak_F.wav: $(SndWavDir)se_squeak_F.uu $(U)uudecode.exe +$(SndWavDir)se_squeak_F_sharp.wav: $(SndWavDir)se_squeak_F_sharp.uu $(U)uudecode.exe +$(SndWavDir)se_squeak_G.wav: $(SndWavDir)se_squeak_G.uu $(U)uudecode.exe +$(SndWavDir)se_squeak_G_sharp.wav: $(SndWavDir)se_squeak_G_sharp.uu $(U)uudecode.exe +$(SndWavDir)sound_Bell.wav: $(SndWavDir)sound_Bell.uu $(U)uudecode.exe +$(SndWavDir)sound_Bugle_A.wav: $(SndWavDir)sound_Bugle_A.uu $(U)uudecode.exe +$(SndWavDir)sound_Bugle_B.wav: $(SndWavDir)sound_Bugle_B.uu $(U)uudecode.exe +$(SndWavDir)sound_Bugle_C.wav: $(SndWavDir)sound_Bugle_C.uu $(U)uudecode.exe +$(SndWavDir)sound_Bugle_D.wav: $(SndWavDir)sound_Bugle_D.uu $(U)uudecode.exe +$(SndWavDir)sound_Bugle_E.wav: $(SndWavDir)sound_Bugle_E.uu $(U)uudecode.exe +$(SndWavDir)sound_Bugle_F.wav: $(SndWavDir)sound_Bugle_F.uu $(U)uudecode.exe +$(SndWavDir)sound_Bugle_G.wav: $(SndWavDir)sound_Bugle_G.uu $(U)uudecode.exe +$(SndWavDir)sound_Drum_Of_Earthquake.wav: $(SndWavDir)sound_Drum_Of_Earthquake.uu $(U)uudecode.exe +$(SndWavDir)sound_Fire_Horn.wav: $(SndWavDir)sound_Fire_Horn.uu $(U)uudecode.exe +$(SndWavDir)sound_Frost_Horn.wav: $(SndWavDir)sound_Frost_Horn.uu $(U)uudecode.exe +$(SndWavDir)sound_Leather_Drum.wav: $(SndWavDir)sound_Leather_Drum.uu $(U)uudecode.exe +$(SndWavDir)sound_Magic_Harp_A.wav: $(SndWavDir)sound_Magic_Harp_A.uu $(U)uudecode.exe +$(SndWavDir)sound_Magic_Harp_B.wav: $(SndWavDir)sound_Magic_Harp_B.uu $(U)uudecode.exe +$(SndWavDir)sound_Magic_Harp_C.wav: $(SndWavDir)sound_Magic_Harp_C.uu $(U)uudecode.exe +$(SndWavDir)sound_Magic_Harp_D.wav: $(SndWavDir)sound_Magic_Harp_D.uu $(U)uudecode.exe +$(SndWavDir)sound_Magic_Harp_E.wav: $(SndWavDir)sound_Magic_Harp_E.uu $(U)uudecode.exe +$(SndWavDir)sound_Magic_Harp_F.wav: $(SndWavDir)sound_Magic_Harp_F.uu $(U)uudecode.exe +$(SndWavDir)sound_Magic_Harp_G.wav: $(SndWavDir)sound_Magic_Harp_G.uu $(U)uudecode.exe +$(SndWavDir)sound_Magic_Flute_A.wav: $(SndWavDir)sound_Magic_Flute_A.uu $(U)uudecode.exe +$(SndWavDir)sound_Magic_Flute_B.wav: $(SndWavDir)sound_Magic_Flute_B.uu $(U)uudecode.exe +$(SndWavDir)sound_Magic_Flute_C.wav: $(SndWavDir)sound_Magic_Flute_C.uu $(U)uudecode.exe +$(SndWavDir)sound_Magic_Flute_D.wav: $(SndWavDir)sound_Magic_Flute_D.uu $(U)uudecode.exe +$(SndWavDir)sound_Magic_Flute_E.wav: $(SndWavDir)sound_Magic_Flute_E.uu $(U)uudecode.exe +$(SndWavDir)sound_Magic_Flute_F.wav: $(SndWavDir)sound_Magic_Flute_F.uu $(U)uudecode.exe +$(SndWavDir)sound_Magic_Flute_G.wav: $(SndWavDir)sound_Magic_Flute_G.uu $(U)uudecode.exe +$(SndWavDir)sound_Tooled_Horn_A.wav: $(SndWavDir)sound_Tooled_Horn_A.uu $(U)uudecode.exe +$(SndWavDir)sound_Tooled_Horn_B.wav: $(SndWavDir)sound_Tooled_Horn_B.uu $(U)uudecode.exe +$(SndWavDir)sound_Tooled_Horn_C.wav: $(SndWavDir)sound_Tooled_Horn_C.uu $(U)uudecode.exe +$(SndWavDir)sound_Tooled_Horn_D.wav: $(SndWavDir)sound_Tooled_Horn_D.uu $(U)uudecode.exe +$(SndWavDir)sound_Tooled_Horn_E.wav: $(SndWavDir)sound_Tooled_Horn_E.uu $(U)uudecode.exe +$(SndWavDir)sound_Tooled_Horn_F.wav: $(SndWavDir)sound_Tooled_Horn_F.uu $(U)uudecode.exe +$(SndWavDir)sound_Tooled_Horn_G.wav: $(SndWavDir)sound_Tooled_Horn_G.uu $(U)uudecode.exe +$(SndWavDir)sound_Wooden_Flute_A.wav: $(SndWavDir)sound_Wooden_Flute_A.uu $(U)uudecode.exe +$(SndWavDir)sound_Wooden_Flute_B.wav: $(SndWavDir)sound_Wooden_Flute_B.uu $(U)uudecode.exe +$(SndWavDir)sound_Wooden_Flute_C.wav: $(SndWavDir)sound_Wooden_Flute_C.uu $(U)uudecode.exe +$(SndWavDir)sound_Wooden_Flute_D.wav: $(SndWavDir)sound_Wooden_Flute_D.uu $(U)uudecode.exe +$(SndWavDir)sound_Wooden_Flute_E.wav: $(SndWavDir)sound_Wooden_Flute_E.uu $(U)uudecode.exe +$(SndWavDir)sound_Wooden_Flute_F.wav: $(SndWavDir)sound_Wooden_Flute_F.uu $(U)uudecode.exe +$(SndWavDir)sound_Wooden_Flute_G.wav: $(SndWavDir)sound_Wooden_Flute_G.uu $(U)uudecode.exe +$(SndWavDir)sound_Wooden_Harp_A.wav: $(SndWavDir)sound_Wooden_Harp_A.uu $(U)uudecode.exe +$(SndWavDir)sound_Wooden_Harp_B.wav: $(SndWavDir)sound_Wooden_Harp_B.uu $(U)uudecode.exe +$(SndWavDir)sound_Wooden_Harp_C.wav: $(SndWavDir)sound_Wooden_Harp_C.uu $(U)uudecode.exe +$(SndWavDir)sound_Wooden_Harp_D.wav: $(SndWavDir)sound_Wooden_Harp_D.uu $(U)uudecode.exe +$(SndWavDir)sound_Wooden_Harp_E.wav: $(SndWavDir)sound_Wooden_Harp_E.uu $(U)uudecode.exe +$(SndWavDir)sound_Wooden_Harp_F.wav: $(SndWavDir)sound_Wooden_Harp_F.uu $(U)uudecode.exe +$(SndWavDir)sound_Wooden_Harp_G.wav: $(SndWavDir)sound_Wooden_Harp_G.uu $(U)uudecode.exe +$(SndWavDir)sa2_xpleveldown.wav: $(SndWavDir)sa2_xpleveldown.uu $(U)uudecode.exe +$(SndWavDir)sa2_xplevelup.wav: $(SndWavDir)sa2_xplevelup.uu $(U)uudecode.exe #=============================================================================== # packaging @@ -2349,33 +2532,33 @@ $(SndWavDir)\sa2_xplevelup.wav: $(SndWavDir)\sa2_xplevelup.uu $(U)uudecode.exe PKGFILES = nethackrc.template Guidebook.txt license NetHack.exe NetHack.txt \ NetHackW.exe opthelp nhdat370 record symbols sysconf.template -FILESTOZIP = $(BinDir)\nethackrc.template $(BinDir)\Guidebook.txt $(BinDir)\license \ - $(BinDir)\NetHack.exe $(BinDir)\NetHack.txt $(BinDir)\NetHackW.exe \ - $(BinDir)\opthelp $(BinDir)\nhdat370 $(BinDir)\record \ - $(BinDir)\symbols $(BinDir)\sysconf.template +FILESTOZIP = $(BinDir)nethackrc.template $(BinDir)Guidebook.txt $(BinDir)license \ + $(BinDir)NetHack.exe $(BinDir)NetHack.txt $(BinDir)NetHackW.exe \ + $(BinDir)opthelp $(BinDir)nhdat370 $(BinDir)record \ + $(BinDir)symbols $(BinDir)sysconf.template DBGSYMS = NetHack.PDB NetHackW.PDB -PDBTOZIP = $(BinDir)\NetHack.PDB $(BinDir)\NetHackW.PDB -MAINZIP = $(PkgDir)\nethack-$(NHV)-win-$(TARGET_CPU).zip -DBGSYMZIP = $(PkgDir)\nethack-$(NHV)-win-$(TARGET_CPU)-debugsymbols.zip +PDBTOZIP = $(BinDir)NetHack.PDB $(BinDir)NetHackW.PDB +MAINZIP = $(PkgDir)nethack-$(NHV)-win-$(TARGET_CPU).zip +DBGSYMZIP = $(PkgDir)nethack-$(NHV)-win-$(TARGET_CPU)-debugsymbols.zip package: binary $(FILESTOZIP) $(MAINZIP) $(DBGSYMZIP) @echo NetHack Windows package created: $(MAINZIP) $(MAINZIP): $(FILESTOZIP) - if not exist $(PkgDir)\*.* mkdir $(PkgDir) - tar -a -cf $(MAINZIP) -C $(BinDir) $(PKGFILES) + if not exist $(PkgDir)*.* mkdir $(R_PkgDir) + tar -a -cf $(MAINZIP) -C $(R_BinDir) $(PKGFILES) $(DBGSYMZIP): $(PDBTOZIP) - tar -a -cf $(DBGSYMZIP) -C $(BinDir) $(DBGSYMS) + tar -a -cf $(DBGSYMZIP) -C $(R_BinDir) $(DBGSYMS) 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 \ - $(LUASRC)\lua.h $(PDCDEP) \ - $(INCL)\nhlua.h $(OUTL)utility.tag \ - $(DAT)\data $(DAT)\rumors $(DAT)\oracles $(DAT)\engrave \ - $(DAT)\epitaph $(DAT)\bogusmon $(GAMEDIR)\NetHack.exe \ - $(GAMEDIR)\NetHackW.exe $(GAMEDIRDLLS) binary.tag + $(LUASRC)lua.h $(PDCDEP) \ + $(INCL)nhlua.h $(OUTL)utility.tag \ + $(DAT)data $(DAT)rumors $(DAT)oracles $(DAT)engrave \ + $(DAT)epitaph $(DAT)bogusmon $(GAMEDIR)NetHack.exe \ + $(GAMEDIR)NetHackW.exe $(GAMEDIRDLLS) binary.tag @echo NetHack is up to date. #=============================================================================== @@ -2383,21 +2566,21 @@ binary: envchk.tag libdir.tag ottydir$(TARGET_CPU).tag \ #=============================================================================== spotless: clean - 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.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 $(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 @@ -2415,49 +2598,49 @@ spotless: clean if exist opdcgdirx64.tag del opdcgdirx64.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)-wingui-$(TARGET_CPU)-static.lib del $(LIBDIR)\$(PDCDIST)-wingui-$(TARGET_CPU)-static.lib + if exist $(LIBDIR)$(PDCDIST)-wincon-$(TARGET_CPU)-static.lib del $(LIBDIR)$(PDCDIST)-wincon-$(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) - if exist $(DAT)\oracles del $(DAT)\oracles - if exist $(DAT)\rumors del $(DAT)\rumors - if exist $(DAT)\options del $(DAT)\options - if exist $(DAT)\ttyoptions del $(DAT)\ttyoptions - if exist $(DAT)\guioptions del $(DAT)\guioptions - if exist $(DAT)\data del $(DAT)\data + if exist $(DAT)oracles del $(DAT)oracles + if exist $(DAT)rumors del $(DAT)rumors + if exist $(DAT)options del $(DAT)options + if exist $(DAT)ttyoptions del $(DAT)ttyoptions + 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 $(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 clean: if exist binary.tag del binary.tag @@ -2469,14 +2652,14 @@ 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 @@ -2510,7 +2693,7 @@ clean: 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 $(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 @@ -2521,7 +2704,7 @@ clean: # The rest are stolen from sys/unix/Makefile.src, # twice, with the following changes: # * the CONFIG_H and HACK_H sections comment out or removed completely -# * ../include/ changed to $(INCL)\ +# * ../include/ changed to $(INCL) # * slashes changed to back-slashes # * -c (which is included in cflagsBuild) substituted with -Fo$@ # * "-o $@ " is removed @@ -2549,15 +2732,15 @@ MOCPATH = moc.exe #$(OTTY)cppregex.o: ..\sys\share\cppregex.cpp $(CONFIG_H) # $(TARGET_CXX) $(TARGET_CXXFLAGS) -Fo$@ ..\sys\share\cppregex.cpp -$(OTTY)ioctl.o: ..\sys\share\ioctl.c $(HACK_H) $(INCL)\tcap.h +$(OTTY)ioctl.o: ..\sys\share\ioctl.c $(HACK_H) $(INCL)tcap.h # $(TARGET_CC) $(TARGET_CFLAGS) -Fo$@ ..\sys\share\ioctl.c -$(OTTY)pcmain.o: ..\sys\share\pcmain.c $(HACK_H) $(INCL)\dlb.h +$(OTTY)pcmain.o: ..\sys\share\pcmain.c $(HACK_H) $(INCL)dlb.h # $(TARGET_CC) $(TARGET_CFLAGS) -Fo$@ ..\sys\share\pcmain.c -$(OTTY)pcsys.o: ..\sys\share\pcsys.c $(HACK_H) $(INCL)\wintty.h +$(OTTY)pcsys.o: ..\sys\share\pcsys.c $(HACK_H) $(INCL)wintty.h # $(TARGET_CC) $(TARGET_CFLAGS) -Fo$@ ..\sys\share\pcsys.c -$(OTTY)pctty.o: ..\sys\share\pctty.c $(HACK_H) $(INCL)\wintty.h +$(OTTY)pctty.o: ..\sys\share\pctty.c $(HACK_H) $(INCL)wintty.h # $(TARGET_CC) $(TARGET_CFLAGS) -Fo$@ ..\sys\share\pctty.c -$(OTTY)pcunix.o: ..\sys\share\pcunix.c $(HACK_H) $(INCL)\wintty.h +$(OTTY)pcunix.o: ..\sys\share\pcunix.c $(HACK_H) $(INCL)wintty.h # $(TARGET_CC) $(TARGET_CFLAGS) -Fo$@ ..\sys\share\pcunix.c $(OTTY)pmatchregex.o: ..\sys\share\pmatchregex.c $(HACK_H) # $(TARGET_CC) $(TARGET_CFLAGS) -Fo$@ ..\sys\share\pmatchregex.c @@ -2567,14 +2750,14 @@ $(OTTY)random.o: ..\sys\share\random.c $(HACK_H) # $(TARGET_CC) $(TARGET_CFLAGS) -Fo$@ ..\sys\share\random.c $(OTTY)unixtty.o: ..\sys\share\unixtty.c $(HACK_H) # $(TARGET_CC) $(TARGET_CFLAGS) -Fo$@ ..\sys\share\unixtty.c -$(OTTY)unixmain.o: ..\sys\unix\unixmain.c $(HACK_H) $(INCL)\dlb.h +$(OTTY)unixmain.o: ..\sys\unix\unixmain.c $(HACK_H) $(INCL)dlb.h # $(TARGET_CC) $(TARGET_CFLAGS) -Fo$@ ..\sys\unix\unixmain.c $(OTTY)unixres.o: ..\sys\unix\unixres.c $(CONFIG_H) # $(TARGET_CC) $(TARGET_CFLAGS) -Fo$@ ..\sys\unix\unixres.c $(OTTY)unixunix.o: ..\sys\unix\unixunix.c $(HACK_H) # $(TARGET_CC) $(TARGET_CFLAGS) -Fo$@ ..\sys\unix\unixunix.c $(OTTY)qt_bind.o: ..\win\Qt\qt_bind.cpp $(HACK_H) $(QTn_H) \ - $(INCL)\dlb.h ..\win\Qt\qt_bind.h ..\win\Qt\qt_click.h \ + $(INCL)dlb.h ..\win\Qt\qt_bind.h ..\win\Qt\qt_click.h \ ..\win\Qt\qt_clust.h ..\win\Qt\qt_delay.h ..\win\Qt\qt_icon.h \ ..\win\Qt\qt_kde0.h ..\win\Qt\qt_key.h ..\win\Qt\qt_line.h \ ..\win\Qt\qt_main.h ..\win\Qt\qt_map.h ..\win\Qt\qt_menu.h \ @@ -2593,7 +2776,7 @@ $(OTTY)qt_delay.o: ..\win\Qt\qt_delay.cpp $(HACK_H) $(QTn_H) \ ..\win\Qt\qt_delay.h ..\win\Qt\qt_post.h ..\win\Qt\qt_pre.h $(TARGET_CXX) $(TARGET_CXXFLAGS) -Fo$@ ..\win\Qt\qt_delay.cpp $(OTTY)qt_glyph.o: ..\win\Qt\qt_glyph.cpp $(HACK_H) $(QTn_H) \ - $(INCL)\tile2x11.h ..\win\Qt\qt_bind.h \ + $(INCL)tile2x11.h ..\win\Qt\qt_bind.h \ ..\win\Qt\qt_clust.h ..\win\Qt\qt_glyph.h ..\win\Qt\qt_inv.h \ ..\win\Qt\qt_kde0.h ..\win\Qt\qt_main.h ..\win\Qt\qt_map.h \ ..\win\Qt\qt_post.h ..\win\Qt\qt_pre.h ..\win\Qt\qt_set.h \ @@ -2686,7 +2869,7 @@ $(OTTY)qt_win.o: ..\win\Qt\qt_win.cpp $(HACK_H) $(QTn_H) \ ..\win\Qt\qt_set.h ..\win\Qt\qt_win.h $(TARGET_CXX) $(TARGET_CXXFLAGS) -Fo$@ ..\win\Qt\qt_win.cpp $(OTTY)qt_xcmd.o: ..\win\Qt\qt_xcmd.cpp $(HACK_H) $(QTn_H) \ - $(INCL)\func_tab.h ..\win\Qt\qt_bind.h ..\win\Qt\qt_kde0.h \ + $(INCL)func_tab.h ..\win\Qt\qt_bind.h ..\win\Qt\qt_kde0.h \ ..\win\Qt\qt_key.h ..\win\Qt\qt_main.h ..\win\Qt\qt_post.h \ ..\win\Qt\qt_pre.h ..\win\Qt\qt_set.h ..\win\Qt\qt_str.h \ ..\win\Qt\qt_xcmd.h qt_xcmd.moc @@ -2695,119 +2878,119 @@ $(OTTY)qt_yndlg.o: ..\win\Qt\qt_yndlg.cpp $(HACK_H) $(QTn_H) \ ..\win\Qt\qt_key.h ..\win\Qt\qt_post.h ..\win\Qt\qt_pre.h \ ..\win\Qt\qt_str.h ..\win\Qt\qt_yndlg.h qt_yndlg.moc $(TARGET_CXX) $(TARGET_CXXFLAGS) -Fo$@ ..\win\Qt\qt_yndlg.cpp -#$(OTTY)Window.o: ..\win\X11\Window.c $(CONFIG_H) $(INCL)\lint.h \ -# $(INCL)\winX.h $(INCL)\wintype.h $(INCL)\xwindow.h \ -# $(INCL)\xwindowp.h +#$(OTTY)Window.o: ..\win\X11\Window.c $(CONFIG_H) $(INCL)lint.h \ +# $(INCL)winX.h $(INCL)wintype.h $(INCL)xwindow.h \ +# $(INCL)xwindowp.h # $(TARGET_CC) $(TARGET_CFLAGS) $(X11CFLAGS) -Fo$@ ..\win\X11\Window.c -$(OTTY)dialogs.o: ..\win\X11\dialogs.c $(CONFIG_H) $(INCL)\lint.h \ - $(INCL)\winX.h $(INCL)\wintype.h +$(OTTY)dialogs.o: ..\win\X11\dialogs.c $(CONFIG_H) $(INCL)lint.h \ + $(INCL)winX.h $(INCL)wintype.h # $(TARGET_CC) $(TARGET_CFLAGS) $(X11CFLAGS) -Fo$@ ..\win\X11\dialogs.c -$(OTTY)winX.o: ..\win\X11\winX.c $(HACK_H) $(INCL)\dlb.h \ - $(INCL)\winX.h $(INCL)\xwindow.h ..\win\X11\nh32icon \ +$(OTTY)winX.o: ..\win\X11\winX.c $(HACK_H) $(INCL)dlb.h \ + $(INCL)winX.h $(INCL)xwindow.h ..\win\X11\nh32icon \ ..\win\X11\nh56icon ..\win\X11\nh72icon # $(TARGET_CC) $(TARGET_CFLAGS) $(X11CFLAGS) -Fo$@ ..\win\X11\winX.c -$(OTTY)winmap.o: ..\win\X11\winmap.c $(HACK_H) $(INCL)\dlb.h \ - $(INCL)\tile2x11.h $(INCL)\winX.h $(INCL)\xwindow.h +$(OTTY)winmap.o: ..\win\X11\winmap.c $(HACK_H) $(INCL)dlb.h \ + $(INCL)tile2x11.h $(INCL)winX.h $(INCL)xwindow.h # $(TARGET_CC) $(TARGET_CFLAGS) $(X11CFLAGS) -Fo$@ ..\win\X11\winmap.c -$(OTTY)winmenu.o: ..\win\X11\winmenu.c $(HACK_H) $(INCL)\winX.h +$(OTTY)winmenu.o: ..\win\X11\winmenu.c $(HACK_H) $(INCL)winX.h # $(TARGET_CC) $(TARGET_CFLAGS) $(X11CFLAGS) -Fo$@ ..\win\X11\winmenu.c -$(OTTY)winmesg.o: ..\win\X11\winmesg.c $(HACK_H) $(INCL)\winX.h \ - $(INCL)\xwindow.h +$(OTTY)winmesg.o: ..\win\X11\winmesg.c $(HACK_H) $(INCL)winX.h \ + $(INCL)xwindow.h # $(TARGET_CC) $(TARGET_CFLAGS) $(X11CFLAGS) -Fo$@ ..\win\X11\winmesg.c -$(OTTY)winmisc.o: ..\win\X11\winmisc.c $(HACK_H) $(INCL)\func_tab.h \ - $(INCL)\winX.h +$(OTTY)winmisc.o: ..\win\X11\winmisc.c $(HACK_H) $(INCL)func_tab.h \ + $(INCL)winX.h # $(TARGET_CC) $(TARGET_CFLAGS) $(X11CFLAGS) -Fo$@ ..\win\X11\winmisc.c -$(OTTY)winstat.o: ..\win\X11\winstat.c $(HACK_H) $(INCL)\winX.h \ - $(INCL)\xwindow.h +$(OTTY)winstat.o: ..\win\X11\winstat.c $(HACK_H) $(INCL)winX.h \ + $(INCL)xwindow.h # $(TARGET_CC) $(TARGET_CFLAGS) $(X11CFLAGS) -Fo$@ ..\win\X11\winstat.c -$(OTTY)wintext.o: ..\win\X11\wintext.c $(HACK_H) $(INCL)\winX.h \ - $(INCL)\xwindow.h +$(OTTY)wintext.o: ..\win\X11\wintext.c $(HACK_H) $(INCL)winX.h \ + $(INCL)xwindow.h # $(TARGET_CC) $(TARGET_CFLAGS) $(X11CFLAGS) -Fo$@ ..\win\X11\wintext.c -$(OTTY)winval.o: ..\win\X11\winval.c $(HACK_H) $(INCL)\winX.h +$(OTTY)winval.o: ..\win\X11\winval.c $(HACK_H) $(INCL)winX.h # $(TARGET_CC) $(TARGET_CFLAGS) $(X11CFLAGS) -Fo$@ ..\win\X11\winval.c $(OTTY)wc_chainin.o: ..\win\chain\wc_chainin.c $(HACK_H) # $(TARGET_CC) $(TARGET_CFLAGS) -Fo$@ ..\win\chain\wc_chainin.c $(OTTY)wc_chainout.o: ..\win\chain\wc_chainout.c $(HACK_H) # $(TARGET_CC) $(TARGET_CFLAGS) -Fo$@ ..\win\chain\wc_chainout.c $(OTTY)wc_trace.o: ..\win\chain\wc_trace.c $(HACK_H) \ - $(INCL)\func_tab.h $(INCL)\wintty.h + $(INCL)func_tab.h $(INCL)wintty.h # $(TARGET_CC) $(TARGET_CFLAGS) -Fo$@ ..\win\chain\wc_trace.c $(OTTY)cursdial.o: ..\win\curses\cursdial.c $(HACK_H) \ - $(INCL)\func_tab.h $(INCL)\wincurs.h \ + $(INCL)func_tab.h $(INCL)wincurs.h \ ..\win\curses\cursdial.h # $(TARGET_CC) $(TARGET_CFLAGS) -Fo$@ ..\win\curses\cursdial.c $(OTTY)cursinit.o: ..\win\curses\cursinit.c $(HACK_H) \ - $(INCL)\wincurs.h ..\win\curses\cursinit.h + $(INCL)wincurs.h ..\win\curses\cursinit.h # $(TARGET_CC) $(TARGET_CFLAGS) -Fo$@ ..\win\curses\cursinit.c $(OTTY)cursinvt.o: ..\win\curses\cursinvt.c $(HACK_H) \ - $(INCL)\wincurs.h ..\win\curses\cursinvt.h + $(INCL)wincurs.h ..\win\curses\cursinvt.h # $(TARGET_CC) $(TARGET_CFLAGS) -Fo$@ ..\win\curses\cursinvt.c -$(OTTY)cursmain.o: ..\win\curses\cursmain.c $(HACK_H) $(INCL)\wincurs.h +$(OTTY)cursmain.o: ..\win\curses\cursmain.c $(HACK_H) $(INCL)wincurs.h # $(TARGET_CC) $(TARGET_CFLAGS) -Fo$@ ..\win\curses\cursmain.c $(OTTY)cursmesg.o: ..\win\curses\cursmesg.c $(HACK_H) \ - $(INCL)\wincurs.h ..\win\curses\cursmesg.h + $(INCL)wincurs.h ..\win\curses\cursmesg.h # $(TARGET_CC) $(TARGET_CFLAGS) -Fo$@ ..\win\curses\cursmesg.c -$(OTTY)cursmisc.o: ..\win\curses\cursmisc.c $(HACK_H) $(INCL)\dlb.h \ - $(INCL)\func_tab.h $(INCL)\wincurs.h \ +$(OTTY)cursmisc.o: ..\win\curses\cursmisc.c $(HACK_H) $(INCL)dlb.h \ + $(INCL)func_tab.h $(INCL)wincurs.h \ ..\win\curses\cursmisc.h # $(TARGET_CC) $(TARGET_CFLAGS) -Fo$@ ..\win\curses\cursmisc.c $(OTTY)cursstat.o: ..\win\curses\cursstat.c $(HACK_H) \ - $(INCL)\wincurs.h ..\win\curses\cursstat.h + $(INCL)wincurs.h ..\win\curses\cursstat.h # $(TARGET_CC) $(TARGET_CFLAGS) -Fo$@ ..\win\curses\cursstat.c $(OTTY)curswins.o: ..\win\curses\curswins.c $(HACK_H) \ - $(INCL)\wincurs.h ..\win\curses\curswins.h + $(INCL)wincurs.h ..\win\curses\curswins.h # $(TARGET_CC) $(TARGET_CFLAGS) -Fo$@ ..\win\curses\curswins.c $(OTTY)winshim.o: ..\win\shim\winshim.c $(HACK_H) # $(TARGET_CC) $(TARGET_CFLAGS) -Fo$@ ..\win\shim\winshim.c -$(OTTY)getline.o: ..\win\tty\getline.c $(HACK_H) $(INCL)\func_tab.h \ - $(INCL)\wintty.h +$(OTTY)getline.o: ..\win\tty\getline.c $(HACK_H) $(INCL)func_tab.h \ + $(INCL)wintty.h # $(TARGET_CC) $(TARGET_CFLAGS) -Fo$@ ..\win\tty\getline.c -$(OTTY)termcap.o: ..\win\tty\termcap.c $(HACK_H) $(INCL)\tcap.h \ - $(INCL)\wintty.h +$(OTTY)termcap.o: ..\win\tty\termcap.c $(HACK_H) $(INCL)tcap.h \ + $(INCL)wintty.h # $(TARGET_CC) $(TARGET_CFLAGS) -Fo$@ ..\win\tty\termcap.c -$(OTTY)topl.o: ..\win\tty\topl.c $(HACK_H) $(INCL)\tcap.h \ - $(INCL)\wintty.h +$(OTTY)topl.o: ..\win\tty\topl.c $(HACK_H) $(INCL)tcap.h \ + $(INCL)wintty.h # $(TARGET_CC) $(TARGET_CFLAGS) -Fo$@ ..\win\tty\topl.c -$(OTTY)wintty.o: ..\win\tty\wintty.c $(HACK_H) $(INCL)\dlb.h \ - $(INCL)\tcap.h $(INCL)\wintty.h +$(OTTY)wintty.o: ..\win\tty\wintty.c $(HACK_H) $(INCL)dlb.h \ + $(INCL)tcap.h $(INCL)wintty.h # $(TARGET_CC) $(TARGET_CFLAGS) -Fo$@ ..\win\tty\wintty.c $(OTTY)allmain.o: allmain.c $(HACK_H) -$(OTTY)alloc.o: alloc.c $(CONFIG_H) $(INCL)\nhlua.h +$(OTTY)alloc.o: alloc.c $(CONFIG_H) $(INCL)nhlua.h $(OTTY)apply.o: apply.c $(HACK_H) -$(OTTY)artifact.o: artifact.c $(HACK_H) $(INCL)\artifact.h +$(OTTY)artifact.o: artifact.c $(HACK_H) $(INCL)artifact.h $(OTTY)attrib.o: attrib.c $(HACK_H) $(OTTY)ball.o: ball.c $(HACK_H) $(OTTY)bones.o: bones.c $(HACK_H) $(OTTY)botl.o: botl.c $(HACK_H) $(OTTY)calendar.o: calendar.c $(HACK_H) -$(OTTY)cmd.o: cmd.c $(HACK_H) $(INCL)\func_tab.h +$(OTTY)cmd.o: cmd.c $(HACK_H) $(INCL)func_tab.h $(OTTY)coloratt.o: coloratt.c $(HACK_H) $(OTTY)dbridge.o: dbridge.c $(HACK_H) $(OTTY)decl.o: decl.c $(HACK_H) -$(OTTY)detect.o: detect.c $(HACK_H) $(INCL)\artifact.h +$(OTTY)detect.o: detect.c $(HACK_H) $(INCL)artifact.h $(OTTY)dig.o: dig.c $(HACK_H) $(OTTY)display.o: display.c $(HACK_H) -$(OTTY)dlb.o: dlb.c $(CONFIG_H) $(INCL)\dlb.h +$(OTTY)dlb.o: dlb.c $(CONFIG_H) $(INCL)dlb.h $(OTTY)do.o: do.c $(HACK_H) $(OTTY)do_name.o: do_name.c $(HACK_H) $(OTTY)do_wear.o: do_wear.c $(HACK_H) $(OTTY)dog.o: dog.c $(HACK_H) -$(OTTY)dogmove.o: dogmove.c $(HACK_H) $(INCL)\mfndpos.h +$(OTTY)dogmove.o: dogmove.c $(HACK_H) $(INCL)mfndpos.h $(OTTY)dokick.o: dokick.c $(HACK_H) $(OTTY)dothrow.o: dothrow.c $(HACK_H) -$(OTTY)drawing.o: drawing.c $(CONFIG_H) $(INCL)\defsym.h \ - $(INCL)\objclass.h $(INCL)\objects.h $(INCL)\rm.h \ - $(INCL)\sym.h $(INCL)\wintype.h -$(OTTY)dungeon.o: dungeon.c $(HACK_H) $(INCL)\dgn_file.h \ - $(INCL)\dlb.h +$(OTTY)drawing.o: drawing.c $(CONFIG_H) $(INCL)defsym.h \ + $(INCL)objclass.h $(INCL)objects.h $(INCL)rm.h \ + $(INCL)sym.h $(INCL)wintype.h +$(OTTY)dungeon.o: dungeon.c $(HACK_H) $(INCL)dgn_file.h \ + $(INCL)dlb.h $(OTTY)eat.o: eat.c $(HACK_H) -$(OTTY)end.o: end.c $(HACK_H) $(INCL)\dlb.h +$(OTTY)end.o: end.c $(HACK_H) $(INCL)dlb.h $(OTTY)engrave.o: engrave.c $(HACK_H) $(OTTY)exper.o: exper.c $(HACK_H) $(OTTY)explode.o: explode.c $(HACK_H) $(OTTY)extralev.o: extralev.c $(HACK_H) -$(OTTY)files.o: files.c $(HACK_H) $(INCL)\dlb.h \ - $(INCL)\wintty.h +$(OTTY)files.o: files.c $(HACK_H) $(INCL)dlb.h \ + $(INCL)wintty.h $(OTTY)fountain.o: fountain.c $(HACK_H) $(OTTY)getpos.o: getpos.c $(HACK_H) $(OTTY)glyphs.o: glyphs.c $(HACK_H) @@ -2815,109 +2998,109 @@ $(OTTY)hack.o: hack.c $(HACK_H) $(OTTY)hacklib.o: hacklib.c $(HACK_H) $(OTTY)insight.o: insight.c $(HACK_H) $(OTTY)invent.o: invent.c $(HACK_H) -$(OTTY)isaac64.o: isaac64.c $(CONFIG_H) $(INCL)\isaac64.h +$(OTTY)isaac64.o: isaac64.c $(CONFIG_H) $(INCL)isaac64.h $(OTTY)light.o: light.c $(HACK_H) $(OTTY)lock.o: lock.c $(HACK_H) -$(OTTY)mail.o: mail.c $(HACK_H) $(INCL)\mail.h +$(OTTY)mail.o: mail.c $(HACK_H) $(INCL)mail.h $(OTTY)makemon.o: makemon.c $(HACK_H) $(OTTY)mcastu.o: mcastu.c $(HACK_H) -$(OTTY)mdlib.o: mdlib.c $(CONFIG_H) $(INCL)\align.h \ - $(INCL)\artilist.h $(INCL)\attrib.h \ - $(INCL)\context.h $(INCL)\defsym.h $(INCL)\dlb.h \ - $(INCL)\dungeon.h $(INCL)\flag.h $(INCL)\hacklib.h \ - $(INCL)\mextra.h $(INCL)\monattk.h $(INCL)\monflag.h \ - $(INCL)\monst.h $(INCL)\monsters.h $(INCL)\obj.h \ - $(INCL)\objclass.h $(INCL)\objects.h \ - $(INCL)\permonst.h $(INCL)\prop.h $(INCL)\seffects.h \ - $(INCL)\skills.h $(INCL)\sndprocs.h $(INCL)\sym.h \ - $(INCL)\wintype.h $(INCL)\you.h -$(OTTY)mhitm.o: mhitm.c $(HACK_H) $(INCL)\artifact.h -$(OTTY)mhitu.o: mhitu.c $(HACK_H) $(INCL)\artifact.h +$(OTTY)mdlib.o: mdlib.c $(CONFIG_H) $(INCL)align.h \ + $(INCL)artilist.h $(INCL)attrib.h \ + $(INCL)context.h $(INCL)defsym.h $(INCL)dlb.h \ + $(INCL)dungeon.h $(INCL)flag.h $(INCL)hacklib.h \ + $(INCL)mextra.h $(INCL)monattk.h $(INCL)monflag.h \ + $(INCL)monst.h $(INCL)monsters.h $(INCL)obj.h \ + $(INCL)objclass.h $(INCL)objects.h \ + $(INCL)permonst.h $(INCL)prop.h $(INCL)seffects.h \ + $(INCL)skills.h $(INCL)sndprocs.h $(INCL)sym.h \ + $(INCL)wintype.h $(INCL)you.h +$(OTTY)mhitm.o: mhitm.c $(HACK_H) $(INCL)artifact.h +$(OTTY)mhitu.o: mhitu.c $(HACK_H) $(INCL)artifact.h $(OTTY)minion.o: minion.c $(HACK_H) $(OTTY)mklev.o: mklev.c $(HACK_H) -$(OTTY)mkmap.o: mkmap.c $(HACK_H) $(INCL)\sp_lev.h -$(OTTY)mkmaze.o: mkmaze.c $(HACK_H) $(INCL)\sp_lev.h +$(OTTY)mkmap.o: mkmap.c $(HACK_H) $(INCL)sp_lev.h +$(OTTY)mkmaze.o: mkmaze.c $(HACK_H) $(INCL)sp_lev.h $(OTTY)mkobj.o: mkobj.c $(HACK_H) $(OTTY)mkroom.o: mkroom.c $(HACK_H) -$(OTTY)mon.o: mon.c $(HACK_H) $(INCL)\mfndpos.h +$(OTTY)mon.o: mon.c $(HACK_H) $(INCL)mfndpos.h $(OTTY)mondata.o: mondata.c $(HACK_H) -$(OTTY)monmove.o: monmove.c $(HACK_H) $(INCL)\artifact.h \ - $(INCL)\mfndpos.h -$(OTTY)monst.o: monst.c $(CONFIG_H) $(INCL)\align.h \ - $(INCL)\defsym.h $(INCL)\monattk.h $(INCL)\monflag.h \ - $(INCL)\monsters.h $(INCL)\permonst.h $(INCL)\sym.h \ - $(INCL)\wintype.h +$(OTTY)monmove.o: monmove.c $(HACK_H) $(INCL)artifact.h \ + $(INCL)mfndpos.h +$(OTTY)monst.o: monst.c $(CONFIG_H) $(INCL)align.h \ + $(INCL)defsym.h $(INCL)monattk.h $(INCL)monflag.h \ + $(INCL)monsters.h $(INCL)permonst.h $(INCL)sym.h \ + $(INCL)wintype.h $(OTTY)mplayer.o: mplayer.c $(HACK_H) $(OTTY)mthrowu.o: mthrowu.c $(HACK_H) $(OTTY)muse.o: muse.c $(HACK_H) $(OTTY)music.o: music.c $(HACK_H) -$(OTTY)nhlobj.o: nhlobj.c $(HACK_H) $(INCL)\sp_lev.h -$(OTTY)nhlsel.o: nhlsel.c $(HACK_H) $(INCL)\sp_lev.h -$(OTTY)nhlua.o: nhlua.c $(HACK_H) $(INCL)\dlb.h +$(OTTY)nhlobj.o: nhlobj.c $(HACK_H) $(INCL)sp_lev.h +$(OTTY)nhlsel.o: nhlsel.c $(HACK_H) $(INCL)sp_lev.h +$(OTTY)nhlua.o: nhlua.c $(HACK_H) $(INCL)dlb.h $(Q)$(CC) $(CFLAGS) $(TTYDEF) -wd4324 $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ $(@B).c -$(OTTY)nhmd4.o: nhmd4.c $(HACK_H) $(INCL)\nhmd4.h +$(OTTY)nhmd4.o: nhmd4.c $(HACK_H) $(INCL)nhmd4.h $(OTTY)o_init.o: o_init.c $(HACK_H) -$(OTTY)objects.o: objects.c $(CONFIG_H) $(INCL)\defsym.h \ - $(INCL)\obj.h $(INCL)\objclass.h $(INCL)\objects.h \ - $(INCL)\prop.h $(INCL)\skills.h +$(OTTY)objects.o: objects.c $(CONFIG_H) $(INCL)defsym.h \ + $(INCL)obj.h $(INCL)objclass.h $(INCL)objects.h \ + $(INCL)prop.h $(INCL)skills.h $(OTTY)objnam.o: objnam.c $(HACK_H) -$(OTTY)options.o: options.c $(CONFIG_H) $(HACK_H) $(INCL)\defsym.h \ - $(INCL)\flag.h $(INCL)\objclass.h $(INCL)\objects.h \ - $(INCL)\optlist.h $(INCL)\tcap.h -$(OTTY)pager.o: pager.c $(HACK_H) $(INCL)\dlb.h +$(OTTY)options.o: options.c $(CONFIG_H) $(HACK_H) $(INCL)defsym.h \ + $(INCL)flag.h $(INCL)objclass.h $(INCL)objects.h \ + $(INCL)optlist.h $(INCL)tcap.h +$(OTTY)pager.o: pager.c $(HACK_H) $(INCL)dlb.h $(OTTY)pickup.o: pickup.c $(HACK_H) $(OTTY)pline.o: pline.c $(HACK_H) $(OTTY)polyself.o: polyself.c $(HACK_H) $(OTTY)potion.o: potion.c $(HACK_H) $(OTTY)pray.o: pray.c $(HACK_H) -$(OTTY)priest.o: priest.c $(HACK_H) $(INCL)\mfndpos.h +$(OTTY)priest.o: priest.c $(HACK_H) $(INCL)mfndpos.h $(OTTY)quest.o: quest.c $(HACK_H) -$(OTTY)questpgr.o: questpgr.c $(HACK_H) $(INCL)\dlb.h \ - $(INCL)\wintty.h +$(OTTY)questpgr.o: questpgr.c $(HACK_H) $(INCL)dlb.h \ + $(INCL)wintty.h $(OTTY)read.o: read.c $(HACK_H) $(OTTY)rect.o: rect.c $(HACK_H) $(OTTY)region.o: region.c $(HACK_H) -$(OTTY)report.o: report.c $(HACK_H) $(INCL)\dlb.h $(INCL)\nhmd4.h -$(OTTY)restore.o: restore.c $(HACK_H) $(INCL)\tcap.h +$(OTTY)report.o: report.c $(HACK_H) $(INCL)dlb.h $(INCL)nhmd4.h +$(OTTY)restore.o: restore.c $(HACK_H) $(INCL)tcap.h $(OTTY)rip.o: rip.c $(HACK_H) -$(OTTY)rnd.o: rnd.c $(HACK_H) $(INCL)\isaac64.h +$(OTTY)rnd.o: rnd.c $(HACK_H) $(INCL)isaac64.h $(OTTY)role.o: role.c $(HACK_H) -$(OTTY)rumors.o: rumors.c $(HACK_H) $(INCL)\dlb.h +$(OTTY)rumors.o: rumors.c $(HACK_H) $(INCL)dlb.h $(OTTY)save.o: save.c $(HACK_H) -$(OTTY)selvar.o: selvar.c $(HACK_H) $(INCL)\sp_lev.h +$(OTTY)selvar.o: selvar.c $(HACK_H) $(INCL)sp_lev.h $(OTTY)sfstruct.o: sfstruct.c $(HACK_H) $(OTTY)shk.o: shk.c $(HACK_H) $(OTTY)shknam.o: shknam.c $(HACK_H) -$(OTTY)sit.o: sit.c $(HACK_H) $(INCL)\artifact.h +$(OTTY)sit.o: sit.c $(HACK_H) $(INCL)artifact.h $(Q)$(CC) $(CFLAGS) /EP $(@B).c > $(OTTY)$(@B).c.preproc $(Q)$(CC) $(CFLAGS) -Fo$@ $(@B).c $(OTTY)sounds.o: sounds.c $(HACK_H) -$(OTTY)sp_lev.o: sp_lev.c $(HACK_H) $(INCL)\sp_lev.h +$(OTTY)sp_lev.o: sp_lev.c $(HACK_H) $(INCL)sp_lev.h $(OTTY)spell.o: spell.c $(HACK_H) $(OTTY)stairs.o: stairs.c $(HACK_H) $(OTTY)steal.o: steal.c $(HACK_H) $(OTTY)steed.o: steed.c $(HACK_H) $(OTTY)strutil.o: strutil.c $(HACK_H) -$(OTTY)symbols.o: symbols.c $(HACK_H) $(INCL)\tcap.h +$(OTTY)symbols.o: symbols.c $(HACK_H) $(INCL)tcap.h $(OTTY)sys.o: sys.c $(HACK_H) $(OTTY)teleport.o: teleport.c $(HACK_H) #$(OTTY)tile.o: tile.c $(HACK_H) $(OTTY)timeout.o: timeout.c $(HACK_H) -$(OTTY)topten.o: topten.c $(HACK_H) $(INCL)\dlb.h +$(OTTY)topten.o: topten.c $(HACK_H) $(INCL)dlb.h $(OTTY)track.o: track.c $(HACK_H) $(OTTY)trap.o: trap.c $(HACK_H) $(OTTY)u_init.o: u_init.c $(HACK_H) $(OTTY)uhitm.o: uhitm.c $(HACK_H) $(OTTY)utf8map.o: utf8map.c $(HACK_H) $(OTTY)vault.o: vault.c $(HACK_H) -$(OTTY)version.o: version.c $(HACK_H) $(INCL)\dlb.h +$(OTTY)version.o: version.c $(HACK_H) $(INCL)dlb.h $(OTTY)vision.o: vision.c $(HACK_H) $(OTTY)weapon.o: weapon.c $(HACK_H) $(OTTY)were.o: were.c $(HACK_H) $(OTTY)wield.o: wield.c $(HACK_H) -$(OTTY)windows.o: windows.c $(HACK_H) $(INCL)\dlb.h $(INCL)\wintty.h +$(OTTY)windows.o: windows.c $(HACK_H) $(INCL)dlb.h $(INCL)wintty.h $(OTTY)wizard.o: wizard.c $(HACK_H) -$(OTTY)wizcmds.o: wizcmds.c $(HACK_H) $(INCL)\func_tab.h +$(OTTY)wizcmds.o: wizcmds.c $(HACK_H) $(INCL)func_tab.h $(OTTY)worm.o: worm.c $(HACK_H) $(OTTY)worn.o: worn.c $(HACK_H) $(OTTY)write.o: write.c $(HACK_H) @@ -2925,15 +3108,15 @@ $(OTTY)zap.o: zap.c $(HACK_H) # #$(OGUI)cppregex.o: ..\sys\share\cppregex.cpp $(CONFIG_H) # $(TARGET_CXX) $(TARGET_CXXFLAGS) -Fo$@ ..\sys\share\cppregex.cpp -$(OGUI)ioctl.o: ..\sys\share\ioctl.c $(HACK_H) $(INCL)\tcap.h +$(OGUI)ioctl.o: ..\sys\share\ioctl.c $(HACK_H) $(INCL)tcap.h # $(TARGET_CC) $(TARGET_CFLAGS) -Fo$@ ..\sys\share\ioctl.c -$(OGUI)pcmain.o: ..\sys\share\pcmain.c $(HACK_H) $(INCL)\dlb.h +$(OGUI)pcmain.o: ..\sys\share\pcmain.c $(HACK_H) $(INCL)dlb.h # $(TARGET_CC) $(TARGET_CFLAGS) -Fo$@ ..\sys\share\pcmain.c -$(OGUI)pcsys.o: ..\sys\share\pcsys.c $(HACK_H) $(INCL)\wintty.h +$(OGUI)pcsys.o: ..\sys\share\pcsys.c $(HACK_H) $(INCL)wintty.h # $(TARGET_CC) $(TARGET_CFLAGS) -Fo$@ ..\sys\share\pcsys.c -$(OGUI)pctty.o: ..\sys\share\pctty.c $(HACK_H) $(INCL)\wintty.h +$(OGUI)pctty.o: ..\sys\share\pctty.c $(HACK_H) $(INCL)wintty.h # $(TARGET_CC) $(TARGET_CFLAGS) -Fo$@ ..\sys\share\pctty.c -$(OGUI)pcunix.o: ..\sys\share\pcunix.c $(HACK_H) $(INCL)\wintty.h +$(OGUI)pcunix.o: ..\sys\share\pcunix.c $(HACK_H) $(INCL)wintty.h # $(TARGET_CC) $(TARGET_CFLAGS) -Fo$@ ..\sys\share\pcunix.c $(OGUI)pmatchregex.o: ..\sys\share\pmatchregex.c $(HACK_H) # $(TARGET_CC) $(TARGET_CFLAGS) -Fo$@ ..\sys\share\pmatchregex.c @@ -2943,14 +3126,14 @@ $(OGUI)random.o: ..\sys\share\random.c $(HACK_H) # $(TARGET_CC) $(TARGET_CFLAGS) -Fo$@ ..\sys\share\random.c $(OGUI)unixtty.o: ..\sys\share\unixtty.c $(HACK_H) # $(TARGET_CC) $(TARGET_CFLAGS) -Fo$@ ..\sys\share\unixtty.c -$(OGUI)unixmain.o: ..\sys\unix\unixmain.c $(HACK_H) $(INCL)\dlb.h +$(OGUI)unixmain.o: ..\sys\unix\unixmain.c $(HACK_H) $(INCL)dlb.h # $(TARGET_CC) $(TARGET_CFLAGS) -Fo$@ ..\sys\unix\unixmain.c $(OGUI)unixres.o: ..\sys\unix\unixres.c $(CONFIG_H) # $(TARGET_CC) $(TARGET_CFLAGS) -Fo$@ ..\sys\unix\unixres.c $(OGUI)unixunix.o: ..\sys\unix\unixunix.c $(HACK_H) # $(TARGET_CC) $(TARGET_CFLAGS) -Fo$@ ..\sys\unix\unixunix.c $(OGUI)qt_bind.o: ..\win\Qt\qt_bind.cpp $(HACK_H) $(QTn_H) \ - $(INCL)\dlb.h ..\win\Qt\qt_bind.h ..\win\Qt\qt_click.h \ + $(INCL)dlb.h ..\win\Qt\qt_bind.h ..\win\Qt\qt_click.h \ ..\win\Qt\qt_clust.h ..\win\Qt\qt_delay.h ..\win\Qt\qt_icon.h \ ..\win\Qt\qt_kde0.h ..\win\Qt\qt_key.h ..\win\Qt\qt_line.h \ ..\win\Qt\qt_main.h ..\win\Qt\qt_map.h ..\win\Qt\qt_menu.h \ @@ -2969,7 +3152,7 @@ $(OGUI)qt_delay.o: ..\win\Qt\qt_delay.cpp $(HACK_H) $(QTn_H) \ ..\win\Qt\qt_delay.h ..\win\Qt\qt_post.h ..\win\Qt\qt_pre.h $(TARGET_CXX) $(TARGET_CXXFLAGS) -Fo$@ ..\win\Qt\qt_delay.cpp $(OGUI)qt_glyph.o: ..\win\Qt\qt_glyph.cpp $(HACK_H) $(QTn_H) \ - $(INCL)\tile2x11.h ..\win\Qt\qt_bind.h \ + $(INCL)tile2x11.h ..\win\Qt\qt_bind.h \ ..\win\Qt\qt_clust.h ..\win\Qt\qt_glyph.h ..\win\Qt\qt_inv.h \ ..\win\Qt\qt_kde0.h ..\win\Qt\qt_main.h ..\win\Qt\qt_map.h \ ..\win\Qt\qt_post.h ..\win\Qt\qt_pre.h ..\win\Qt\qt_set.h \ @@ -3062,7 +3245,7 @@ $(OGUI)qt_win.o: ..\win\Qt\qt_win.cpp $(HACK_H) $(QTn_H) \ ..\win\Qt\qt_set.h ..\win\Qt\qt_win.h $(TARGET_CXX) $(TARGET_CXXFLAGS) -Fo$@ ..\win\Qt\qt_win.cpp $(OGUI)qt_xcmd.o: ..\win\Qt\qt_xcmd.cpp $(HACK_H) $(QTn_H) \ - $(INCL)\func_tab.h ..\win\Qt\qt_bind.h ..\win\Qt\qt_kde0.h \ + $(INCL)func_tab.h ..\win\Qt\qt_bind.h ..\win\Qt\qt_kde0.h \ ..\win\Qt\qt_key.h ..\win\Qt\qt_main.h ..\win\Qt\qt_post.h \ ..\win\Qt\qt_pre.h ..\win\Qt\qt_set.h ..\win\Qt\qt_str.h \ ..\win\Qt\qt_xcmd.h qt_xcmd.moc @@ -3071,119 +3254,119 @@ $(OGUI)qt_yndlg.o: ..\win\Qt\qt_yndlg.cpp $(HACK_H) $(QTn_H) \ ..\win\Qt\qt_key.h ..\win\Qt\qt_post.h ..\win\Qt\qt_pre.h \ ..\win\Qt\qt_str.h ..\win\Qt\qt_yndlg.h qt_yndlg.moc $(TARGET_CXX) $(TARGET_CXXFLAGS) -Fo$@ ..\win\Qt\qt_yndlg.cpp -#$(OGUI)Window.o: ..\win\X11\Window.c $(CONFIG_H) $(INCL)\lint.h \ -# $(INCL)\winX.h $(INCL)\wintype.h $(INCL)\xwindow.h \ -# $(INCL)\xwindowp.h +#$(OGUI)Window.o: ..\win\X11\Window.c $(CONFIG_H) $(INCL)lint.h \ +# $(INCL)winX.h $(INCL)wintype.h $(INCL)xwindow.h \ +# $(INCL)xwindowp.h # $(TARGET_CC) $(TARGET_CFLAGS) $(X11CFLAGS) -Fo$@ ..\win\X11\Window.c -$(OGUI)dialogs.o: ..\win\X11\dialogs.c $(CONFIG_H) $(INCL)\lint.h \ - $(INCL)\winX.h $(INCL)\wintype.h +$(OGUI)dialogs.o: ..\win\X11\dialogs.c $(CONFIG_H) $(INCL)lint.h \ + $(INCL)winX.h $(INCL)wintype.h # $(TARGET_CC) $(TARGET_CFLAGS) $(X11CFLAGS) -Fo$@ ..\win\X11\dialogs.c -$(OGUI)winX.o: ..\win\X11\winX.c $(HACK_H) $(INCL)\dlb.h \ - $(INCL)\winX.h $(INCL)\xwindow.h ..\win\X11\nh32icon \ +$(OGUI)winX.o: ..\win\X11\winX.c $(HACK_H) $(INCL)dlb.h \ + $(INCL)winX.h $(INCL)xwindow.h ..\win\X11\nh32icon \ ..\win\X11\nh56icon ..\win\X11\nh72icon # $(TARGET_CC) $(TARGET_CFLAGS) $(X11CFLAGS) -Fo$@ ..\win\X11\winX.c -$(OGUI)winmap.o: ..\win\X11\winmap.c $(HACK_H) $(INCL)\dlb.h \ - $(INCL)\tile2x11.h $(INCL)\winX.h $(INCL)\xwindow.h +$(OGUI)winmap.o: ..\win\X11\winmap.c $(HACK_H) $(INCL)dlb.h \ + $(INCL)tile2x11.h $(INCL)winX.h $(INCL)xwindow.h # $(TARGET_CC) $(TARGET_CFLAGS) $(X11CFLAGS) -Fo$@ ..\win\X11\winmap.c -$(OGUI)winmenu.o: ..\win\X11\winmenu.c $(HACK_H) $(INCL)\winX.h +$(OGUI)winmenu.o: ..\win\X11\winmenu.c $(HACK_H) $(INCL)winX.h # $(TARGET_CC) $(TARGET_CFLAGS) $(X11CFLAGS) -Fo$@ ..\win\X11\winmenu.c -$(OGUI)winmesg.o: ..\win\X11\winmesg.c $(HACK_H) $(INCL)\winX.h \ - $(INCL)\xwindow.h +$(OGUI)winmesg.o: ..\win\X11\winmesg.c $(HACK_H) $(INCL)winX.h \ + $(INCL)xwindow.h # $(TARGET_CC) $(TARGET_CFLAGS) $(X11CFLAGS) -Fo$@ ..\win\X11\winmesg.c -$(OGUI)winmisc.o: ..\win\X11\winmisc.c $(HACK_H) $(INCL)\func_tab.h \ - $(INCL)\winX.h +$(OGUI)winmisc.o: ..\win\X11\winmisc.c $(HACK_H) $(INCL)func_tab.h \ + $(INCL)winX.h # $(TARGET_CC) $(TARGET_CFLAGS) $(X11CFLAGS) -Fo$@ ..\win\X11\winmisc.c -$(OGUI)winstat.o: ..\win\X11\winstat.c $(HACK_H) $(INCL)\winX.h \ - $(INCL)\xwindow.h +$(OGUI)winstat.o: ..\win\X11\winstat.c $(HACK_H) $(INCL)winX.h \ + $(INCL)xwindow.h # $(TARGET_CC) $(TARGET_CFLAGS) $(X11CFLAGS) -Fo$@ ..\win\X11\winstat.c -$(OGUI)wintext.o: ..\win\X11\wintext.c $(HACK_H) $(INCL)\winX.h \ - $(INCL)\xwindow.h +$(OGUI)wintext.o: ..\win\X11\wintext.c $(HACK_H) $(INCL)winX.h \ + $(INCL)xwindow.h # $(TARGET_CC) $(TARGET_CFLAGS) $(X11CFLAGS) -Fo$@ ..\win\X11\wintext.c -$(OGUI)winval.o: ..\win\X11\winval.c $(HACK_H) $(INCL)\winX.h +$(OGUI)winval.o: ..\win\X11\winval.c $(HACK_H) $(INCL)winX.h # $(TARGET_CC) $(TARGET_CFLAGS) $(X11CFLAGS) -Fo$@ ..\win\X11\winval.c $(OGUI)wc_chainin.o: ..\win\chain\wc_chainin.c $(HACK_H) # $(TARGET_CC) $(TARGET_CFLAGS) -Fo$@ ..\win\chain\wc_chainin.c $(OGUI)wc_chainout.o: ..\win\chain\wc_chainout.c $(HACK_H) # $(TARGET_CC) $(TARGET_CFLAGS) -Fo$@ ..\win\chain\wc_chainout.c $(OGUI)wc_trace.o: ..\win\chain\wc_trace.c $(HACK_H) \ - $(INCL)\func_tab.h $(INCL)\wintty.h + $(INCL)func_tab.h $(INCL)wintty.h # $(TARGET_CC) $(TARGET_CFLAGS) -Fo$@ ..\win\chain\wc_trace.c $(OGUI)cursdial.o: ..\win\curses\cursdial.c $(HACK_H) \ - $(INCL)\func_tab.h $(INCL)\wincurs.h \ + $(INCL)func_tab.h $(INCL)wincurs.h \ ..\win\curses\cursdial.h # $(TARGET_CC) $(TARGET_CFLAGS) -Fo$@ ..\win\curses\cursdial.c $(OGUI)cursinit.o: ..\win\curses\cursinit.c $(HACK_H) \ - $(INCL)\wincurs.h ..\win\curses\cursinit.h + $(INCL)wincurs.h ..\win\curses\cursinit.h # $(TARGET_CC) $(TARGET_CFLAGS) -Fo$@ ..\win\curses\cursinit.c $(OGUI)cursinvt.o: ..\win\curses\cursinvt.c $(HACK_H) \ - $(INCL)\wincurs.h ..\win\curses\cursinvt.h + $(INCL)wincurs.h ..\win\curses\cursinvt.h # $(TARGET_CC) $(TARGET_CFLAGS) -Fo$@ ..\win\curses\cursinvt.c -$(OGUI)cursmain.o: ..\win\curses\cursmain.c $(HACK_H) $(INCL)\wincurs.h +$(OGUI)cursmain.o: ..\win\curses\cursmain.c $(HACK_H) $(INCL)wincurs.h # $(TARGET_CC) $(TARGET_CFLAGS) -Fo$@ ..\win\curses\cursmain.c $(OGUI)cursmesg.o: ..\win\curses\cursmesg.c $(HACK_H) \ - $(INCL)\wincurs.h ..\win\curses\cursmesg.h + $(INCL)wincurs.h ..\win\curses\cursmesg.h # $(TARGET_CC) $(TARGET_CFLAGS) -Fo$@ ..\win\curses\cursmesg.c -$(OGUI)cursmisc.o: ..\win\curses\cursmisc.c $(HACK_H) $(INCL)\dlb.h \ - $(INCL)\func_tab.h $(INCL)\wincurs.h \ +$(OGUI)cursmisc.o: ..\win\curses\cursmisc.c $(HACK_H) $(INCL)dlb.h \ + $(INCL)func_tab.h $(INCL)wincurs.h \ ..\win\curses\cursmisc.h # $(TARGET_CC) $(TARGET_CFLAGS) -Fo$@ ..\win\curses\cursmisc.c $(OGUI)cursstat.o: ..\win\curses\cursstat.c $(HACK_H) \ - $(INCL)\wincurs.h ..\win\curses\cursstat.h + $(INCL)wincurs.h ..\win\curses\cursstat.h # $(TARGET_CC) $(TARGET_CFLAGS) -Fo$@ ..\win\curses\cursstat.c $(OGUI)curswins.o: ..\win\curses\curswins.c $(HACK_H) \ - $(INCL)\wincurs.h ..\win\curses\curswins.h + $(INCL)wincurs.h ..\win\curses\curswins.h # $(TARGET_CC) $(TARGET_CFLAGS) -Fo$@ ..\win\curses\curswins.c $(OGUI)winshim.o: ..\win\shim\winshim.c $(HACK_H) # $(TARGET_CC) $(TARGET_CFLAGS) -Fo$@ ..\win\shim\winshim.c -$(OGUI)getline.o: ..\win\tty\getline.c $(HACK_H) $(INCL)\func_tab.h \ - $(INCL)\wintty.h +$(OGUI)getline.o: ..\win\tty\getline.c $(HACK_H) $(INCL)func_tab.h \ + $(INCL)wintty.h # $(TARGET_CC) $(TARGET_CFLAGS) -Fo$@ ..\win\tty\getline.c -$(OGUI)termcap.o: ..\win\tty\termcap.c $(HACK_H) $(INCL)\tcap.h \ - $(INCL)\wintty.h +$(OGUI)termcap.o: ..\win\tty\termcap.c $(HACK_H) $(INCL)tcap.h \ + $(INCL)wintty.h # $(TARGET_CC) $(TARGET_CFLAGS) -Fo$@ ..\win\tty\termcap.c -$(OGUI)topl.o: ..\win\tty\topl.c $(HACK_H) $(INCL)\tcap.h \ - $(INCL)\wintty.h +$(OGUI)topl.o: ..\win\tty\topl.c $(HACK_H) $(INCL)tcap.h \ + $(INCL)wintty.h # $(TARGET_CC) $(TARGET_CFLAGS) -Fo$@ ..\win\tty\topl.c -$(OGUI)wintty.o: ..\win\tty\wintty.c $(HACK_H) $(INCL)\dlb.h \ - $(INCL)\tcap.h $(INCL)\wintty.h +$(OGUI)wintty.o: ..\win\tty\wintty.c $(HACK_H) $(INCL)dlb.h \ + $(INCL)tcap.h $(INCL)wintty.h # $(TARGET_CC) $(TARGET_CFLAGS) -Fo$@ ..\win\tty\wintty.c $(OGUI)allmain.o: allmain.c $(HACK_H) -$(OGUI)alloc.o: alloc.c $(CONFIG_H) $(INCL)\nhlua.h +$(OGUI)alloc.o: alloc.c $(CONFIG_H) $(INCL)nhlua.h $(OGUI)apply.o: apply.c $(HACK_H) -$(OGUI)artifact.o: artifact.c $(HACK_H) $(INCL)\artifact.h +$(OGUI)artifact.o: artifact.c $(HACK_H) $(INCL)artifact.h $(OGUI)attrib.o: attrib.c $(HACK_H) $(OGUI)ball.o: ball.c $(HACK_H) $(OGUI)bones.o: bones.c $(HACK_H) $(OGUI)botl.o: botl.c $(HACK_H) $(OGUI)calendar.o: calendar.c $(HACK_H) -$(OGUI)cmd.o: cmd.c $(HACK_H) $(INCL)\func_tab.h +$(OGUI)cmd.o: cmd.c $(HACK_H) $(INCL)func_tab.h $(OGUI)coloratt.o: coloratt.c $(HACK_H) $(OGUI)dbridge.o: dbridge.c $(HACK_H) $(OGUI)decl.o: decl.c $(HACK_H) -$(OGUI)detect.o: detect.c $(HACK_H) $(INCL)\artifact.h +$(OGUI)detect.o: detect.c $(HACK_H) $(INCL)artifact.h $(OGUI)dig.o: dig.c $(HACK_H) $(OGUI)display.o: display.c $(HACK_H) -$(OGUI)dlb.o: dlb.c $(CONFIG_H) $(INCL)\dlb.h +$(OGUI)dlb.o: dlb.c $(CONFIG_H) $(INCL)dlb.h $(OGUI)do.o: do.c $(HACK_H) $(OGUI)do_name.o: do_name.c $(HACK_H) $(OGUI)do_wear.o: do_wear.c $(HACK_H) $(OGUI)dog.o: dog.c $(HACK_H) -$(OGUI)dogmove.o: dogmove.c $(HACK_H) $(INCL)\mfndpos.h +$(OGUI)dogmove.o: dogmove.c $(HACK_H) $(INCL)mfndpos.h $(OGUI)dokick.o: dokick.c $(HACK_H) $(OGUI)dothrow.o: dothrow.c $(HACK_H) -$(OGUI)drawing.o: drawing.c $(CONFIG_H) $(INCL)\defsym.h \ - $(INCL)\objclass.h $(INCL)\objects.h $(INCL)\rm.h \ - $(INCL)\sym.h $(INCL)\wintype.h -$(OGUI)dungeon.o: dungeon.c $(HACK_H) $(INCL)\dgn_file.h \ - $(INCL)\dlb.h +$(OGUI)drawing.o: drawing.c $(CONFIG_H) $(INCL)defsym.h \ + $(INCL)objclass.h $(INCL)objects.h $(INCL)rm.h \ + $(INCL)sym.h $(INCL)wintype.h +$(OGUI)dungeon.o: dungeon.c $(HACK_H) $(INCL)dgn_file.h \ + $(INCL)dlb.h $(OGUI)eat.o: eat.c $(HACK_H) -$(OGUI)end.o: end.c $(HACK_H) $(INCL)\dlb.h +$(OGUI)end.o: end.c $(HACK_H) $(INCL)dlb.h $(OGUI)engrave.o: engrave.c $(HACK_H) $(OGUI)exper.o: exper.c $(HACK_H) $(OGUI)explode.o: explode.c $(HACK_H) $(OGUI)extralev.o: extralev.c $(HACK_H) -$(OGUI)files.o: files.c $(HACK_H) $(INCL)\dlb.h \ - $(INCL)\wintty.h +$(OGUI)files.o: files.c $(HACK_H) $(INCL)dlb.h \ + $(INCL)wintty.h $(OGUI)fountain.o: fountain.c $(HACK_H) $(OGUI)getpos.o: getpos.c $(HACK_H) $(OGUI)glyphs.o: glyphs.c $(HACK_H) @@ -3191,106 +3374,106 @@ $(OGUI)hack.o: hack.c $(HACK_H) $(OGUI)hacklib.o: hacklib.c $(HACK_H) $(OGUI)insight.o: insight.c $(HACK_H) $(OGUI)invent.o: invent.c $(HACK_H) -$(OGUI)isaac64.o: isaac64.c $(CONFIG_H) $(INCL)\isaac64.h +$(OGUI)isaac64.o: isaac64.c $(CONFIG_H) $(INCL)isaac64.h $(OGUI)light.o: light.c $(HACK_H) $(OGUI)lock.o: lock.c $(HACK_H) -$(OGUI)mail.o: mail.c $(HACK_H) $(INCL)\mail.h +$(OGUI)mail.o: mail.c $(HACK_H) $(INCL)mail.h $(OGUI)makemon.o: makemon.c $(HACK_H) $(OGUI)mcastu.o: mcastu.c $(HACK_H) -$(OGUI)mdlib.o: mdlib.c $(CONFIG_H) $(INCL)\align.h \ - $(INCL)\artilist.h $(INCL)\attrib.h \ - $(INCL)\context.h $(INCL)\defsym.h $(INCL)\dlb.h \ - $(INCL)\dungeon.h $(INCL)\flag.h $(INCL)\hacklib.h \ - $(INCL)\mextra.h $(INCL)\monattk.h $(INCL)\monflag.h \ - $(INCL)\monst.h $(INCL)\monsters.h $(INCL)\obj.h \ - $(INCL)\objclass.h $(INCL)\objects.h \ - $(INCL)\permonst.h $(INCL)\prop.h $(INCL)\seffects.h \ - $(INCL)\skills.h $(INCL)\sndprocs.h $(INCL)\sym.h \ - $(INCL)\wintype.h $(INCL)\you.h -$(OGUI)mhitm.o: mhitm.c $(HACK_H) $(INCL)\artifact.h -$(OGUI)mhitu.o: mhitu.c $(HACK_H) $(INCL)\artifact.h +$(OGUI)mdlib.o: mdlib.c $(CONFIG_H) $(INCL)align.h \ + $(INCL)artilist.h $(INCL)attrib.h \ + $(INCL)context.h $(INCL)defsym.h $(INCL)dlb.h \ + $(INCL)dungeon.h $(INCL)flag.h $(INCL)hacklib.h \ + $(INCL)mextra.h $(INCL)monattk.h $(INCL)monflag.h \ + $(INCL)monst.h $(INCL)monsters.h $(INCL)obj.h \ + $(INCL)objclass.h $(INCL)objects.h \ + $(INCL)permonst.h $(INCL)prop.h $(INCL)seffects.h \ + $(INCL)skills.h $(INCL)sndprocs.h $(INCL)sym.h \ + $(INCL)wintype.h $(INCL)you.h +$(OGUI)mhitm.o: mhitm.c $(HACK_H) $(INCL)artifact.h +$(OGUI)mhitu.o: mhitu.c $(HACK_H) $(INCL)artifact.h $(OGUI)minion.o: minion.c $(HACK_H) $(OGUI)mklev.o: mklev.c $(HACK_H) -$(OGUI)mkmap.o: mkmap.c $(HACK_H) $(INCL)\sp_lev.h -$(OGUI)mkmaze.o: mkmaze.c $(HACK_H) $(INCL)\sp_lev.h +$(OGUI)mkmap.o: mkmap.c $(HACK_H) $(INCL)sp_lev.h +$(OGUI)mkmaze.o: mkmaze.c $(HACK_H) $(INCL)sp_lev.h $(OGUI)mkobj.o: mkobj.c $(HACK_H) $(OGUI)mkroom.o: mkroom.c $(HACK_H) -$(OGUI)mon.o: mon.c $(HACK_H) $(INCL)\mfndpos.h +$(OGUI)mon.o: mon.c $(HACK_H) $(INCL)mfndpos.h $(OGUI)mondata.o: mondata.c $(HACK_H) -$(OGUI)monmove.o: monmove.c $(HACK_H) $(INCL)\artifact.h \ - $(INCL)\mfndpos.h -$(OGUI)monst.o: monst.c $(CONFIG_H) $(INCL)\align.h \ - $(INCL)\defsym.h $(INCL)\monattk.h $(INCL)\monflag.h \ - $(INCL)\monsters.h $(INCL)\permonst.h $(INCL)\sym.h \ - $(INCL)\wintype.h +$(OGUI)monmove.o: monmove.c $(HACK_H) $(INCL)artifact.h \ + $(INCL)mfndpos.h +$(OGUI)monst.o: monst.c $(CONFIG_H) $(INCL)align.h \ + $(INCL)defsym.h $(INCL)monattk.h $(INCL)monflag.h \ + $(INCL)monsters.h $(INCL)permonst.h $(INCL)sym.h \ + $(INCL)wintype.h $(OGUI)mplayer.o: mplayer.c $(HACK_H) $(OGUI)mthrowu.o: mthrowu.c $(HACK_H) $(OGUI)muse.o: muse.c $(HACK_H) $(OGUI)music.o: music.c $(HACK_H) -$(OGUI)nhlobj.o: nhlobj.c $(HACK_H) $(INCL)\sp_lev.h -$(OGUI)nhlsel.o: nhlsel.c $(HACK_H) $(INCL)\sp_lev.h -$(OGUI)nhlua.o: nhlua.c $(HACK_H) $(INCL)\dlb.h -$(OGUI)nhmd4.o: nhmd4.c $(HACK_H) $(INCL)\nhmd4.h +$(OGUI)nhlobj.o: nhlobj.c $(HACK_H) $(INCL)sp_lev.h +$(OGUI)nhlsel.o: nhlsel.c $(HACK_H) $(INCL)sp_lev.h +$(OGUI)nhlua.o: nhlua.c $(HACK_H) $(INCL)dlb.h +$(OGUI)nhmd4.o: nhmd4.c $(HACK_H) $(INCL)nhmd4.h $(OGUI)o_init.o: o_init.c $(HACK_H) -$(OGUI)objects.o: objects.c $(CONFIG_H) $(INCL)\defsym.h \ - $(INCL)\obj.h $(INCL)\objclass.h $(INCL)\objects.h \ - $(INCL)\prop.h $(INCL)\skills.h +$(OGUI)objects.o: objects.c $(CONFIG_H) $(INCL)defsym.h \ + $(INCL)obj.h $(INCL)objclass.h $(INCL)objects.h \ + $(INCL)prop.h $(INCL)skills.h $(OGUI)objnam.o: objnam.c $(HACK_H) -$(OGUI)options.o: options.c $(CONFIG_H) $(HACK_H) $(INCL)\defsym.h \ - $(INCL)\flag.h $(INCL)\objclass.h $(INCL)\objects.h \ - $(INCL)\optlist.h $(INCL)\tcap.h -$(OGUI)pager.o: pager.c $(HACK_H) $(INCL)\dlb.h +$(OGUI)options.o: options.c $(CONFIG_H) $(HACK_H) $(INCL)defsym.h \ + $(INCL)flag.h $(INCL)objclass.h $(INCL)objects.h \ + $(INCL)optlist.h $(INCL)tcap.h +$(OGUI)pager.o: pager.c $(HACK_H) $(INCL)dlb.h $(OGUI)pickup.o: pickup.c $(HACK_H) $(OGUI)pline.o: pline.c $(HACK_H) $(OGUI)polyself.o: polyself.c $(HACK_H) $(OGUI)potion.o: potion.c $(HACK_H) $(OGUI)pray.o: pray.c $(HACK_H) -$(OGUI)priest.o: priest.c $(HACK_H) $(INCL)\mfndpos.h +$(OGUI)priest.o: priest.c $(HACK_H) $(INCL)mfndpos.h $(OGUI)quest.o: quest.c $(HACK_H) -$(OGUI)questpgr.o: questpgr.c $(HACK_H) $(INCL)\dlb.h \ - $(INCL)\wintty.h +$(OGUI)questpgr.o: questpgr.c $(HACK_H) $(INCL)dlb.h \ + $(INCL)wintty.h $(OGUI)read.o: read.c $(HACK_H) $(OGUI)rect.o: rect.c $(HACK_H) $(OGUI)region.o: region.c $(HACK_H) -$(OGUI)report.o: report.c $(HACK_H) $(INCL)\dlb.h $(INCL)\nhmd4.h -$(OGUI)restore.o: restore.c $(HACK_H) $(INCL)\tcap.h +$(OGUI)report.o: report.c $(HACK_H) $(INCL)dlb.h $(INCL)nhmd4.h +$(OGUI)restore.o: restore.c $(HACK_H) $(INCL)tcap.h $(OGUI)rip.o: rip.c $(HACK_H) -$(OGUI)rnd.o: rnd.c $(HACK_H) $(INCL)\isaac64.h +$(OGUI)rnd.o: rnd.c $(HACK_H) $(INCL)isaac64.h $(OGUI)role.o: role.c $(HACK_H) -$(OGUI)rumors.o: rumors.c $(HACK_H) $(INCL)\dlb.h +$(OGUI)rumors.o: rumors.c $(HACK_H) $(INCL)dlb.h $(OGUI)save.o: save.c $(HACK_H) -$(OGUI)selvar.o: selvar.c $(HACK_H) $(INCL)\sp_lev.h +$(OGUI)selvar.o: selvar.c $(HACK_H) $(INCL)sp_lev.h $(OGUI)sfstruct.o: sfstruct.c $(HACK_H) $(OGUI)shk.o: shk.c $(HACK_H) $(OGUI)shknam.o: shknam.c $(HACK_H) -$(OGUI)sit.o: sit.c $(HACK_H) $(INCL)\artifact.h +$(OGUI)sit.o: sit.c $(HACK_H) $(INCL)artifact.h $(OGUI)sounds.o: sounds.c $(HACK_H) -$(OGUI)sp_lev.o: sp_lev.c $(HACK_H) $(INCL)\sp_lev.h +$(OGUI)sp_lev.o: sp_lev.c $(HACK_H) $(INCL)sp_lev.h $(OGUI)spell.o: spell.c $(HACK_H) $(OGUI)stairs.o: stairs.c $(HACK_H) $(OGUI)steal.o: steal.c $(HACK_H) $(OGUI)steed.o: steed.c $(HACK_H) $(OGUI)strutil.o: strutil.c $(HACK_H) -$(OGUI)symbols.o: symbols.c $(HACK_H) $(INCL)\tcap.h +$(OGUI)symbols.o: symbols.c $(HACK_H) $(INCL)tcap.h $(OGUI)sys.o: sys.c $(HACK_H) $(OGUI)teleport.o: teleport.c $(HACK_H) #$(OGUI)tile.o: tile.c $(HACK_H) $(OGUI)timeout.o: timeout.c $(HACK_H) -$(OGUI)topten.o: topten.c $(HACK_H) $(INCL)\dlb.h +$(OGUI)topten.o: topten.c $(HACK_H) $(INCL)dlb.h $(OGUI)track.o: track.c $(HACK_H) $(OGUI)trap.o: trap.c $(HACK_H) $(OGUI)u_init.o: u_init.c $(HACK_H) $(OGUI)uhitm.o: uhitm.c $(HACK_H) $(OGUI)utf8map.o: utf8map.c $(HACK_H) $(OGUI)vault.o: vault.c $(HACK_H) -$(OGUI)version.o: version.c $(HACK_H) $(INCL)\dlb.h +$(OGUI)version.o: version.c $(HACK_H) $(INCL)dlb.h $(OGUI)vision.o: vision.c $(HACK_H) $(OGUI)weapon.o: weapon.c $(HACK_H) $(OGUI)were.o: were.c $(HACK_H) $(OGUI)wield.o: wield.c $(HACK_H) -$(OGUI)windows.o: windows.c $(HACK_H) $(INCL)\dlb.h $(INCL)\wintty.h +$(OGUI)windows.o: windows.c $(HACK_H) $(INCL)dlb.h $(INCL)wintty.h $(OGUI)wizard.o: wizard.c $(HACK_H) -$(OGUI)wizcmds.o: wizcmds.c $(HACK_H) $(INCL)\func_tab.h +$(OGUI)wizcmds.o: wizcmds.c $(HACK_H) $(INCL)func_tab.h $(OGUI)worm.o: worm.c $(HACK_H) $(OGUI)worn.o: worn.c $(HACK_H) $(OGUI)write.o: write.c $(HACK_H)