Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--intern/SoundSystem/CMakeLists.txt4
-rw-r--r--intern/SoundSystem/openal/SND_OpenALDevice.cpp6
2 files changed, 10 insertions, 0 deletions
diff --git a/intern/SoundSystem/CMakeLists.txt b/intern/SoundSystem/CMakeLists.txt
index f80d9defc45..080c5b945e1 100644
--- a/intern/SoundSystem/CMakeLists.txt
+++ b/intern/SoundSystem/CMakeLists.txt
@@ -32,6 +32,10 @@ SET(INC . intern ../moto/include ../string dummy openal sdl)
IF(WITH_OPENAL)
FILE(GLOB SRC dummy/*.cpp intern/*.cpp openal/*.cpp sdl/*.cpp)
INCLUDE_DIRECTORIES(${OPENAL_INC} ${SDL_INC})
+ STRING(REGEX MATCH ".*ramework.*" FRAMEWORK ${OPENAL_INCLUDE_DIR})
+ IF(FRAMEWORK)
+ ADD_DEFINITIONS(-DAPPLE_FRAMEWORK_FIX)
+ ENDIF(FRAMEWORK)
ELSE(WITH_OPENAL)
FILE(GLOB SRC dummy/*.cpp intern/*.cpp)
ADD_DEFINITIONS(-DNO_SOUND)
diff --git a/intern/SoundSystem/openal/SND_OpenALDevice.cpp b/intern/SoundSystem/openal/SND_OpenALDevice.cpp
index 399008b3b28..a278384dfd8 100644
--- a/intern/SoundSystem/openal/SND_OpenALDevice.cpp
+++ b/intern/SoundSystem/openal/SND_OpenALDevice.cpp
@@ -43,9 +43,15 @@
#include "SND_Utils.h"
+#ifdef APPLE_FRAMEWORK_FIX
+#include <al.h>
+#include <alc.h>
+#include <alut.h>
+#else
#include <AL/al.h>
#include <AL/alc.h>
#include <AL/alut.h>
+#endif
#include <stdio.h>
#include <stdlib.h>