]> granicus.if.org Git - nethack/commitdiff
revisit Qt6 macOS QSoundEffect
authornhmall <nhmall@nethack.org>
Wed, 27 Apr 2022 23:06:06 +0000 (19:06 -0400)
committernhmall <nhmall@nethack.org>
Wed, 27 Apr 2022 23:06:06 +0000 (19:06 -0400)
- After reverting previous related commit, add the QtMultimedia folder to
the include search path as suggested by PatR, and leave qt_bind.cpp alone

sys/unix/hints/macOS.370

index 088b3cdd45f07697adb37a4bae5fee0278d779df..90fe5bb3944a8389a701a527b628a6eb7ee88d23 100755 (executable)
@@ -160,10 +160,10 @@ QTCXXFLAGS += $(sort $(shell PKG_CONFIG_PATH=$(QTDIR)/lib/pkgconfig pkg-config Q
 WINLIB += $(shell PKG_CONFIG_PATH=$(QTDIR)/lib/pkgconfig pkg-config Qt5Gui Qt5Widgets Qt5Multimedia --libs)
 endif    # WANT_WIN_QT5
 ifdef WANT_WIN_QT6
-QTCXXFLAGS += -std=c++17 -I $(QTDIR)/include -I $(QTDIR)/include/QtCore
+QTCXXFLAGS += -std=c++17 -I $(QTDIR)/include -I $(QTDIR)/include/QtCore -I $(QTDIR)/include/QtMultimedia
 MOC = moc
 MOCPATH = $(QTDIR)/share/qt/libexec/moc
-WINLIB += -F $(QTDIR)/Frameworks -framework QtCore -framework QtGui -framework QtWidgets
+WINLIB += -F $(QTDIR)/Frameworks -framework QtCore -framework QtGui -framework QtWidgets -framework QtMultimedia
 endif    # WANT_WIN_QT6
 WINSRC += $(WINQTSRC)
 WINOBJ0 += $(WINQTOBJ)