Fix header path for audio engine on Mac.

There's a different prefix here.

Change-Id: Ifda82e19824801b1d903ab6ad40c97428fff236c
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>

diff --git a/config.tests/openal/main.cpp b/config.tests/openal/main.cpp
index 6953062..0675a63 100644 (file)
--- 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 c0e6e57..28c4b95 100644 (file)
--- 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 c155764..4659b76 100644 (file)
--- 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 bac6218..3e34145 100644 (file)
--- 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"