]> granicus.if.org Git - nethack/commitdiff
Qt6 QSoundEffect on macOS
authornhmall <nhmall@nethack.org>
Wed, 27 Apr 2022 17:56:01 +0000 (13:56 -0400)
committernhmall <nhmall@nethack.org>
Wed, 27 Apr 2022 17:56:01 +0000 (13:56 -0400)
sys/unix/hints/macOS.370
win/Qt/qt_bind.cpp

index 088b3cdd45f07697adb37a4bae5fee0278d779df..6ff3931ff2381158699b83cf01fd52660d58a5fb 100755 (executable)
@@ -163,7 +163,7 @@ ifdef WANT_WIN_QT6
 QTCXXFLAGS += -std=c++17 -I $(QTDIR)/include -I $(QTDIR)/include/QtCore
 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)
index 2ddace2549b8b5a8ac19d0f62572e69aaf8d470e..e013c0b78991028ea2d5b8aa2f986ed9a6a02cd8 100644 (file)
@@ -19,7 +19,11 @@ extern "C" {
 #else
 /* Qt6 or above */
 #include <QtWidgets/QtWidgets>
+#ifdef MACOS
+#include <QtMultimedia/QSoundEffect>
+#else
 #include <QSoundEffect>
+#endif
 #endif  /* QT_VERSION */
 #include "qt_post.h"
 #include "qt_bind.h"