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

more patchlevel consolidation

Browse Source
This commit is contained in:
nhmall
2020-07-07 08:55:11 -04:00
parent 3cecb97da6
commit 1443ceecc5
14 changed files with 93 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
sys/winnt/Makefile.gcc
View File

@@ -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)

43
sys/winnt/Makefile.msc
View File

@@ -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)

3
sys/winnt/windmain.c
View File

@@ -12,9 +12,6 @@
#include <sys\stat.h>
#include <errno.h>
#include <ShlObj.h>
#if !defined(VERSION_MAJOR)
#include "patchlevel.h"
#endif
#if !defined(SAFEPROCS)
#error You must #define SAFEPROCS to build windmain.c