From 1443ceecc574bbb71e60882efd72a17c31e2585f Mon Sep 17 00:00:00 2001 From: nhmall Date: Tue, 7 Jul 2020 08:55:11 -0400 Subject: [PATCH] more patchlevel consolidation --- src/bones.c | 2 +- sys/msdos/Makefile.GCC | 15 +++---- sys/msdos/Makefile2.cross | 14 +++---- sys/unix/Makefile.src | 84 ++++++++++++++++++--------------------- sys/vms/Makefile.src | 11 +++-- sys/winnt/Makefile.gcc | 18 ++++----- sys/winnt/Makefile.msc | 43 ++++++++++---------- sys/winnt/windmain.c | 3 -- win/Qt/qt_main.cpp | 1 - win/curses/cursinit.c | 1 - win/curses/cursmain.c | 5 --- win/win32/mhmain.c | 2 + win/win32/mhmap.c | 2 + win/win32/mhsplash.c | 2 + 14 files changed, 93 insertions(+), 110 deletions(-) diff --git a/src/bones.c b/src/bones.c index 0671ae167..21fc01534 100644 --- a/src/bones.c +++ b/src/bones.c @@ -594,7 +594,7 @@ getbones() 3.6.0 bones to remain compatible, we need an extra test; once compatibility with 3.6.x goes away, this can too (we don't try to make this conditional upon the value of - VERSION_COMPATIBILITY because then we'd need patchlevel.h) */ + VERSION_COMPATIBILITY) */ && (strlen(bonesid) <= 2 || strcmp(bonesid + 2, oldbonesid) != 0)) { char errbuf[BUFSZ]; diff --git a/sys/msdos/Makefile.GCC b/sys/msdos/Makefile.GCC index 95598d5d3..922ef5006 100644 --- a/sys/msdos/Makefile.GCC +++ b/sys/msdos/Makefile.GCC @@ -1089,8 +1089,6 @@ $(O)stubvid.o : $(HACK_H) $(MSYS)/pcvideo.h $(MSYS)/video.c # o -c (which is included in cflags) substituted with -o$@ , # o an explicit build instruction for dlb.o because it requires # a .h file in ../sys/msdos. -# o the PATCHLEV_H macro is substitued for $(INCL)/patchlevel.h -# to work around a long filename issue. # o $(CFLAGS) changed to $(cflags) # Other than that, these dependencies are untouched. # That means that there is some irrelevant stuff @@ -1126,7 +1124,7 @@ $(O)termcap.o: ../win/tty/termcap.c $(HACK_H) $(INCL)/tcap.h $(O)topl.o: ../win/tty/topl.c $(HACK_H) $(INCL)/tcap.h $(CC) $(cflags) -o$@ ../win/tty/topl.c $(O)wintty.o: ../win/tty/wintty.c $(HACK_H) $(INCL)/dlb.h \ - $(INCL)/date.h $(PATCHLEV_H) $(INCL)/tcap.h + $(INCL)/date.h $(INCL)/tcap.h $(CC) $(cflags) -o$@ ../win/tty/wintty.c $(O)Window.o: ../win/X11/Window.c $(INCL)/xwindowp.h $(INCL)/xwindow.h \ $(CONFIG_H) @@ -1134,8 +1132,7 @@ $(O)Window.o: ../win/X11/Window.c $(INCL)/xwindowp.h $(INCL)/xwindow.h \ $(O)dialogs.o: ../win/X11/dialogs.c $(CONFIG_H) $(CC) $(cflags) -o$@ ../win/X11/dialogs.c $(O)winX.o: ../win/X11/winX.c $(HACK_H) $(INCL)/winX.h $(INCL)/dlb.h \ - $(PATCHLEV_H) ../win/X11/nh72icon \ - ../win/X11/nh56icon ../win/X11/nh32icon + ../win/X11/nh72icon ../win/X11/nh56icon ../win/X11/nh32icon $(CC) $(cflags) -o$@ ../win/X11/winX.c $(O)winmap.o: ../win/X11/winmap.c $(INCL)/xwindow.h $(HACK_H) $(INCL)/dlb.h \ $(INCL)/winX.h $(INCL)/tile2x11.h @@ -1196,7 +1193,7 @@ $(O)gnworn.o: ../win/gnome/gnworn.c ../win/gnome/gnworn.h ../win/gnome/gnglyph.h $(O)gnyesno.o: ../win/gnome/gnyesno.c ../win/gnome/gnbind.h ../win/gnome/gnyesno.h $(CC) $(cflags) $(GNOMEINC) -o$@ ../win/gnome/gnyesno.c $(O)wingem.o: ../win/gem/wingem.c $(HACK_H) $(INCL)/func_tab.h $(INCL)/dlb.h \ - $(PATCHLEV_H) $(INCL)/wingem.h + $(INCL)/wingem.h $(CC) $(cflags) -o$@ ../win/gem/wingem.c $(O)wingem1.o: ../win/gem/wingem1.c $(INCL)/gem_rsc.h $(INCL)/load_img.h \ $(INCL)/gr_rect.h $(INCL)/wintype.h $(INCL)/wingem.h @@ -1207,7 +1204,7 @@ $(O)gr_rect.o: ../win/gem/gr_rect.c $(INCL)/gr_rect.h $(CC) $(cflags) -o$@ ../win/gem/gr_rect.c $(O)tile.o: tile.c $(HACK_H) $(O)qt_win.o: ../win/Qt/qt_win.cpp $(HACK_H) $(INCL)/func_tab.h \ - $(INCL)/dlb.h $(PATCHLEV_H) $(INCL)/tile2x11.h \ + $(INCL)/dlb.h $(INCL)/tile2x11.h \ $(INCL)/qt_win.h $(INCL)/qt_clust.h $(INCL)/qt_kde0.h \ $(INCL)/qt_xpms.h qt_win.moc qt_kde0.moc qttableview.moc $(CXX) $(CXXFLAGS) -o$@ ../win/Qt/qt_win.cpp @@ -1316,13 +1313,13 @@ $(O)symbols.o: symbols.c $(HACK_H) $(INCL)/tcap.h $(O)sys.o: sys.c $(HACK_H) $(O)teleport.o: teleport.c $(HACK_H) $(O)timeout.o: timeout.c $(HACK_H) -$(O)topten.o: topten.c $(HACK_H) $(INCL)/dlb.h $(PATCHLEV_H) +$(O)topten.o: topten.c $(HACK_H) $(INCL)/dlb.h $(O)track.o: track.c $(HACK_H) $(O)trap.o: trap.c $(HACK_H) $(O)u_init.o: u_init.c $(HACK_H) $(O)uhitm.o: uhitm.c $(HACK_H) $(O)vault.o: vault.c $(HACK_H) -$(O)version.o: version.c $(HACK_H) $(INCL)/date.h $(PATCHLEV_H) +$(O)version.o: version.c $(HACK_H) $(INCL)/date.h $(O)vision.o: vision.c $(HACK_H) $(INCL)/vis_tab.h $(O)weapon.o: weapon.c $(HACK_H) $(O)were.o: were.c $(HACK_H) diff --git a/sys/msdos/Makefile2.cross b/sys/msdos/Makefile2.cross index 8cd94ffc2..fe993de4b 100644 --- a/sys/msdos/Makefile2.cross +++ b/sys/msdos/Makefile2.cross @@ -881,8 +881,6 @@ $(O)stubvid.o : $(HACK_H) $(MSYS)/pcvideo.h $(MSYS)/video.c # o -c (which is included in cflags) substituted with -o$@ , # o an explicit build instruction for dlb.o because it requires # a .h file in ../sys/msdos. -# o the PATCHLEV_H macro is substitued for $(INCL)/patchlevel.h -# to work around a long filename issue. # o $(CFLAGS) changed to $(cflags) # Other than that, these dependencies are untouched. # That means that there is some irrelevant stuff @@ -920,7 +918,7 @@ $(O)termcap.o: ../win/tty/termcap.c $(HACK_H) $(INCL)/tcap.h $(O)topl.o: ../win/tty/topl.c $(HACK_H) $(INCL)/tcap.h $(TARGET_CC) $(cflags) -o$@ ../win/tty/topl.c $(O)wintty.o: ../win/tty/wintty.c $(HACK_H) $(INCL)/dlb.h \ - $(INCL)/date.h $(PATCHLEV_H) $(INCL)/tcap.h + $(INCL)/date.h $(INCL)/tcap.h $(TARGET_CC) $(cflags) -o$@ ../win/tty/wintty.c $(O)Window.o: ../win/X11/Window.c $(INCL)/xwindowp.h $(INCL)/xwindow.h \ $(CONFIG_H) @@ -928,7 +926,7 @@ $(O)Window.o: ../win/X11/Window.c $(INCL)/xwindowp.h $(INCL)/xwindow.h \ $(O)dialogs.o: ../win/X11/dialogs.c $(CONFIG_H) $(TARGET_CC) $(cflags) -o$@ ../win/X11/dialogs.c $(O)winX.o: ../win/X11/winX.c $(HACK_H) $(INCL)/winX.h $(INCL)/dlb.h \ - $(PATCHLEV_H) ../win/X11/nh72icon \ + ../win/X11/nh72icon \ ../win/X11/nh56icon ../win/X11/nh32icon $(TARGET_CC) $(cflags) -o$@ ../win/X11/winX.c $(O)winmap.o: ../win/X11/winmap.c $(INCL)/xwindow.h $(HACK_H) $(INCL)/dlb.h \ @@ -991,7 +989,7 @@ $(O)gnworn.o: ../win/gnome/gnworn.c ../win/gnome/gnworn.h ../win/gnome/gnglyph.h $(O)gnyesno.o: ../win/gnome/gnyesno.c ../win/gnome/gnbind.h ../win/gnome/gnyesno.h $(TARGET_CC) $(cflags) $(GNOMEINC) -o$@ ../win/gnome/gnyesno.c $(O)wingem.o: ../win/gem/wingem.c $(HACK_H) $(INCL)/func_tab.h $(INCL)/dlb.h \ - $(PATCHLEV_H) $(INCL)/wingem.h + $(INCL)/wingem.h $(TARGET_CC) $(cflags) -o$@ ../win/gem/wingem.c $(O)wingem1.o: ../win/gem/wingem1.c $(INCL)/gem_rsc.h $(INCL)/load_img.h \ $(INCL)/gr_rect.h $(INCL)/wintype.h $(INCL)/wingem.h @@ -1001,7 +999,7 @@ $(O)load_img.o: ../win/gem/load_img.c $(INCL)/load_img.h $(O)gr_rect.o: ../win/gem/gr_rect.c $(INCL)/gr_rect.h $(TARGET_CC) $(cflags) -o$@ ../win/gem/gr_rect.c $(O)qt_win.o: ../win/Qt/qt_win.cpp $(HACK_H) $(INCL)/func_tab.h \ - $(INCL)/dlb.h $(PATCHLEV_H) $(INCL)/tile2x11.h \ + $(INCL)/dlb.h $(INCL)/tile2x11.h \ $(INCL)/qt_win.h $(INCL)/qt_clust.h $(INCL)/qt_kde0.h \ $(INCL)/qt_xpms.h qt_win.moc qt_kde0.moc qttableview.moc $(CXX) $(CXXFLAGS) -o$@ ../win/Qt/qt_win.cpp @@ -1111,13 +1109,13 @@ $(O)symbols.o: symbols.c $(HACK_H) $(INCL)/tcap.h $(O)sys.o: sys.c $(HACK_H) $(O)teleport.o: teleport.c $(HACK_H) $(O)timeout.o: timeout.c $(HACK_H) -$(O)topten.o: topten.c $(HACK_H) $(INCL)/dlb.h $(PATCHLEV_H) +$(O)topten.o: topten.c $(HACK_H) $(INCL)/dlb.h $(O)track.o: track.c $(HACK_H) $(O)trap.o: trap.c $(HACK_H) $(O)u_init.o: u_init.c $(HACK_H) $(O)uhitm.o: uhitm.c $(HACK_H) $(O)vault.o: vault.c $(HACK_H) -$(O)version.o: version.c $(HACK_H) $(INCL)/date.h $(PATCHLEV_H) +$(O)version.o: version.c $(HACK_H) $(INCL)/date.h $(O)vision.o: vision.c $(HACK_H) $(INCL)/vis_tab.h $(O)weapon.o: weapon.c $(HACK_H) $(O)were.o: were.c $(HACK_H) diff --git a/sys/unix/Makefile.src b/sys/unix/Makefile.src index 488ddeb1f..c7c955888 100644 --- a/sys/unix/Makefile.src +++ b/sys/unix/Makefile.src @@ -730,11 +730,11 @@ depend: ../sys/unix/depend.awk \ # DO NOT DELETE THIS LINE OR CHANGE ANYTHING BEYOND IT # config.h timestamp -$(CONFIG_H): ../include/config.h ../include/config1.h ../include/tradstdc.h \ - ../include/global.h ../include/coord.h ../include/vmsconf.h \ - ../include/system.h ../include/nhlua.h ../include/unixconf.h \ - ../include/micro.h ../include/pcconf.h ../include/ntconf.h \ - ../include/fnamesiz.h +$(CONFIG_H): ../include/config.h ../include/patchlevel.h ../include/config1.h \ + ../include/tradstdc.h ../include/global.h ../include/coord.h \ + ../include/vmsconf.h ../include/system.h ../include/nhlua.h \ + ../include/unixconf.h ../include/micro.h ../include/pcconf.h \ + ../include/ntconf.h ../include/fnamesiz.h touch $(CONFIG_H) # hack.h timestamp $(HACK_H): ../include/hack.h $(CONFIG_H) ../include/lint.h ../include/align.h \ @@ -790,8 +790,7 @@ topl.o: ../win/tty/topl.c $(HACK_H) ../include/tcap.h $(CC) $(CFLAGS) -c -o $@ ../win/tty/topl.c wintty.o: ../win/tty/wintty.c $(HACK_H) ../include/dlb.h ../include/tcap.h $(CC) $(CFLAGS) -c -o $@ ../win/tty/wintty.c -cursmain.o: ../win/curses/cursmain.c $(HACK_H) ../include/patchlevel.h \ - ../include/wincurs.h +cursmain.o: ../win/curses/cursmain.c $(HACK_H) ../include/wincurs.h $(CC) $(CFLAGS) -c -o $@ ../win/curses/cursmain.c curswins.o: ../win/curses/curswins.c $(HACK_H) ../include/wincurs.h \ ../win/curses/curswins.h @@ -846,7 +845,7 @@ gnaskstr.o: ../win/gnome/gnaskstr.c ../win/gnome/gnaskstr.h \ ../win/gnome/gnmain.h $(CC) $(CFLAGS) $(GNOMEINC) -c -o $@ ../win/gnome/gnaskstr.c gnbind.o: ../win/gnome/gnbind.c ../win/gnome/gnbind.h ../win/gnome/gnomeprv.h \ - $(HACK_H) ../include/dlb.h ../include/patchlevel.h \ + $(HACK_H) ../include/dlb.h \ ../include/winGnome.h ../win/gnome/gnmain.h \ ../win/gnome/gnmap.h ../win/gnome/gnmenu.h \ ../win/gnome/gnplayer.h ../win/gnome/gnsignal.h \ @@ -860,33 +859,31 @@ gnglyph.o: ../win/gnome/gnglyph.c ../win/gnome/gnglyph.h $(CONFIG_H) \ $(CC) $(CFLAGS) $(GNOMEINC) -c -o $@ ../win/gnome/gnglyph.c gnmain.o: ../win/gnome/gnmain.c ../win/gnome/gnmain.h ../win/gnome/gnsignal.h \ ../win/gnome/gnomeprv.h $(HACK_H) ../include/dlb.h \ - ../include/patchlevel.h ../include/winGnome.h \ - ../win/gnome/gnglyph.h ../win/gnome/gnbind.h \ - ../win/gnome/gnmap.h ../win/gnome/gnmenu.h \ - ../win/gnome/gnplayer.h ../win/gnome/gnstatus.h \ - ../win/gnome/gntext.h ../win/gnome/gnmesg.h \ - ../win/gnome/gnyesno.h ../win/gnome/gnworn.h \ - ../win/gnome/gnopts.h ../include/date.h + ../include/winGnome.h ../win/gnome/gnglyph.h \ + ../win/gnome/gnbind.h ../win/gnome/gnmap.h \ + ../win/gnome/gnmenu.h ../win/gnome/gnplayer.h \ + ../win/gnome/gnstatus.h ../win/gnome/gntext.h \ + ../win/gnome/gnmesg.h ../win/gnome/gnyesno.h \ + ../win/gnome/gnworn.h ../win/gnome/gnopts.h ../include/date.h $(CC) $(CFLAGS) $(GNOMEINC) -c -o $@ ../win/gnome/gnmain.c gnmap.o: ../win/gnome/gnmap.c ../win/gnome/gnmap.h $(CONFIG_H) \ ../win/gnome/gnglyph.h ../win/gnome/gnsignal.h \ ../win/gnome/gnomeprv.h $(HACK_H) ../include/dlb.h \ - ../include/patchlevel.h ../include/winGnome.h + ../include/winGnome.h $(CC) $(CFLAGS) $(GNOMEINC) -c -o $@ ../win/gnome/gnmap.c gnmenu.o: ../win/gnome/gnmenu.c ../win/gnome/gnmenu.h $(CONFIG_H) \ ../win/gnome/gnomeprv.h $(HACK_H) ../include/dlb.h \ - ../include/patchlevel.h ../include/winGnome.h \ - ../win/gnome/gnmain.h ../win/gnome/gnbind.h \ - ../win/gnome/gnmap.h ../win/gnome/gnplayer.h \ - ../win/gnome/gnsignal.h ../win/gnome/gnglyph.h \ - ../win/gnome/gnstatus.h ../win/gnome/gntext.h \ - ../win/gnome/gnmesg.h ../win/gnome/gnyesno.h \ - ../win/gnome/gnworn.h ../include/func_tab.h + ../include/winGnome.h ../win/gnome/gnmain.h \ + ../win/gnome/gnbind.h ../win/gnome/gnmap.h \ + ../win/gnome/gnplayer.h ../win/gnome/gnsignal.h \ + ../win/gnome/gnglyph.h ../win/gnome/gnstatus.h \ + ../win/gnome/gntext.h ../win/gnome/gnmesg.h \ + ../win/gnome/gnyesno.h ../win/gnome/gnworn.h \ + ../include/func_tab.h $(CC) $(CFLAGS) $(GNOMEINC) -c -o $@ ../win/gnome/gnmenu.c gnmesg.o: ../win/gnome/gnmesg.c ../win/gnome/gnmesg.h $(CONFIG_H) \ ../win/gnome/gnsignal.h ../win/gnome/gnomeprv.h $(HACK_H) \ - ../include/dlb.h ../include/patchlevel.h ../include/winGnome.h \ - ../win/gnome/gnglyph.h + ../include/dlb.h ../include/winGnome.h ../win/gnome/gnglyph.h $(CC) $(CFLAGS) $(GNOMEINC) -c -o $@ ../win/gnome/gnmesg.c gnopts.o: ../win/gnome/gnopts.c ../win/gnome/gnopts.h ../win/gnome/gnglyph.h \ $(CONFIG_H) ../win/gnome/gnmain.h ../win/gnome/gnmap.h $(HACK_H) @@ -896,12 +893,12 @@ gnplayer.o: ../win/gnome/gnplayer.c ../win/gnome/gnplayer.h \ $(CC) $(CFLAGS) $(GNOMEINC) -c -o $@ ../win/gnome/gnplayer.c gnsignal.o: ../win/gnome/gnsignal.c ../win/gnome/gnsignal.h \ ../win/gnome/gnomeprv.h $(HACK_H) ../include/dlb.h \ - ../include/patchlevel.h ../include/winGnome.h \ - ../win/gnome/gnglyph.h ../win/gnome/gnmain.h + ../include/winGnome.h ../win/gnome/gnglyph.h \ + ../win/gnome/gnmain.h $(CC) $(CFLAGS) $(GNOMEINC) -c -o $@ ../win/gnome/gnsignal.c gnstatus.o: ../win/gnome/gnstatus.c ../win/gnome/gnstatus.h $(CONFIG_H) \ ../win/gnome/gnsignal.h ../win/gnome/gnomeprv.h $(HACK_H) \ - ../include/dlb.h ../include/patchlevel.h ../include/winGnome.h \ + ../include/dlb.h ../include/winGnome.h \ ../win/gnome/gnglyph.h ../win/gnome/gn_xpms.h $(CC) $(CFLAGS) $(GNOMEINC) -c -o $@ ../win/gnome/gnstatus.c gntext.o: ../win/gnome/gntext.c ../win/gnome/gntext.h $(CONFIG_H) \ @@ -909,21 +906,20 @@ gntext.o: ../win/gnome/gntext.c ../win/gnome/gntext.h $(CONFIG_H) \ $(CC) $(CFLAGS) $(GNOMEINC) -c -o $@ ../win/gnome/gntext.c gnyesno.o: ../win/gnome/gnyesno.c ../win/gnome/gnbind.h \ ../win/gnome/gnomeprv.h $(HACK_H) ../include/dlb.h \ - ../include/patchlevel.h ../include/winGnome.h \ - ../win/gnome/gnmain.h ../win/gnome/gnmap.h \ - ../win/gnome/gnmenu.h ../win/gnome/gnplayer.h \ - ../win/gnome/gnsignal.h ../win/gnome/gnglyph.h \ - ../win/gnome/gnstatus.h ../win/gnome/gntext.h \ - ../win/gnome/gnmesg.h ../win/gnome/gnyesno.h \ - ../win/gnome/gnworn.h + ../include/winGnome.h ../win/gnome/gnmain.h \ + ../win/gnome/gnmap.h ../win/gnome/gnmenu.h \ + ../win/gnome/gnplayer.h ../win/gnome/gnsignal.h \ + ../win/gnome/gnglyph.h ../win/gnome/gnstatus.h \ + ../win/gnome/gntext.h ../win/gnome/gnmesg.h \ + ../win/gnome/gnyesno.h ../win/gnome/gnworn.h $(CC) $(CFLAGS) $(GNOMEINC) -c -o $@ ../win/gnome/gnyesno.c gnworn.o: ../win/gnome/gnworn.c ../win/gnome/gnworn.h $(CONFIG_H) \ ../win/gnome/gnglyph.h ../win/gnome/gnsignal.h \ ../win/gnome/gnomeprv.h $(HACK_H) ../include/dlb.h \ - ../include/patchlevel.h ../include/winGnome.h + ../include/winGnome.h $(CC) $(CFLAGS) $(GNOMEINC) -c -o $@ ../win/gnome/gnworn.c wingem.o: ../win/gem/wingem.c $(HACK_H) ../include/func_tab.h ../include/dlb.h \ - ../include/patchlevel.h ../include/wingem.h + ../include/wingem.h $(CC) $(CFLAGS) -c -o $@ ../win/gem/wingem.c wingem1.o: ../win/gem/wingem1.c ../include/gem_rsc.h ../include/load_img.h \ ../include/gr_rect.h ../include/wintype.h ../include/wingem.h @@ -963,7 +959,7 @@ qt_key.o: ../win/Qt/qt_key.cpp $(HACK_H) ../win/Qt/qt_key.h $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_key.cpp qt_line.o: ../win/Qt/qt_line.cpp $(HACK_H) ../win/Qt/qt_line.h $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_line.cpp -qt_main.o: ../win/Qt/qt_main.cpp $(HACK_H) ../include/patchlevel.h \ +qt_main.o: ../win/Qt/qt_main.cpp $(HACK_H) \ ../win/Qt/qt_main.h ../win/Qt/qt_kde0.h qt_main.moc \ ../win/Qt/qt_bind.h ../win/Qt/qt_glyph.h ../win/Qt/qt_inv.h \ ../win/Qt/qt_key.h ../win/Qt/qt_map.h ../win/Qt/qt_win.h \ @@ -1025,7 +1021,7 @@ qt_yndlg.o: ../win/Qt/qt_yndlg.cpp $(HACK_H) ../win/Qt/qt_yndlg.h qt_yndlg.moc \ ../win/Qt/qt_str.h $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_yndlg.cpp qt3_win.o: ../win/Qt3/qt3_win.cpp $(HACK_H) ../include/func_tab.h \ - ../include/dlb.h ../include/patchlevel.h ../include/tile2x11.h \ + ../include/dlb.h ../include/tile2x11.h \ ../win/Qt3/qt3_win.h ../win/Qt3/qt3_clust.h \ ../win/Qt3/qt3_kde0.h ../win/Qt3/qt3_xpms.h qt3_win.moc \ qt3_kde0.moc qt3tableview.moc @@ -1055,7 +1051,7 @@ decl.o: decl.c $(HACK_H) detect.o: detect.c $(HACK_H) ../include/artifact.h dig.o: dig.c $(HACK_H) display.o: display.c $(HACK_H) -dlb.o: dlb.c $(CONFIG_H) ../include/dlb.h ../include/patchlevel.h +dlb.o: dlb.c $(CONFIG_H) ../include/dlb.h do.o: do.c $(HACK_H) do_name.o: do_name.c $(HACK_H) do_wear.o: do_wear.c $(HACK_H) @@ -1090,8 +1086,7 @@ mdlib.o: mdlib.c $(CONFIG_H) ../include/permonst.h ../include/align.h \ ../include/artilist.h ../include/dungeon.h ../include/obj.h \ ../include/monst.h ../include/mextra.h ../include/you.h \ ../include/attrib.h ../include/prop.h ../include/skills.h \ - ../include/context.h ../include/flag.h ../include/dlb.h \ - ../include/patchlevel.h + ../include/context.h ../include/flag.h ../include/dlb.h mhitm.o: mhitm.c $(HACK_H) ../include/artifact.h mhitu.o: mhitu.c $(HACK_H) ../include/artifact.h minion.o: minion.c $(HACK_H) @@ -1150,14 +1145,13 @@ symbols.o: symbols.c $(HACK_H) ../include/tcap.h sys.o: sys.c $(HACK_H) teleport.o: teleport.c $(HACK_H) timeout.o: timeout.c $(HACK_H) -topten.o: topten.c $(HACK_H) ../include/dlb.h ../include/patchlevel.h +topten.o: topten.c $(HACK_H) ../include/dlb.h track.o: track.c $(HACK_H) trap.o: trap.c $(HACK_H) u_init.o: u_init.c $(HACK_H) uhitm.o: uhitm.c $(HACK_H) vault.o: vault.c $(HACK_H) -version.o: version.c $(HACK_H) ../include/dlb.h ../include/date.h \ - ../include/patchlevel.h +version.o: version.c $(HACK_H) ../include/dlb.h ../include/date.h vision.o: vision.c $(HACK_H) ../include/vis_tab.h weapon.o: weapon.c $(HACK_H) were.o: were.c $(HACK_H) diff --git a/sys/vms/Makefile.src b/sys/vms/Makefile.src index e215ad04d..0caa718d5 100644 --- a/sys/vms/Makefile.src +++ b/sys/vms/Makefile.src @@ -417,9 +417,8 @@ getline.obj : $(TTY)getline.c $(HACK_H) $(INC)func_tab.h termcap.obj : $(TTY)termcap.c $(HACK_H) $(INC)tcap.h topl.obj : $(TTY)topl.c $(HACK_H) $(INC)tcap.h wintty.obj : $(TTY)wintty.c $(HACK_H) $(INC)dlb.h \ - $(INC)date.h $(INC)patchlevel.h $(INC)tcap.h -cursmain.obj : $(CURSES)cursmain.c $(HACK_H) $(INC)patchlevel.h \ - $(INC)wincurs.h + $(INC)date.h $(INC)tcap.h +cursmain.obj : $(CURSES)cursmain.c $(HACK_H) $(INC)wincurs.h curswins.obj : $(CURSES)curswins.c $(HACK_H) $(INC)wincurs.h \ $(CURSES)curswins.h cursmisc.obj : $(CURSES)cursmisc.c $(HACK_H) $(INC)wincurs.h \ @@ -437,7 +436,7 @@ cursinvt.obj : $(CURSES)cursinvt.c $(HACK_H) $(INC)wincurs.h \ Window.obj : $(X11)Window.c $(INC)xwindowp.h $(INC)xwindow.h $(CONFIG_H) dialogs.obj : $(X11)dialogs.c $(CONFIG_H) winX.obj : $(X11)winX.c $(HACK_H) $(INC)winX.h $(INC)dlb.h \ - $(INC)patchlevel.h $(X11)nh72icon $(X11)nh56icon $(X11)nh32icon + $(X11)nh72icon $(X11)nh56icon $(X11)nh32icon winmap.obj : $(X11)winmap.c $(INC)xwindow.h $(HACK_H) $(INC)dlb.h \ $(INC)winX.h $(INC)tile2x11.h winmenu.obj : $(X11)winmenu.c $(HACK_H) $(INC)winX.h @@ -579,13 +578,13 @@ steed.obj : steed.c $(HACK_H) sys.obj : sys.c $(HACK_H) teleport.obj : teleport.c $(HACK_H) timeout.obj : timeout.c $(HACK_H) -topten.obj : topten.c $(HACK_H) $(INC)dlb.h $(INC)patchlevel.h +topten.obj : topten.c $(HACK_H) $(INC)dlb.h track.obj : track.c $(HACK_H) trap.obj : trap.c $(HACK_H) u_init.obj : u_init.c $(HACK_H) uhitm.obj : uhitm.c $(HACK_H) vault.obj : vault.c $(HACK_H) -version.obj : version.c $(HACK_H) $(INC)dlb.h $(INC)date.h $(INC)patchlevel.h +version.obj : version.c $(HACK_H) $(INC)dlb.h $(INC)date.h vision.obj : vision.c $(HACK_H) $(INC)vis_tab.h weapon.obj : weapon.c $(HACK_H) were.obj : were.c $(HACK_H) diff --git a/sys/winnt/Makefile.gcc b/sys/winnt/Makefile.gcc index 29da0a377..d5c4cb050 100644 --- a/sys/winnt/Makefile.gcc +++ b/sys/winnt/Makefile.gcc @@ -471,7 +471,8 @@ endif # Header file macros #========================================== -CONFIG_H = $(INCL)/config.h $(INCL)/config1.h $(INCL)/tradstdc.h \ +CONFIG_H = $(INCL)/config.h $(INCL)/patchlevel.h \ + $(INCL)/config1.h $(INCL)/tradstdc.h \ $(INCL)/global.h $(INCL)/fnamesiz.h $(INCL)/coord.h \ $(INCL)/vmsconf.h $(INCL)/system.h $(INCL)/unixconf.h \ $(INCL)/micro.h $(INCL)/pcconf.h $(INCL)/ntconf.h @@ -898,7 +899,7 @@ $(U)makedefs.exe: $(MAKEDEFSOBJS) $(O)makedefs.o: $(CONFIG_H) $(INCL)/monattk.h $(INCL)/monflag.h \ $(INCL)/objclass.h $(INCL)/monsym.h \ - $(INCL)/patchlevel.h $(U)makedefs.c $(SRC)\mdlib.c + $(U)makedefs.c $(SRC)\mdlib.c $(cc) $(CFLAGSU) -o$@ $(U)makedefs.c # @@ -1441,7 +1442,7 @@ $(O)termcap.o: ../win/tty/termcap.c $(HACK_H) $(INCL)/tcap.h $(O)topl.o: ../win/tty/topl.c $(HACK_H) $(INCL)/tcap.h $(cc) $(CFLAGS) -o$@ ../win/tty/topl.c $(O)wintty.o: ../win/tty/wintty.c $(HACK_H) $(INCL)/dlb.h \ - $(INCL)/date.h $(INCL)/patchlevel.h $(INCL)/tcap.h + $(INCL)/date.h $(INCL)/tcap.h $(cc) $(CFLAGS) -o$@ ../win/tty/wintty.c #$(O)Window.o: ../win/X11/Window.c $(INCL)/xwindowp.h $(INCL)/xwindow.h \ # $(CONFIG_H) @@ -1449,8 +1450,7 @@ $(O)wintty.o: ../win/tty/wintty.c $(HACK_H) $(INCL)/dlb.h \ $(O)dialogs.o: ../win/X11/dialogs.c $(CONFIG_H) $(cc) $(CFLAGS) -o$@ ../win/X11/dialogs.c $(O)winX.o: ../win/X11/winX.c $(HACK_H) $(INCL)/winX.h $(INCL)/dlb.h \ - $(INCL)/patchlevel.h ../win/X11/nh72icon \ - ../win/X11/nh56icon ../win/X11/nh32icon + ../win/X11/nh72icon ../win/X11/nh56icon ../win/X11/nh32icon $(cc) $(CFLAGS) -o$@ ../win/X11/winX.c $(O)winmap.o: ../win/X11/winmap.c $(INCL)/xwindow.h $(HACK_H) $(INCL)/dlb.h \ $(INCL)/winX.h $(INCL)/tile2x11.h @@ -1511,7 +1511,7 @@ $(O)gnworn.o: ../win/gnome/gnworn.c ../win/gnome/gnworn.h ../win/gnome/gnglyph.h $(O)gnyesno.o: ../win/gnome/gnyesno.c ../win/gnome/gnbind.h ../win/gnome/gnyesno.h $(cc) $(CFLAGS) $(GNOMEINC) -o$@ ../win/gnome/gnyesno.c $(O)wingem.o: ../win/gem/wingem.c $(HACK_H) $(INCL)/func_tab.h $(INCL)/dlb.h \ - $(INCL)/patchlevel.h $(INCL)/wingem.h + $(INCL)/wingem.h $(cc) $(CFLAGS) -o$@ ../win/gem/wingem.c $(O)wingem1.o: ../win/gem/wingem1.c $(INCL)/gem_rsc.h $(INCL)/load_img.h \ $(INCL)/gr_rect.h $(INCL)/wintype.h $(INCL)/wingem.h @@ -1521,7 +1521,7 @@ $(O)load_img.o: ../win/gem/load_img.c $(INCL)/load_img.h $(O)gr_rect.o: ../win/gem/gr_rect.c $(INCL)/gr_rect.h $(cc) $(CFLAGS) -o$@ ../win/gem/gr_rect.c $(O)qt_win.o: ../win/Qt/qt_win.cpp $(HACK_H) $(INCL)/func_tab.h \ - $(INCL)/dlb.h $(INCL)/patchlevel.h $(INCL)/tile2x11.h \ + $(INCL)/dlb.h $(INCL)/tile2x11.h \ $(INCL)/qt_win.h $(INCL)/qt_clust.h $(INCL)/qt_kde0.h \ $(INCL)/qt_xpms.h qt_win.moc qt_kde0.moc qttableview.moc $(CXX) $(CXXFLAGS) -o$@ ../win/Qt/qt_win.cpp @@ -1629,13 +1629,13 @@ $(O)symbols.o: symbols.c $(HACK_H) $(INCL)/tcap.h $(O)sys.o: sys.c $(HACK_H) $(O)teleport.o: teleport.c $(HACK_H) $(O)timeout.o: timeout.c $(HACK_H) -$(O)topten.o: topten.c $(HACK_H) $(INCL)/dlb.h $(INCL)/patchlevel.h +$(O)topten.o: topten.c $(HACK_H) $(INCL)/dlb.h $(O)track.o: track.c $(HACK_H) $(O)trap.o: trap.c $(HACK_H) $(O)u_init.o: u_init.c $(HACK_H) $(O)uhitm.o: uhitm.c $(HACK_H) $(O)vault.o: vault.c $(HACK_H) -$(O)version.o: version.c $(HACK_H) $(INCL)/date.h $(INCL)/patchlevel.h +$(O)version.o: version.c $(HACK_H) $(INCL)/date.h $(O)vision.o: vision.c $(HACK_H) $(INCL)/vis_tab.h $(O)weapon.o: weapon.c $(HACK_H) $(O)were.o: were.c $(HACK_H) diff --git a/sys/winnt/Makefile.msc b/sys/winnt/Makefile.msc index 7a89b93cb..960bd8813 100644 --- a/sys/winnt/Makefile.msc +++ b/sys/winnt/Makefile.msc @@ -469,7 +469,8 @@ PDCLIB = # Header file macros #========================================== -CONFIG_H = $(INCL)\config.h $(INCL)\config1.h $(INCL)\tradstdc.h \ +CONFIG_H = $(INCL)\config.h $(INCL)\patchlevel.h \ + $(INCL)\config1.h $(INCL)\tradstdc.h \ $(INCL)\global.h $(INCL)\fnamesiz.h $(INCL)\coord.h \ $(INCL)\vmsconf.h $(INCL)\system.h $(INCL)\nhlua.h \ $(INCL)\unixconf.h $(INCL)\micro.h $(INCL)\pcconf.h \ @@ -1064,7 +1065,7 @@ $(O)makedefs.o: $(U)makedefs.c $(SRC)\mdlib.c $(CONFIG_H) $(INCL)\permonst.h \ $(INCL)\objclass.h $(INCL)\monsym.h \ $(INCL)\artilist.h $(INCL)\dungeon.h $(INCL)\obj.h \ $(INCL)\monst.h $(INCL)\you.h $(INCL)\flag.h \ - $(INCL)\dlb.h $(INCL)\patchlevel.h + $(INCL)\dlb.h @if not exist $(OBJ)\*.* echo creating directory $(OBJ:\=/) @if not exist $(OBJ)\*.* mkdir $(OBJ) @$(cc) -DENUM_PM $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_HOST) -Fo$@ $(U)makedefs.c @@ -1417,7 +1418,7 @@ $(O)mhmsgwnd.o: $(MSWIN)\mhmsgwnd.c $(MSWIN)\$(@B).h $(MSWIN)\mhmsg.h $(MSWIN)\m $(O)mhrip.o: $(MSWIN)\mhrip.c $(MSWIN)\$(@B).h $(MSWIN)\mhmsg.h $(MSWIN)\mhfont.h \ $(MSWIN)\resource.h $(WINDHDR) $(HACK_H) $(O)mhsplash.o: $(MSWIN)\mhsplash.c $(MSWIN)\$(@B).h $(MSWIN)\mhmsg.h $(MSWIN)\mhfont.h \ - $(MSWIN)\resource.h $(WINDHDR) $(HACK_H) $(INCL)\patchlevel.h + $(MSWIN)\resource.h $(WINDHDR) $(HACK_H) $(O)mhstatus.o: $(MSWIN)\mhstatus.c $(MSWIN)\$(@B).h $(MSWIN)\mhmsg.h $(MSWIN)\mhfont.h \ $(WINDHDR) $(HACK_H) $(O)mhtext.o: $(MSWIN)\mhtext.c $(MSWIN)\$(@B).h $(MSWIN)\mhmsg.h $(MSWIN)\mhfont.h \ @@ -1703,7 +1704,7 @@ $(O)topl.o: ..\win\tty\topl.c $(HACK_H) $(INCL)\tcap.h # @$(cc) $(cflagsBuild) -Fo$@ ..\win\tty\topl.c $(O)wintty.o: ..\win\tty\wintty.c $(HACK_H) $(INCL)\dlb.h $(INCL)\tcap.h # @$(cc) $(cflagsBuild) -Fo$@ ..\win\tty\wintty.c -$(O)cursmain.o: ..\win\curses\cursmain.c $(HACK_H) $(INCL)\patchlevel.h \ +$(O)cursmain.o: ..\win\curses\cursmain.c $(HACK_H) \ $(INCL)\wincurs.h # @$(cc) $(cflagsBuild) -Fo$@ ..\win\curses\cursmain.c $(O)curswins.o: ..\win\curses\curswins.c $(HACK_H) $(INCL)\wincurs.h \ @@ -1757,7 +1758,7 @@ $(O)gnaskstr.o: ..\win\gnome\gnaskstr.c ..\win\gnome\gnaskstr.h \ ..\win\gnome\gnmain.h # @$(cc) $(cflagsBuild) $(GNOMEINC) -Fo$@ ..\win\gnome\gnaskstr.c $(O)gnbind.o: ..\win\gnome\gnbind.c ..\win\gnome\gnbind.h ..\win\gnome\gnomeprv.h \ - $(HACK_H) $(INCL)\dlb.h $(INCL)\patchlevel.h \ + $(HACK_H) $(INCL)\dlb.h \ $(INCL)\winGnome.h ..\win\gnome\gnmain.h \ ..\win\gnome\gnmap.h ..\win\gnome\gnmenu.h \ ..\win\gnome\gnplayer.h ..\win\gnome\gnsignal.h \ @@ -1771,7 +1772,7 @@ $(O)gnglyph.o: ..\win\gnome\gnglyph.c ..\win\gnome\gnglyph.h $(CONFIG_H) \ # @$(cc) $(cflagsBuild) $(GNOMEINC) -Fo$@ ..\win\gnome\gnglyph.c $(O)gnmain.o: ..\win\gnome\gnmain.c ..\win\gnome\gnmain.h ..\win\gnome\gnsignal.h \ ..\win\gnome\gnomeprv.h $(HACK_H) $(INCL)\dlb.h \ - $(INCL)\patchlevel.h $(INCL)\winGnome.h \ + $(INCL)\winGnome.h \ ..\win\gnome\gnglyph.h ..\win\gnome\gnbind.h \ ..\win\gnome\gnmap.h ..\win\gnome\gnmenu.h \ ..\win\gnome\gnplayer.h ..\win\gnome\gnstatus.h \ @@ -1782,11 +1783,11 @@ $(O)gnmain.o: ..\win\gnome\gnmain.c ..\win\gnome\gnmain.h ..\win\gnome\gnsignal. $(O)gnmap.o: ..\win\gnome\gnmap.c ..\win\gnome\gnmap.h $(CONFIG_H) \ ..\win\gnome\gnglyph.h ..\win\gnome\gnsignal.h \ ..\win\gnome\gnomeprv.h $(HACK_H) $(INCL)\dlb.h \ - $(INCL)\patchlevel.h $(INCL)\winGnome.h + $(INCL)\winGnome.h # @$(cc) $(cflagsBuild) $(GNOMEINC) -Fo$@ ..\win\gnome\gnmap.c $(O)gnmenu.o: ..\win\gnome\gnmenu.c ..\win\gnome\gnmenu.h $(CONFIG_H) \ ..\win\gnome\gnomeprv.h $(HACK_H) $(INCL)\dlb.h \ - $(INCL)\patchlevel.h $(INCL)\winGnome.h \ + $(INCL)\winGnome.h \ ..\win\gnome\gnmain.h ..\win\gnome\gnbind.h \ ..\win\gnome\gnmap.h ..\win\gnome\gnplayer.h \ ..\win\gnome\gnsignal.h ..\win\gnome\gnglyph.h \ @@ -1796,7 +1797,7 @@ $(O)gnmenu.o: ..\win\gnome\gnmenu.c ..\win\gnome\gnmenu.h $(CONFIG_H) \ # @$(cc) $(cflagsBuild) $(GNOMEINC) -Fo$@ ..\win\gnome\gnmenu.c $(O)gnmesg.o: ..\win\gnome\gnmesg.c ..\win\gnome\gnmesg.h $(CONFIG_H) \ ..\win\gnome\gnsignal.h ..\win\gnome\gnomeprv.h $(HACK_H) \ - $(INCL)\dlb.h $(INCL)\patchlevel.h $(INCL)\winGnome.h \ + $(INCL)\dlb.h $(INCL)\winGnome.h \ ..\win\gnome\gnglyph.h # @$(cc) $(cflagsBuild) $(GNOMEINC) -Fo$@ ..\win\gnome\gnmesg.c $(O)gnopts.o: ..\win\gnome\gnopts.c ..\win\gnome\gnopts.h ..\win\gnome\gnglyph.h \ @@ -1807,12 +1808,12 @@ $(O)gnplayer.o: ..\win\gnome\gnplayer.c ..\win\gnome\gnplayer.h \ # @$(cc) $(cflagsBuild) $(GNOMEINC) -Fo$@ ..\win\gnome\gnplayer.c $(O)gnsignal.o: ..\win\gnome\gnsignal.c ..\win\gnome\gnsignal.h \ ..\win\gnome\gnomeprv.h $(HACK_H) $(INCL)\dlb.h \ - $(INCL)\patchlevel.h $(INCL)\winGnome.h \ + $(INCL)\winGnome.h \ ..\win\gnome\gnglyph.h ..\win\gnome\gnmain.h # @$(cc) $(cflagsBuild) $(GNOMEINC) -Fo$@ ..\win\gnome\gnsignal.c $(O)gnstatus.o: ..\win\gnome\gnstatus.c ..\win\gnome\gnstatus.h $(CONFIG_H) \ ..\win\gnome\gnsignal.h ..\win\gnome\gnomeprv.h $(HACK_H) \ - $(INCL)\dlb.h $(INCL)\patchlevel.h $(INCL)\winGnome.h \ + $(INCL)\dlb.h $(INCL)\winGnome.h \ ..\win\gnome\gnglyph.h ..\win\gnome\gn_xpms.h # @$(cc) $(cflagsBuild) $(GNOMEINC) -Fo$@ ..\win\gnome\gnstatus.c $(O)gntext.o: ..\win\gnome\gntext.c ..\win\gnome\gntext.h $(CONFIG_H) \ @@ -1820,7 +1821,7 @@ $(O)gntext.o: ..\win\gnome\gntext.c ..\win\gnome\gntext.h $(CONFIG_H) \ # @$(cc) $(cflagsBuild) $(GNOMEINC) -Fo$@ ..\win\gnome\gntext.c $(O)gnyesno.o: ..\win\gnome\gnyesno.c ..\win\gnome\gnbind.h \ ..\win\gnome\gnomeprv.h $(HACK_H) $(INCL)\dlb.h \ - $(INCL)\patchlevel.h $(INCL)\winGnome.h \ + $(INCL)\winGnome.h \ ..\win\gnome\gnmain.h ..\win\gnome\gnmap.h \ ..\win\gnome\gnmenu.h ..\win\gnome\gnplayer.h \ ..\win\gnome\gnsignal.h ..\win\gnome\gnglyph.h \ @@ -1831,10 +1832,10 @@ $(O)gnyesno.o: ..\win\gnome\gnyesno.c ..\win\gnome\gnbind.h \ $(O)gnworn.o: ..\win\gnome\gnworn.c ..\win\gnome\gnworn.h $(CONFIG_H) \ ..\win\gnome\gnglyph.h ..\win\gnome\gnsignal.h \ ..\win\gnome\gnomeprv.h $(HACK_H) $(INCL)\dlb.h \ - $(INCL)\patchlevel.h $(INCL)\winGnome.h + $(INCL)\winGnome.h # @$(cc) $(cflagsBuild) $(GNOMEINC) -Fo$@ ..\win\gnome\gnworn.c $(O)wingem.o: ..\win\gem\wingem.c $(HACK_H) $(INCL)\func_tab.h $(INCL)\dlb.h \ - $(INCL)\patchlevel.h $(INCL)\wingem.h + $(INCL)\wingem.h # @$(cc) $(cflagsBuild) -Fo$@ ..\win\gem\wingem.c $(O)wingem1.o: ..\win\gem\wingem1.c $(INCL)\gem_rsc.h $(INCL)\load_img.h \ $(INCL)\gr_rect.h $(INCL)\wintype.h $(INCL)\wingem.h @@ -1874,7 +1875,7 @@ $(O)qt_key.o: ..\win\Qt\qt_key.cpp $(HACK_H) ..\win\Qt\qt_key.h $(CXX) $(CXXFLAGS) -Fo$@ ..\win\Qt\qt_key.cpp $(O)qt_line.o: ..\win\Qt\qt_line.cpp $(HACK_H) ..\win\Qt\qt_line.h $(CXX) $(CXXFLAGS) -Fo$@ ..\win\Qt\qt_line.cpp -$(O)qt_main.o: ..\win\Qt\qt_main.cpp $(HACK_H) $(INCL)\patchlevel.h \ +$(O)qt_main.o: ..\win\Qt\qt_main.cpp $(HACK_H) \ ..\win\Qt\qt_main.h ..\win\Qt\qt_kde0.h qt_main.moc \ ..\win\Qt\qt_bind.h ..\win\Qt\qt_glyph.h ..\win\Qt\qt_inv.h \ ..\win\Qt\qt_key.h ..\win\Qt\qt_map.h ..\win\Qt\qt_win.h \ @@ -1936,7 +1937,7 @@ $(O)qt_yndlg.o: ..\win\Qt\qt_yndlg.cpp $(HACK_H) ..\win\Qt\qt_yndlg.h qt_yndlg.m ..\win\Qt\qt_str.h $(CXX) $(CXXFLAGS) -Fo$@ ..\win\Qt\qt_yndlg.cpp $(O)qt3_win.o: ..\win\Qt3\qt3_win.cpp $(HACK_H) $(INCL)\func_tab.h \ - $(INCL)\dlb.h $(INCL)\patchlevel.h $(INCL)\tile2x11.h \ + $(INCL)\dlb.h $(INCL)\tile2x11.h \ ..\win\Qt3\qt3_win.h ..\win\Qt3\qt3_clust.h \ ..\win\Qt3\qt3_kde0.h ..\win\Qt3\qt3_xpms.h qt3_win.moc \ qt3_kde0.moc qt3tableview.moc @@ -1966,7 +1967,7 @@ $(O)decl.o: decl.c $(HACK_H) $(O)detect.o: detect.c $(HACK_H) $(INCL)\artifact.h $(O)dig.o: dig.c $(HACK_H) $(O)display.o: display.c $(HACK_H) -$(O)dlb.o: dlb.c $(CONFIG_H) $(INCL)\dlb.h $(INCL)\patchlevel.h +$(O)dlb.o: dlb.c $(CONFIG_H) $(INCL)\dlb.h $(O)do.o: do.c $(HACK_H) $(O)do_name.o: do_name.c $(HACK_H) $(O)do_wear.o: do_wear.c $(HACK_H) @@ -2001,8 +2002,7 @@ $(O)mdlib.o: mdlib.c $(CONFIG_H) $(INCL)\permonst.h $(INCL)\align.h \ $(INCL)\artilist.h $(INCL)\dungeon.h $(INCL)\obj.h \ $(INCL)\monst.h $(INCL)\mextra.h $(INCL)\you.h \ $(INCL)\attrib.h $(INCL)\prop.h $(INCL)\skills.h \ - $(INCL)\context.h $(INCL)\flag.h $(INCL)\dlb.h \ - $(INCL)\patchlevel.h + $(INCL)\context.h $(INCL)\flag.h $(INCL)\dlb.h $(O)mhitm.o: mhitm.c $(HACK_H) $(INCL)\artifact.h $(O)mhitu.o: mhitu.c $(HACK_H) $(INCL)\artifact.h $(O)minion.o: minion.c $(HACK_H) @@ -2063,14 +2063,13 @@ $(O)symbols.o: symbols.c $(HACK_H) $(INCL)\tcap.h $(O)sys.o: sys.c $(HACK_H) $(O)teleport.o: teleport.c $(HACK_H) $(O)timeout.o: timeout.c $(HACK_H) -$(O)topten.o: topten.c $(HACK_H) $(INCL)\dlb.h $(INCL)\patchlevel.h +$(O)topten.o: topten.c $(HACK_H) $(INCL)\dlb.h $(O)track.o: track.c $(HACK_H) $(O)trap.o: trap.c $(HACK_H) $(O)u_init.o: u_init.c $(HACK_H) $(O)uhitm.o: uhitm.c $(HACK_H) $(O)vault.o: vault.c $(HACK_H) -$(O)version.o: version.c $(HACK_H) $(INCL)\dlb.h $(INCL)\date.h \ - $(INCL)\patchlevel.h +$(O)version.o: version.c $(HACK_H) $(INCL)\dlb.h $(INCL)\date.h @$(cc) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ version.c $(O)vision.o: vision.c $(HACK_H) $(INCL)\vis_tab.h $(O)weapon.o: weapon.c $(HACK_H) diff --git a/sys/winnt/windmain.c b/sys/winnt/windmain.c index 20c503d1f..357c8e38b 100644 --- a/sys/winnt/windmain.c +++ b/sys/winnt/windmain.c @@ -12,9 +12,6 @@ #include #include #include -#if !defined(VERSION_MAJOR) -#include "patchlevel.h" -#endif #if !defined(SAFEPROCS) #error You must #define SAFEPROCS to build windmain.c diff --git a/win/Qt/qt_main.cpp b/win/Qt/qt_main.cpp index 06e47c3c5..b27b1067c 100644 --- a/win/Qt/qt_main.cpp +++ b/win/Qt/qt_main.cpp @@ -7,7 +7,6 @@ extern "C" { #include "hack.h" } -#include "patchlevel.h" #undef Invisible #undef Warning #undef index diff --git a/win/curses/cursinit.c b/win/curses/cursinit.c index aae386324..ee93313eb 100644 --- a/win/curses/cursinit.c +++ b/win/curses/cursinit.c @@ -7,7 +7,6 @@ #include "hack.h" #include "wincurs.h" #include "cursinit.h" -/*#include "patchlevel.h"*/ #include diff --git a/win/curses/cursmain.c b/win/curses/cursmain.c index c2e424028..fe9ebafc6 100644 --- a/win/curses/cursmain.c +++ b/win/curses/cursmain.c @@ -5,11 +5,6 @@ #include "curses.h" #include "hack.h" -#ifdef SHORT_FILENAMES -#include "patchlev.h" -#else -#include "patchlevel.h" -#endif #include "color.h" #include "wincurs.h" diff --git a/win/win32/mhmain.c b/win/win32/mhmain.c index 19f04114e..a0c158e37 100644 --- a/win/win32/mhmain.c +++ b/win/win32/mhmain.c @@ -9,7 +9,9 @@ #else #include "config.h" #endif +#if !defined(PATCHLEVEL_H) #include "patchlevel.h" +#endif #include "resource.h" #include "mhmsg.h" #include "mhinput.h" diff --git a/win/win32/mhmap.c b/win/win32/mhmap.c index 51220a041..e13b67ac0 100644 --- a/win/win32/mhmap.c +++ b/win/win32/mhmap.c @@ -13,7 +13,9 @@ #include "resource.h" #include "color.h" +#if !defined(PATCHLEVEL_H) #include "patchlevel.h" +#endif #define NHMAP_FONT_NAME TEXT("Terminal") #define NHMAP_TTFONT_NAME TEXT("Consolas") diff --git a/win/win32/mhsplash.c b/win/win32/mhsplash.c index c5600177d..aa676c226 100644 --- a/win/win32/mhsplash.c +++ b/win/win32/mhsplash.c @@ -13,7 +13,9 @@ #else #include "config.h" #endif +#if !defined(VERSION_MAJOR) #include "patchlevel.h" +#endif #include "dlb.h" #define LLEN 128