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

Fix QTCXXFLAGS and WINLIB when compiling with WANT_WINT_QT6.

Browse Source 
The previous code made incorrect assumptions about Qt6's file hierarchy. Reuse automatic configuration (with pkg-config) for Qt5, and replace '5' by '6'.
Also fix a typo in multiw-2.370.
This commit is contained in:
Hector Denis
2025-11-05 18:20:55 +01:00
parent db8e76ffd1
commit 4e29db079b
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sys/unix/hints/include/multiw-2.370
View File

@@ -15,7 +15,7 @@
# - WINOBJ0 # - WINOBJ0
#--- #---
# User selections could be specified as combinations of any of the following: # User selections could be specified as combinations of any of the following:
# WIN_WANT_TTY=1, WIN_WANT_CURSES=1, WIN_WANT_QT=1, WIN_WANT_X11=1 # WANT_WIN_TTY=1, WANT_WIN_CURSES=1, WANT_WIN_QT=1, WANT_WIN_X11=1
# The selections will all be linked into the same binary. # The selections will all be linked into the same binary.
# #
# Assuming you have the prerequisite packages mentioned above, you can # Assuming you have the prerequisite packages mentioned above, you can

8
sys/unix/hints/macOS.370
View File

@@ -281,12 +281,12 @@ WINLIB += $(shell PKG_CONFIG_PATH=$(QTDIR)/lib/pkgconfig \
pkg-config Qt5Gui Qt5Widgets Qt5Multimedia --libs) pkg-config Qt5Gui Qt5Widgets Qt5Multimedia --libs)
endif # WANT_WIN_QT5 endif # WANT_WIN_QT5
ifdef WANT_WIN_QT6 ifdef WANT_WIN_QT6
QTCXXFLAGS += -std=c++17 -I $(QTDIR)/include -I $(QTDIR)/include/QtCore \ QTCXXFLAGS += $(sort $(shell PKG_CONFIG_PATH=$(QTDIR)/lib/pkgconfig \
-I $(QTDIR)/include/QtMultimedia pkg-config Qt6Gui Qt6Widgets Qt6Multimedia --cflags))
MOC = moc MOC = moc
MOCPATH = $(QTDIR)/share/qt/libexec/moc MOCPATH = $(QTDIR)/share/qt/libexec/moc
WINLIB += -F $(QTDIR)/Frameworks -framework QtCore -framework QtGui \ WINLIB += $(shell PKG_CONFIG_PATH=$(QTDIR)/lib/pkgconfig \
-framework QtWidgets -framework QtMultimedia pkg-config Qt6Gui Qt6Widgets Qt6Multimedia --libs)
endif # WANT_WIN_QT6 endif # WANT_WIN_QT6
VARDATND0 += nhtiles.bmp rip.xpm nhsplash.xpm VARDATND0 += nhtiles.bmp rip.xpm nhsplash.xpm
# XXX if /Developer/qt exists and QTDIR not set, use that # XXX if /Developer/qt exists and QTDIR not set, use that