Qt install dependencies

Playground setup:  Qt does not use external files pet_mark.xbm and
pilemark.xbm, it has pixmaps for those compiled in via qt_xpms.h.
Presumably because the pet mark heart has two sizes there.

diff --git a/sys/unix/hints/linux.2020 b/sys/unix/hints/linux.2020
index 0bdce7bad28f3a3efcdb7a1655076c0a6faff54d..df2bfc671902719e24f5572c726b5f91dedc1659 100755 (executable)
--- a/sys/unix/hints/linux.2020
+++ b/sys/unix/hints/linux.2020
@@ -1,4 +1,4 @@
-# NetHack 3.7  linux.2020 $NHDT-Date: 1597332698 2020/08/13 15:31:38 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.5 $
+# NetHack 3.7  linux.2020 $NHDT-Date: 1597704792 2020/08/17 22:53:12 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.7 $
 # Copyright (c) Kenneth Lorber, Kensington, Maryland, 2007.
 # NetHack may be freely redistributed.  See license for details. 
 #
@@ -130,7 +130,7 @@ QTCXXFLAGS += -Wno-deprecated-declarations
 QTCXXFLAGS += $(shell PKG_CONFIG_PATH=$(QTDIR)/lib/pkgconfig pkg-config Qt5Gui Qt5Widgets Qt5Multimedia --cflags)
 QTCXXFLAGS += -fPIC
 WINLIB += $(shell PKG_CONFIG_PATH=$(QTDIR)/lib/pkgconfig pkg-config Qt5Gui Qt5Widgets Qt5Multimedia --libs)
-VARDATND0 += nhtiles.bmp rip.xpm nhsplash.xpm pet_mark.xbm pilemark.xbm
+VARDATND0 += nhtiles.bmp rip.xpm nhsplash.xpm
 # XXX if /Developer/qt exists and QTDIR not set, use that
 ifndef QTDIR
 $(error QTDIR not defined in the environment or Makefile)

diff --git a/sys/unix/hints/macOS.2020 b/sys/unix/hints/macOS.2020
index 2783234188f40d5a385fb0833f0c9ba6d3d9c881..31b92dba2115275c57f466a5f85d86d0779ba66b 100755 (executable)
--- a/sys/unix/hints/macOS.2020
+++ b/sys/unix/hints/macOS.2020
@@ -1,4 +1,4 @@
-# NetHack 3.7  macOS.2020 $NHDT-Date: 1597332721 2020/08/13 15:32:01 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.67 $
+# NetHack 3.7  macOS.2020 $NHDT-Date: 1597704793 2020/08/17 22:53:13 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.69 $
 # Copyright (c) Kenneth Lorber, Kensington, Maryland, 2015.
 # NetHack may be freely redistributed.  See license for details.
 #
@@ -136,7 +136,7 @@ QTCXXFLAGS += $(shell PKG_CONFIG_PATH=$(QTDIR)/lib/pkgconfig pkg-config Qt5Gui Q
 WINLIB += $(shell PKG_CONFIG_PATH=$(QTDIR)/lib/pkgconfig pkg-config Qt5Gui Qt5Widgets Qt5Multimedia --libs)
 WINSRC += $(WINQTSRC)
 WINOBJ0 += $(WINQTOBJ)
-VARDATND0 += nhtiles.bmp rip.xpm nhsplash.xpm pet_mark.xbm pilemark.xbm
+VARDATND0 += nhtiles.bmp rip.xpm nhsplash.xpm
 # XXX if /Developer/qt exists and QTDIR not set, use that
 ifndef QTDIR
 $(error QTDIR not defined in the environment or Makefile)

diff --git a/sys/unix/hints/macosx10.10-qt b/sys/unix/hints/macosx10.10-qt
index f23452672d313660491c4f2fcfac0d17beca2d63..35b83213b37418b2a91b6b000d39714253d774ee 100644 (file)
--- a/sys/unix/hints/macosx10.10-qt
+++ b/sys/unix/hints/macosx10.10-qt
@@ -1,5 +1,5 @@
 #
-# NetHack 3.7  macosx10.10-qt $NHDT-Date: 1596498421 2020/08/03 23:47:01 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.62 $
+# NetHack 3.7  macosx10.10-qt $NHDT-Date: 1597704795 2020/08/17 22:53:15 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.63 $
 # Copyright (c) Kenneth Lorber, Kensington, Maryland, 2015.
 # NetHack may be freely redistributed.  See license for details.
 #
@@ -145,7 +145,7 @@ QTCXXFLAGS += $(shell PKG_CONFIG_PATH=$(QTDIR)/lib/pkgconfig pkg-config Qt5Gui Q
 WINLIB += $(shell PKG_CONFIG_PATH=$(QTDIR)/lib/pkgconfig pkg-config Qt5Gui Qt5Widgets Qt5Multimedia --libs)
 WINSRC += $(WINQTSRC)
 WINOBJ0 += $(WINQTOBJ)
-VARDATND0 = nhtiles.bmp rip.xpm nhsplash.xpm pet_mark.xbm pilemark.xbm
+VARDATND0 = nhtiles.bmp rip.xpm nhsplash.xpm
 MOC = moc
 
 # XXX if /Developer/qt exists and QTDIR not set, use that