diff options
| -rw-r--r-- | config.tests/openal/main.cpp | 4 | ||||
| -rw-r--r-- | config.tests/openal/openal.pro | 9 | ||||
| -rw-r--r-- | src/imports/audioengine/audioengine.pro | 9 | ||||
| -rw-r--r-- | src/imports/audioengine/qaudioengine_openal_p.h | 5 |
4 files changed, 17 insertions, 10 deletions
diff --git a/config.tests/openal/main.cpp b/config.tests/openal/main.cpp index 695306270..0675a6320 100644 --- a/config.tests/openal/main.cpp +++ b/config.tests/openal/main.cpp @@ -39,7 +39,11 @@ ** ****************************************************************************/ +#if defined(HEADER_OPENAL_PREFIX) +#include <OpenAL/al.h> +#else #include <AL/al.h> +#endif int main(int argc, char** argv) { diff --git a/config.tests/openal/openal.pro b/config.tests/openal/openal.pro index c0e6e5761..28c4b9528 100644 --- a/config.tests/openal/openal.pro +++ b/config.tests/openal/openal.pro @@ -1,7 +1,6 @@ SOURCES += main.cpp -win32 { - LIBS += -lOpenAL32 -}else { - LIBS += -lopenal -} +win32: LIBS += -lOpenAL32 +unix:!mac: LIBS += -lopenal +mac: LIBS += -framework OpenAL +mac: DEFINES += HEADER_OPENAL_PREFIX diff --git a/src/imports/audioengine/audioengine.pro b/src/imports/audioengine/audioengine.pro index c15576447..4659b76e3 100644 --- a/src/imports/audioengine/audioengine.pro +++ b/src/imports/audioengine/audioengine.pro @@ -4,11 +4,10 @@ TARGETPATH = QtAudioEngine include(../qimportbase.pri) QT += quick qml multimedia-private -win32 { - LIBS += -lOpenAL32 -}else { - LIBS += -lopenal -} +win32: LIBS += -lOpenAL32 +unix:!mac: LIBS += -lopenal +mac: LIBS += -framework OpenAL +mac: DEFINES += HEADER_OPENAL_PREFIX DESTDIR = $$QT.multimedia.imports/$$TARGETPATH target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH diff --git a/src/imports/audioengine/qaudioengine_openal_p.h b/src/imports/audioengine/qaudioengine_openal_p.h index bac62189a..3e34145a8 100644 --- a/src/imports/audioengine/qaudioengine_openal_p.h +++ b/src/imports/audioengine/qaudioengine_openal_p.h @@ -47,8 +47,13 @@ #include <QMap> #include <QTimer> +#if defined(HEADER_OPENAL_PREFIX) +#include <OpenAL/al.h> +#include <OpenAL/alc.h> +#else #include <AL/al.h> #include <AL/alc.h> +#endif #include "qsoundsource_p.h" #include "qsoundbuffer_p.h" |