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

more Qt rename

Browse Source 
In order for 'make depend' to be able to handle both Qt4/5 and Qt3,
they need to operate on different object file names.

renames qt*.o to qt3*.o for Qt3
renames qt*.cpp to qt3*.cpp for Qt3 (not essential but seems worthwhile)
moves Qt3's headers from include/qt*.h to win/Qt3/qt3*.h
copies include/qt_xpms.h (before rename) or win/Qt3/qt3_xpms.h (after)
    to win/Qt/qt_xpms.h so that Qt4/5 no longer shares one header file
modifies win/Qt3/*.cpp and win/Qt3/qt3_win.h to reflect new header names
modifies Makefile.src to have Qt3 'moc' commands use new names
updates Makefile.src via re-running 'make depend'

'make depend' was only looking at include/*.h to find nested inclusion.
Now it will also look at win/*/*.h.  That found a bunch of missing
dependencies for the old gnome sources and a few for Qt3.

Building without Qt still works.  Building with it (any version) has
not been tested.
This commit is contained in:
PatR
2019-12-09 11:15:49 -08:00
parent cb2e02ef75
commit 2fe31eec46
11 changed files with 1576 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

188
sys/unix/Makefile.src
View File

@@ -1,5 +1,5 @@
# NetHack Makefile. # NetHack Makefile.
# NetHack 3.6 Makefile.src $NHDT-Date: 1575767152 2019/12/08 01:05:52 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.83 $ # NetHack 3.6 Makefile.src $NHDT-Date: 1575917700 2019/12/09 18:55:00 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.86 $
# Copyright (c) 2018 by Pasi Kallinen # Copyright (c) 2018 by Pasi Kallinen
# NetHack may be freely redistributed. See license for details. # NetHack may be freely redistributed. See license for details.
@@ -224,10 +224,11 @@ WINX11SRC = ../win/X11/Window.c ../win/X11/dialogs.c ../win/X11/winX.c \
WINX11OBJ = Window.o dialogs.o winX.o winmap.o winmenu.o winmesg.o \ WINX11OBJ = Window.o dialogs.o winX.o winmap.o winmenu.o winmesg.o \
winmisc.o winstat.o wintext.o winval.o tile.o winmisc.o winstat.o wintext.o winval.o tile.o
# #
# Files for a Qt port # Files for a Qt 3 port (renamed since nethack 3.6.x)
# #
WINQTSRC = ../win/Qt/qt_win.cpp ../win/Qt/qt_clust.cpp ../win/Qt/qttableview.cpp WINQT3SRC = ../win/Qt3/qt3_win.cpp ../win/Qt3/qt3_clust.cpp \
WINQTOBJ = qt_win.o qt_clust.o qttableview.o tile.o ../win/Qt3/qt3tableview.cpp
WINQT3OBJ = qt3_win.o qt3_clust.o qt3tableview.o tile.o
# #
# Files for a Qt 4 or 5 port # Files for a Qt 4 or 5 port
# #
@@ -473,7 +474,7 @@ GENCSRC = vis_tab.c #tile.c
# all windowing-system-dependent .c (for dependencies and such) # all windowing-system-dependent .c (for dependencies and such)
WINCSRC = $(WINTTYSRC) $(WINCURSESSRC) $(WINX11SRC) $(WINGNOMESRC) $(WINGEMSRC) WINCSRC = $(WINTTYSRC) $(WINCURSESSRC) $(WINX11SRC) $(WINGNOMESRC) $(WINGEMSRC)
# all windowing-system-dependent .cpp (for dependencies and such) # all windowing-system-dependent .cpp (for dependencies and such)
WINCXXSRC = $(WINQTSRC) $(WINBESRC) WINCXXSRC = $(WINQTSRC) $(WINQT3SRC) $(WINBESRC)
# Files for window system chaining. Requires SYSCF; include via HINTSRC/HINTOBJ # Files for window system chaining. Requires SYSCF; include via HINTSRC/HINTOBJ
CHAINSRC = ../win/chain/wc_chainin.c ../win/chain/wc_chainout.c \ CHAINSRC = ../win/chain/wc_chainin.c ../win/chain/wc_chainout.c \
@@ -601,14 +602,12 @@ objects.o:
@rm -f $(MAKEDEFS) @rm -f $(MAKEDEFS)
# Qt 3 windowport meta-object-compiler output # Qt 3 windowport meta-object-compiler output
qt3kde0.moc: ../include/qt_kde0.h qt3_kde0.moc: ../win/Qt3/qt3_kde0.h
$(QTDIR)/bin/moc -o qt3kde0.moc ../include/qt_kde0.h $(QTDIR)/bin/moc -o qt3kde0.moc ../win/Qt3/qt3_kde0.h
qt3_win.moc: ../win/Qt3/qt3_win.h
qt3win.moc: ../include/qt_win.h $(QTDIR)/bin/moc -o qt3win.moc ../win/Qt3/qt3_win.h
$(QTDIR)/bin/moc -o qt3win.moc ../include/qt_win.h qt3tableview.moc: ../win/Qt3/qt3tableview.h
$(QTDIR)/bin/moc -o qt3tableview.moc ../win/Qt/qt3tableview.h
qttableview.moc: ../include/qttableview.h
$(QTDIR)/bin/moc -o qttableview.moc ../include/qttableview.h
# Qt 4 windowport meta-object-compiler output # Qt 4 windowport meta-object-compiler output
qt_kde0.moc : ../win/Qt/qt_kde0.h qt_kde0.moc : ../win/Qt/qt_kde0.h
@@ -709,7 +708,7 @@ spotless: clean
depend: ../sys/unix/depend.awk \ depend: ../sys/unix/depend.awk \
$(SYSCSRC) $(WINCSRC) $(SYSCXXSRC) $(WINCXXSRC) \ $(SYSCSRC) $(WINCSRC) $(SYSCXXSRC) $(WINCXXSRC) \
$(CHAINSRC) $(GENCSRC) $(HACKCSRC) $(CHAINSRC) $(GENCSRC) $(HACKCSRC)
$(AWK) -f ../sys/unix/depend.awk ../include/*.h \ $(AWK) -f ../sys/unix/depend.awk ../include/*.h ../win/*/*.h \
$(SYSCSRC) $(WINCSRC) $(SYSCXXSRC) $(WINCXXSRC) \ $(SYSCSRC) $(WINCSRC) $(SYSCXXSRC) $(WINCXXSRC) \
$(CHAINSRC) $(GENCSRC) $(HACKCSRC) >makedep $(CHAINSRC) $(GENCSRC) $(HACKCSRC) >makedep
@echo '/^# DO NOT DELETE THIS LINE OR CHANGE ANYTHING BEYOND IT/+2,$$d' >eddep @echo '/^# DO NOT DELETE THIS LINE OR CHANGE ANYTHING BEYOND IT/+2,$$d' >eddep
@@ -841,44 +840,82 @@ tile.o: tile.c $(HACK_H)
gnaskstr.o: ../win/gnome/gnaskstr.c ../win/gnome/gnaskstr.h \ gnaskstr.o: ../win/gnome/gnaskstr.c ../win/gnome/gnaskstr.h \
../win/gnome/gnmain.h ../win/gnome/gnmain.h
$(CC) $(CFLAGS) $(GNOMEINC) -c -o $@ ../win/gnome/gnaskstr.c $(CC) $(CFLAGS) $(GNOMEINC) -c -o $@ ../win/gnome/gnaskstr.c
gnbind.o: ../win/gnome/gnbind.c ../win/gnome/gnbind.h ../win/gnome/gnmain.h \ gnbind.o: ../win/gnome/gnbind.c ../win/gnome/gnbind.h ../win/gnome/gnomeprv.h \
../win/gnome/gnmenu.h ../win/gnome/gnaskstr.h \ $(HACK_H) ../include/dlb.h ../include/patchlevel.h \
../win/gnome/gnyesno.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 \
../win/gnome/gnaskstr.h
$(CC) $(CFLAGS) $(GNOMEINC) -c -o $@ ../win/gnome/gnbind.c $(CC) $(CFLAGS) $(GNOMEINC) -c -o $@ ../win/gnome/gnbind.c
gnglyph.o: ../win/gnome/gnglyph.c ../win/gnome/gnglyph.h ../include/tile2x11.h gnglyph.o: ../win/gnome/gnglyph.c ../win/gnome/gnglyph.h $(CONFIG_H) \
../include/tile2x11.h
$(CC) $(CFLAGS) $(GNOMEINC) -c -o $@ ../win/gnome/gnglyph.c $(CC) $(CFLAGS) $(GNOMEINC) -c -o $@ ../win/gnome/gnglyph.c
gnmain.o: ../win/gnome/gnmain.c ../win/gnome/gnmain.h ../win/gnome/gnsignal.h \ gnmain.o: ../win/gnome/gnmain.c ../win/gnome/gnmain.h ../win/gnome/gnsignal.h \
../win/gnome/gnbind.h ../win/gnome/gnopts.h $(HACK_H) \ ../win/gnome/gnomeprv.h $(HACK_H) ../include/dlb.h \
../include/date.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
$(CC) $(CFLAGS) $(GNOMEINC) -c -o $@ ../win/gnome/gnmain.c $(CC) $(CFLAGS) $(GNOMEINC) -c -o $@ ../win/gnome/gnmain.c
gnmap.o: ../win/gnome/gnmap.c ../win/gnome/gnmap.h ../win/gnome/gnglyph.h \ gnmap.o: ../win/gnome/gnmap.c ../win/gnome/gnmap.h $(CONFIG_H) \
../win/gnome/gnsignal.h $(HACK_H) ../win/gnome/gnglyph.h ../win/gnome/gnsignal.h \
../win/gnome/gnomeprv.h $(HACK_H) ../include/dlb.h \
../include/patchlevel.h ../include/winGnome.h
$(CC) $(CFLAGS) $(GNOMEINC) -c -o $@ ../win/gnome/gnmap.c $(CC) $(CFLAGS) $(GNOMEINC) -c -o $@ ../win/gnome/gnmap.c
gnmenu.o: ../win/gnome/gnmenu.c ../win/gnome/gnmenu.h ../win/gnome/gnmain.h \ gnmenu.o: ../win/gnome/gnmenu.c ../win/gnome/gnmenu.h $(CONFIG_H) \
../win/gnome/gnbind.h ../include/func_tab.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
$(CC) $(CFLAGS) $(GNOMEINC) -c -o $@ ../win/gnome/gnmenu.c $(CC) $(CFLAGS) $(GNOMEINC) -c -o $@ ../win/gnome/gnmenu.c
gnmesg.o: ../win/gnome/gnmesg.c ../win/gnome/gnmesg.h ../win/gnome/gnsignal.h 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
$(CC) $(CFLAGS) $(GNOMEINC) -c -o $@ ../win/gnome/gnmesg.c $(CC) $(CFLAGS) $(GNOMEINC) -c -o $@ ../win/gnome/gnmesg.c
gnopts.o: ../win/gnome/gnopts.c ../win/gnome/gnopts.h ../win/gnome/gnglyph.h \ gnopts.o: ../win/gnome/gnopts.c ../win/gnome/gnopts.h ../win/gnome/gnglyph.h \
../win/gnome/gnmain.h ../win/gnome/gnmap.h $(HACK_H) $(CONFIG_H) ../win/gnome/gnmain.h ../win/gnome/gnmap.h $(HACK_H)
$(CC) $(CFLAGS) $(GNOMEINC) -c -o $@ ../win/gnome/gnopts.c $(CC) $(CFLAGS) $(GNOMEINC) -c -o $@ ../win/gnome/gnopts.c
gnplayer.o: ../win/gnome/gnplayer.c ../win/gnome/gnplayer.h \ gnplayer.o: ../win/gnome/gnplayer.c ../win/gnome/gnplayer.h \
../win/gnome/gnmain.h $(HACK_H) ../win/gnome/gnmain.h $(HACK_H)
$(CC) $(CFLAGS) $(GNOMEINC) -c -o $@ ../win/gnome/gnplayer.c $(CC) $(CFLAGS) $(GNOMEINC) -c -o $@ ../win/gnome/gnplayer.c
gnsignal.o: ../win/gnome/gnsignal.c ../win/gnome/gnsignal.h \ gnsignal.o: ../win/gnome/gnsignal.c ../win/gnome/gnsignal.h \
../win/gnome/gnmain.h ../win/gnome/gnomeprv.h $(HACK_H) ../include/dlb.h \
../include/patchlevel.h ../include/winGnome.h \
../win/gnome/gnglyph.h ../win/gnome/gnmain.h
$(CC) $(CFLAGS) $(GNOMEINC) -c -o $@ ../win/gnome/gnsignal.c $(CC) $(CFLAGS) $(GNOMEINC) -c -o $@ ../win/gnome/gnsignal.c
gnstatus.o: ../win/gnome/gnstatus.c ../win/gnome/gnstatus.h \ gnstatus.o: ../win/gnome/gnstatus.c ../win/gnome/gnstatus.h $(CONFIG_H) \
../win/gnome/gnsignal.h ../win/gnome/gn_xpms.h \ ../win/gnome/gnsignal.h ../win/gnome/gnomeprv.h $(HACK_H) \
../win/gnome/gnomeprv.h ../include/dlb.h ../include/patchlevel.h ../include/winGnome.h \
../win/gnome/gnglyph.h ../win/gnome/gn_xpms.h
$(CC) $(CFLAGS) $(GNOMEINC) -c -o $@ ../win/gnome/gnstatus.c $(CC) $(CFLAGS) $(GNOMEINC) -c -o $@ ../win/gnome/gnstatus.c
gntext.o: ../win/gnome/gntext.c ../win/gnome/gntext.h ../win/gnome/gnmain.h \ gntext.o: ../win/gnome/gntext.c ../win/gnome/gntext.h $(CONFIG_H) \
../win/gnome/gn_rip.h ../win/gnome/gnmain.h ../win/gnome/gn_rip.h
$(CC) $(CFLAGS) $(GNOMEINC) -c -o $@ ../win/gnome/gntext.c $(CC) $(CFLAGS) $(GNOMEINC) -c -o $@ ../win/gnome/gntext.c
gnyesno.o: ../win/gnome/gnyesno.c ../win/gnome/gnbind.h ../win/gnome/gnyesno.h 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
$(CC) $(CFLAGS) $(GNOMEINC) -c -o $@ ../win/gnome/gnyesno.c $(CC) $(CFLAGS) $(GNOMEINC) -c -o $@ ../win/gnome/gnyesno.c
gnworn.o: ../win/gnome/gnworn.c ../win/gnome/gnworn.h ../win/gnome/gnglyph.h \ gnworn.o: ../win/gnome/gnworn.c ../win/gnome/gnworn.h $(CONFIG_H) \
../win/gnome/gnsignal.h ../win/gnome/gnomeprv.h ../win/gnome/gnglyph.h ../win/gnome/gnsignal.h \
../win/gnome/gnomeprv.h $(HACK_H) ../include/dlb.h \
../include/patchlevel.h ../include/winGnome.h
$(CC) $(CFLAGS) $(GNOMEINC) -c -o $@ ../win/gnome/gnworn.c $(CC) $(CFLAGS) $(GNOMEINC) -c -o $@ ../win/gnome/gnworn.c
wingem.o: ../win/gem/wingem.c $(HACK_H) ../include/func_tab.h ../include/dlb.h \ wingem.o: ../win/gem/wingem.c $(HACK_H) ../include/func_tab.h ../include/dlb.h \
../include/patchlevel.h ../include/wingem.h ../include/patchlevel.h ../include/wingem.h
@@ -894,11 +931,14 @@ tile.o: tile.c $(HACK_H)
cppregex.o: ../sys/share/cppregex.cpp cppregex.o: ../sys/share/cppregex.cpp
$(CXX) $(CXXFLAGS) -c -o $@ ../sys/share/cppregex.cpp $(CXX) $(CXXFLAGS) -c -o $@ ../sys/share/cppregex.cpp
qt_bind.o: ../win/Qt/qt_bind.cpp $(HACK_H) ../win/Qt/qt_bind.h \ qt_bind.o: ../win/Qt/qt_bind.cpp $(HACK_H) ../win/Qt/qt_bind.h \
../win/Qt/qt_click.h ../win/Qt/qt_delay.h ../win/Qt/qt_xcmd.h \ ../win/Qt/qt_main.h ../win/Qt/qt_kde0.h ../win/Qt/qt_click.h \
../win/Qt/qt_key.h ../win/Qt/qt_map.h ../win/Qt/qt_menu.h \ ../win/Qt/qt_delay.h ../win/Qt/qt_xcmd.h ../win/Qt/qt_key.h \
../win/Qt/qt_msg.h ../win/Qt/qt_plsel.h ../win/Qt/qt_svsel.h \ ../win/Qt/qt_map.h ../win/Qt/qt_win.h ../win/Qt/qt_clust.h \
../win/Qt/qt_set.h ../win/Qt/qt_stat.h ../win/Qt/qt_streq.h \ ../win/Qt/qt_menu.h ../win/Qt/qt_rip.h ../win/Qt/qt_msg.h \
../win/Qt/qt_yndlg.h ../win/Qt/qt_str.h ../include/dlb.h ../win/Qt/qt_plsel.h ../win/Qt/qt_svsel.h ../win/Qt/qt_set.h \
../win/Qt/qt_stat.h ../win/Qt/qt_icon.h ../win/Qt/qt_streq.h \
../win/Qt/qt_line.h ../win/Qt/qt_yndlg.h ../win/Qt/qt_str.h \
../include/dlb.h
$(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_bind.cpp $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_bind.cpp
qt_click.o: ../win/Qt/qt_click.cpp $(HACK_H) ../win/Qt/qt_click.h qt_click.o: ../win/Qt/qt_click.cpp $(HACK_H) ../win/Qt/qt_click.h
$(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_click.cpp $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_click.cpp
@@ -919,56 +959,76 @@ qt_key.o: ../win/Qt/qt_key.cpp $(HACK_H) ../win/Qt/qt_key.h
qt_line.o: ../win/Qt/qt_line.cpp $(HACK_H) ../win/Qt/qt_line.h qt_line.o: ../win/Qt/qt_line.cpp $(HACK_H) ../win/Qt/qt_line.h
$(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_line.cpp $(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) ../include/patchlevel.h \
../win/Qt/qt_main.h qt_main.moc ../win/Qt/qt_bind.h \ ../win/Qt/qt_main.h ../win/Qt/qt_kde0.h qt_main.moc \
../win/Qt/qt_glyph.h ../win/Qt/qt_inv.h ../win/Qt/qt_key.h \ ../win/Qt/qt_bind.h ../win/Qt/qt_glyph.h ../win/Qt/qt_inv.h \
../win/Qt/qt_map.h ../win/Qt/qt_msg.h ../win/Qt/qt_set.h \ ../win/Qt/qt_key.h ../win/Qt/qt_map.h ../win/Qt/qt_win.h \
../win/Qt/qt_stat.h ../win/Qt/qt_str.h qt_kde0.moc ../win/Qt/qt_clust.h ../win/Qt/qt_msg.h ../win/Qt/qt_set.h \
../win/Qt/qt_stat.h ../win/Qt/qt_icon.h ../win/Qt/qt_str.h \
qt_kde0.moc
$(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_main.cpp $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_main.cpp
qt_map.o: ../win/Qt/qt_map.cpp $(HACK_H) ../win/Qt/qt_map.h qt_map.moc \ qt_map.o: ../win/Qt/qt_map.cpp $(HACK_H) ../win/Qt/qt_map.h ../win/Qt/qt_win.h \
../win/Qt/qt_click.h ../win/Qt/qt_glyph.h ../include/qt_xpms.h \ ../win/Qt/qt_clust.h qt_map.moc ../win/Qt/qt_click.h \
../win/Qt/qt_set.h ../win/Qt/qt_str.h ../win/Qt/qt_glyph.h ../win/Qt/qt_xpms.h ../win/Qt/qt_set.h \
$(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_map.cpp
qt_menu.o: ../win/Qt/qt_menu.cpp $(HACK_H) ../win/Qt/qt_menu.h qt_menu.moc \
../win/Qt/qt_glyph.h ../win/Qt/qt_set.h ../win/Qt/qt_streq.h \
../win/Qt/qt_str.h ../win/Qt/qt_str.h
$(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_map.cpp
qt_menu.o: ../win/Qt/qt_menu.cpp $(HACK_H) ../win/Qt/qt_menu.h \
../win/Qt/qt_win.h ../win/Qt/qt_rip.h qt_menu.moc \
../win/Qt/qt_glyph.h ../win/Qt/qt_set.h ../win/Qt/qt_streq.h \
../win/Qt/qt_line.h ../win/Qt/qt_str.h
$(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_menu.cpp $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_menu.cpp
qt_msg.o: ../win/Qt/qt_msg.cpp $(HACK_H) ../win/Qt/qt_msg.h qt_msg.moc \ qt_msg.o: ../win/Qt/qt_msg.cpp $(HACK_H) ../win/Qt/qt_msg.h ../win/Qt/qt_win.h \
../win/Qt/qt_map.h ../win/Qt/qt_set.h ../win/Qt/qt_str.h qt_msg.moc ../win/Qt/qt_map.h ../win/Qt/qt_clust.h \
../win/Qt/qt_set.h ../win/Qt/qt_str.h
$(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_msg.cpp $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_msg.cpp
qt_plsel.o: ../win/Qt/qt_plsel.cpp $(HACK_H) ../win/Qt/qt_plsel.h qt_plsel.moc \ qt_plsel.o: ../win/Qt/qt_plsel.cpp $(HACK_H) ../win/Qt/qt_plsel.h qt_plsel.moc \
../win/Qt/qt_bind.h ../win/Qt/qt_glyph.h ../win/Qt/qt_set.h \ ../win/Qt/qt_bind.h ../win/Qt/qt_main.h ../win/Qt/qt_kde0.h \
../win/Qt/qt_str.h ../win/Qt/qt_glyph.h ../win/Qt/qt_set.h ../win/Qt/qt_str.h
$(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_plsel.cpp $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_plsel.cpp
qt_rip.o: ../win/Qt/qt_rip.cpp $(HACK_H) ../win/Qt/qt_rip.h \ qt_rip.o: ../win/Qt/qt_rip.cpp $(HACK_H) ../win/Qt/qt_rip.h \
../win/Qt/qt_bind.h ../win/Qt/qt_str.h ../win/Qt/qt_bind.h ../win/Qt/qt_main.h ../win/Qt/qt_kde0.h \
../win/Qt/qt_str.h
$(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_rip.cpp $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_rip.cpp
qt_set.o: ../win/Qt/qt_set.cpp $(HACK_H) ../win/Qt/qt_set.h qt_set.moc \ qt_set.o: ../win/Qt/qt_set.cpp $(HACK_H) ../win/Qt/qt_set.h qt_set.moc \
../win/Qt/qt_glyph.h ../win/Qt/qt_str.h ../win/Qt/qt_glyph.h ../win/Qt/qt_str.h
$(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_set.cpp $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_set.cpp
qt_stat.o: ../win/Qt/qt_stat.cpp $(HACK_H) ../win/Qt/qt_stat.h qt_stat.moc \ qt_stat.o: ../win/Qt/qt_stat.cpp $(HACK_H) ../win/Qt/qt_stat.h \
../win/Qt/qt_set.h ../win/Qt/qt_str.h ../include/qt_xpms.h ../win/Qt/qt_win.h ../win/Qt/qt_icon.h qt_stat.moc \
../win/Qt/qt_set.h ../win/Qt/qt_str.h ../win/Qt/qt_xpms.h
$(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_stat.cpp $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_stat.cpp
qt_str.o: ../win/Qt/qt_str.cpp ../win/Qt/qt_str.h qt_str.o: ../win/Qt/qt_str.cpp ../win/Qt/qt_str.h
$(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_str.cpp $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_str.cpp
qt_streq.o: ../win/Qt/qt_streq.cpp $(HACK_H) ../win/Qt/qt_streq.h \ qt_streq.o: ../win/Qt/qt_streq.cpp $(HACK_H) ../win/Qt/qt_streq.h \
../win/Qt/qt_str.h ../win/Qt/qt_line.h ../win/Qt/qt_str.h
$(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_streq.cpp $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_streq.cpp
qt_svsel.o: ../win/Qt/qt_svsel.cpp $(HACK_H) ../win/Qt/qt_svsel.h \ qt_svsel.o: ../win/Qt/qt_svsel.cpp $(HACK_H) ../win/Qt/qt_svsel.h \
../win/Qt/qt_bind.h ../win/Qt/qt_str.h ../win/Qt/qt_bind.h ../win/Qt/qt_main.h ../win/Qt/qt_kde0.h \
../win/Qt/qt_str.h
$(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_svsel.cpp $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_svsel.cpp
qt_win.o: ../win/Qt/qt_win.cpp $(HACK_H) ../win/Qt/qt_win.h \ qt_win.o: ../win/Qt/qt_win.cpp $(HACK_H) ../win/Qt/qt_win.h \
../win/Qt/qt_bind.h ../win/Qt/qt_click.h ../win/Qt/qt_glyph.h \ ../win/Qt/qt_bind.h ../win/Qt/qt_main.h ../win/Qt/qt_kde0.h \
../win/Qt/qt_inv.h ../win/Qt/qt_key.h ../win/Qt/qt_icon.h \ ../win/Qt/qt_click.h ../win/Qt/qt_glyph.h ../win/Qt/qt_inv.h \
../win/Qt/qt_map.h ../win/Qt/qt_menu.h ../win/Qt/qt_msg.h \ ../win/Qt/qt_key.h ../win/Qt/qt_icon.h ../win/Qt/qt_map.h \
../win/Qt/qt_set.h ../win/Qt/qt_clust.h ../win/Qt/qt_clust.h ../win/Qt/qt_menu.h ../win/Qt/qt_rip.h \
../win/Qt/qt_msg.h ../win/Qt/qt_set.h
$(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_win.cpp $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_win.cpp
qt_xcmd.o: ../win/Qt/qt_xcmd.cpp $(HACK_H) ../include/func_tab.h \ qt_xcmd.o: ../win/Qt/qt_xcmd.cpp $(HACK_H) ../include/func_tab.h \
../win/Qt/qt_xcmd.h qt_xcmd.moc ../win/Qt/qt_bind.h \ ../win/Qt/qt_xcmd.h qt_xcmd.moc ../win/Qt/qt_bind.h \
../win/Qt/qt_set.h ../win/Qt/qt_str.h ../win/Qt/qt_main.h ../win/Qt/qt_kde0.h ../win/Qt/qt_set.h \
../win/Qt/qt_str.h
$(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_xcmd.cpp $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_xcmd.cpp
qt_yndlg.o: ../win/Qt/qt_yndlg.cpp $(HACK_H) ../win/Qt/qt_yndlg.h qt_yndlg.moc \ qt_yndlg.o: ../win/Qt/qt_yndlg.cpp $(HACK_H) ../win/Qt/qt_yndlg.h qt_yndlg.moc \
../win/Qt/qt_str.h ../win/Qt/qt_str.h
$(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_yndlg.cpp $(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 \
../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
$(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt3/qt3_win.cpp
qt3_clust.o: ../win/Qt3/qt3_clust.cpp ../win/Qt3/qt3_clust.h
$(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt3/qt3_clust.cpp
qt3tableview.o: ../win/Qt3/qt3tableview.cpp ../win/Qt3/qt3tableview.h
$(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt3/qt3tableview.cpp
wc_chainin.o: ../win/chain/wc_chainin.c $(HACK_H) wc_chainin.o: ../win/chain/wc_chainin.c $(HACK_H)
$(CC) $(CFLAGS) -c -o $@ ../win/chain/wc_chainin.c $(CC) $(CFLAGS) -c -o $@ ../win/chain/wc_chainin.c
wc_chainout.o: ../win/chain/wc_chainout.c $(HACK_H) wc_chainout.o: ../win/chain/wc_chainout.c $(HACK_H)

29
sys/unix/depend.awk
View File

@@ -1,6 +1,6 @@
# depend.awk -- awk script used to construct makefile dependencies # depend.awk -- awk script used to construct makefile dependencies
# for nethack's source files (`make depend' support for Makefile.src). # for nethack's source files (`make depend' support for Makefile.src).
# $NHDT-Date: 1546220373 2018/12/31 01:39:33 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.8 $ # $NHDT-Date: 1575916941 2019/12/09 18:42:21 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.10 $
# #
# usage: # usage:
# cd src ; nawk -f depend.awk ../include/*.h list-of-.c/.cpp-files # cd src ; nawk -f depend.awk ../include/*.h list-of-.c/.cpp-files
@@ -43,20 +43,23 @@ FNR == 1 { output_dep() #finish previous file
#[3.6.2: curses headers likewise] #[3.6.2: curses headers likewise]
#[3.7.0: Qt headers have moved] #[3.7.0: Qt headers have moved]
if (incl ~ /\.h$/) { if (incl ~ /\.h$/) {
if (incl ~ "curses\.h") if (incl ~ "curses\.h")
incl = "" # skip "curses.h"; it should be <curses.h> incl = "" # skip "curses.h"; it should be <curses.h>
else if (incl ~ /^..\/lib\/lua-.*\/src\/l/) else if (incl ~ /^..\/lib\/lua-.*\/src\/l/)
incl = "" # skip lua headers incl = "" # skip lua headers
else if (incl ~ /^curs/) # curses special case else if (incl ~ /^curs/) # curses special case
incl = "../win/curses/" incl incl = "../win/curses/" incl
else if (incl ~ /^qtext.h/) # qtext.h special case else if (incl ~ /^qt/) { # Qt special cases
incl = "../include/" incl # qtext.h is a core header that accidentally matches...
else if (incl ~ /^qt_xpms.h/) # qt_xpms.h special case if (incl ~ /^qtext.h/) # ...the Qt exception
incl = "../include/" incl incl = "../include/" incl
else if (incl ~ /^qt/) # Qt v4 special case # Qt v3 headers are in ../win/Qt3
incl = "../win/Qt/" incl # Qt v4/v5 headers are in ../win/Qt
else if (incl ~ /^gn/) # gnomehack special case else if (FILENAME ~ /^\.\.\/win\/Qt3\/.*/)
incl = "../win/Qt3/" incl
else # Qt v4
incl = "../win/Qt/" incl
} else if (incl ~ /^gn/) # gnomehack special case
incl = "../win/gnome/" incl incl = "../win/gnome/" incl
else else
incl = "../include/" incl incl = "../include/" incl
@@ -108,7 +111,7 @@ function output_specials( i, sp, alt_sp)
# write a target and its dependency list in pretty-printed format; # write a target and its dependency list in pretty-printed format;
# if target's primary source file has a path prefix, also write build command # if target's primary source file has a path prefix, also write build command
# #
function format_dep(target, source, n, i, list) function format_dep(target, source, col, n, i, list)
{ {
split("", done) #``for (x in done) delete done[x]'' split("", done) #``for (x in done) delete done[x]''
printf("%s:", target); col = length(target) + 1 printf("%s:", target); col = length(target) + 1

0
include/qt_xpms.h → win/Qt/qt_xpms.h
View File

4
win/Qt3/qt_clust.cpp → win/Qt3/qt3_clust.cpp
View File

@@ -1,7 +1,7 @@
/* NetHack 3.6 qt_clust.cpp $NHDT-Date: 1524684507 2018/04/25 19:28:27 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.8 $ */ /* NetHack 3.6 qt_clust.cpp $NHDT-Date: 1575917719 2019/12/09 18:55:19 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.0 $ */
/* Copyright (c) Warwick Allison, 1999. */ /* Copyright (c) Warwick Allison, 1999. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
#include "qt_clust.h" #include "qt3_clust.h"
static static
void include(QRect& r, const QRect& rect) void include(QRect& r, const QRect& rect)

0
include/qt_clust.h → win/Qt3/qt3_clust.h
View File

0
include/qt_kde0.h → win/Qt3/qt3_kde0.h
View File

14
win/Qt3/qt_win.cpp → win/Qt3/qt3_win.cpp
View File

@@ -1,4 +1,4 @@
// NetHack 3.6 qt_win.cpp $NHDT-Date: 1524684508 2018/04/25 19:28:28 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.77 $ // NetHack 3.6 qt_win.cpp $NHDT-Date: 1575917720 2019/12/09 18:55:20 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.0 $
// Copyright (c) Warwick Allison, 1999. // Copyright (c) Warwick Allison, 1999.
// NetHack may be freely redistributed. See license for details. // NetHack may be freely redistributed. See license for details.
@@ -74,7 +74,7 @@ extern "C" {
} }
#include "qt_win.h" #include "qt3_win.h"
#include <qregexp.h> #include <qregexp.h>
#include <qpainter.h> #include <qpainter.h>
#include <qdir.h> #include <qdir.h>
@@ -98,8 +98,8 @@ extern "C" {
#include <ctype.h> #include <ctype.h>
#include "qt_clust.h" #include "qt3_clust.h"
#include "qt_xpms.h" #include "qt3_xpms.h"
#include <dirent.h> #include <dirent.h>
#ifdef Q_WS_MACX #ifdef Q_WS_MACX
@@ -5303,10 +5303,10 @@ extern "C" void play_usersound(const char* filename, int volume)
#endif #endif
} }
#include "qt_win.moc" #include "qt3_win.moc"
#ifndef KDE #ifndef KDE
#include "qt_kde0.moc" #include "qt3_kde0.moc"
#endif #endif
#if QT_VERSION >= 300 #if QT_VERSION >= 300
#include "qttableview.moc" #include "qt3tableview.moc"
#endif #endif

6
include/qt_win.h → win/Qt3/qt3_win.h
View File

@@ -1,4 +1,4 @@
// NetHack 3.6 qt_win.h $NHDT-Date: 1447755972 2015/11/17 10:26:12 $ $NHDT-Branch: master $:$NHDT-Revision: 1.17 $ // NetHack 3.6 qt_win.h $NHDT-Date: 1575917700 2019/12/09 18:55:00 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.0 $
// Copyright (c) Warwick Allison, 1999. // Copyright (c) Warwick Allison, 1999.
// NetHack may be freely redistributed. See license for details. // NetHack may be freely redistributed. See license for details.
// //
@@ -52,7 +52,7 @@
#include <ktopwidget.h> #include <ktopwidget.h>
#endif #endif
#include "qt_clust.h" #include "qt3_clust.h"
class QVBox; class QVBox;
class QMenuBar; class QMenuBar;
@@ -737,7 +737,7 @@ class NetHackQtInvUsageWindow : public QWidget
// note the actual class of the windows. // note the actual class of the windows.
// //
#ifndef KDE #ifndef KDE
#include "qt_kde0.h" #include "qt3_kde0.h"
#endif #endif
class NetHackQtMainWindow : public KTopLevelWidget class NetHackQtMainWindow : public KTopLevelWidget

1422
win/Qt3/qt3_xpms.h Normal file
View File

File diff suppressed because it is too large Load Diff

4
win/Qt3/qttableview.cpp → win/Qt3/qt3tableview.cpp
View File

@@ -1,5 +1,5 @@
/********************************************************************** /**********************************************************************
** $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.4 $ $NHDT-Date: 1524684508 2018/04/25 19:28:28 $ ** $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.0 $ $NHDT-Date: 1575917720 2019/12/09 18:55:20 $
** $Id: qttableview.cpp,v 1.2 2002/03/09 03:13:15 jwalz Exp $ ** $Id: qttableview.cpp,v 1.2 2002/03/09 03:13:15 jwalz Exp $
** **
** Implementation of QtTableView class ** Implementation of QtTableView class
@@ -13,7 +13,7 @@
** **
**********************************************************************/ **********************************************************************/
#include "qttableview.h" #include "qt3tableview.h"
#if QT_VERSION >= 300 #if QT_VERSION >= 300
#ifndef QT_NO_QTTABLEVIEW #ifndef QT_NO_QTTABLEVIEW
#include <qscrollbar.h> #include <qscrollbar.h>

0
include/qttableview.h → win/Qt3/qt3tableview.h
View File