diff options
| author | Michael Goddard <michael.goddard@nokia.com> | 2012-06-27 17:07:44 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-27 09:12:48 +0200 |
| commit | 6f7867b5e9087b2355462d3b24ae39f3af0a73ad (patch) | |
| tree | 583525caa1d74f2aeda0ca3b9e9d0e6bba181daf /src/imports/audioengine | |
| parent | 909576da6a3f83e196f9168ef173caacb202e5d2 (diff) | |
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>
Diffstat (limited to 'src/imports/audioengine')
| -rw-r--r-- | src/imports/audioengine/audioengine.pro | 9 | ||||
| -rw-r--r-- | src/imports/audioengine/qaudioengine_openal_p.h | 5 |
2 files changed, 9 insertions, 5 deletions
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" |