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

Revert "Qt6 QSoundEffect on macOS"

Browse Source 
This reverts commit f6149904c3.
This commit is contained in:
nhmall
2022-04-27 19:00:18 -04:00
parent e8184663e0
commit 75f3008123
2 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -163,7 +163,7 @@ 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
MOC = moc MOC = moc
MOCPATH = $(QTDIR)/share/qt/libexec/moc MOCPATH = $(QTDIR)/share/qt/libexec/moc
WINLIB += -F $(QTDIR)/Frameworks -framework QtCore -framework QtGui -framework QtWidgets -framework QtMultimedia WINLIB += -F $(QTDIR)/Frameworks -framework QtCore -framework QtGui -framework QtWidgets
endif # WANT_WIN_QT6 endif # WANT_WIN_QT6
WINSRC += $(WINQTSRC) WINSRC += $(WINQTSRC)
WINOBJ0 += $(WINQTOBJ) WINOBJ0 += $(WINQTOBJ)

4
win/Qt/qt_bind.cpp
View File

@@ -19,11 +19,7 @@ extern "C" {
#else #else
/* Qt6 or above */ /* Qt6 or above */
#include <QtWidgets/QtWidgets> #include <QtWidgets/QtWidgets>
#ifdef MACOS
#include <QtMultimedia/QSoundEffect>
#else
#include <QSoundEffect> #include <QSoundEffect>
#endif
#endif /* QT_VERSION */ #endif /* QT_VERSION */
#include "qt_post.h" #include "qt_post.h"
#include "qt_bind.h" #include "qt_bind.h"