slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix header path for audio engine on Mac.

Browse Source 
There's a different prefix here.

Change-Id: Ifda82e19824801b1d903ab6ad40c97428fff236c
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
This commit is contained in:
Michael Goddard
2012-06-27 17:07:44 +10:00
committed by Qt by Nokia
parent 909576da6a
commit 6f7867b5e9
4 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config.tests/openal/main.cpp
View File

@@ -39,7 +39,11 @@
** **
****************************************************************************/ ****************************************************************************/
#if defined(HEADER_OPENAL_PREFIX)
#include <OpenAL/al.h>
#else
#include <AL/al.h> #include <AL/al.h>
#endif
int main(int argc, char** argv) int main(int argc, char** argv)
{ {

9
config.tests/openal/openal.pro
View File

@@ -1,7 +1,6 @@
SOURCES += main.cpp SOURCES += main.cpp
win32 { win32: LIBS += -lOpenAL32
LIBS += -lOpenAL32 unix:!mac: LIBS += -lopenal
}else { mac: LIBS += -framework OpenAL
LIBS += -lopenal mac: DEFINES += HEADER_OPENAL_PREFIX
}

9
src/imports/audioengine/audioengine.pro
View File

@@ -4,11 +4,10 @@ TARGETPATH = QtAudioEngine
include(../qimportbase.pri) include(../qimportbase.pri)
QT += quick qml multimedia-private QT += quick qml multimedia-private
win32 { win32: LIBS += -lOpenAL32
LIBS += -lOpenAL32 unix:!mac: LIBS += -lopenal
}else { mac: LIBS += -framework OpenAL
LIBS += -lopenal mac: DEFINES += HEADER_OPENAL_PREFIX
}
DESTDIR = $$QT.multimedia.imports/$$TARGETPATH DESTDIR = $$QT.multimedia.imports/$$TARGETPATH
target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH

5
src/imports/audioengine/qaudioengine_openal_p.h
View File

@@ -47,8 +47,13 @@
#include <QMap> #include <QMap>
#include <QTimer> #include <QTimer>
#if defined(HEADER_OPENAL_PREFIX)
#include <OpenAL/al.h>
#include <OpenAL/alc.h>
#else
#include <AL/al.h> #include <AL/al.h>
#include <AL/alc.h> #include <AL/alc.h>
#endif
#include "qsoundsource_p.h" #include "qsoundsource_p.h"
#include "qsoundbuffer_p.h" #include "qsoundbuffer_p.h"