From 733073550f61cf4fbbe21aab33e9271915325109 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20M=C3=BCller?= Date: Tue, 4 Mar 2014 13:44:15 +0100 Subject: Audaspace: use standalone library. - Added the cmake configuration option WITH_EXTERNAL_AUDASPACE. - Fixes to build without standalone library as well. --- source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp | 6 +++++- source/gameengine/BlenderRoutines/CMakeLists.txt | 10 +++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) (limited to 'source/gameengine/BlenderRoutines') diff --git a/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp b/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp index f275d0a0f0c..4d30bc51280 100644 --- a/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp +++ b/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp @@ -101,7 +101,11 @@ typedef void * wmUIHandlerRemoveFunc; } #ifdef WITH_AUDASPACE -# include "AUD_C-API.h" +# ifdef WITH_EXTERNAL_AUDASPACE +# include +# else +# include "AUD_C-API.h" +# endif #endif static BlendFileData *load_game_data(char *filename) diff --git a/source/gameengine/BlenderRoutines/CMakeLists.txt b/source/gameengine/BlenderRoutines/CMakeLists.txt index 1a2809cc8ab..324babf9fa9 100644 --- a/source/gameengine/BlenderRoutines/CMakeLists.txt +++ b/source/gameengine/BlenderRoutines/CMakeLists.txt @@ -56,10 +56,14 @@ set(SRC add_definitions(${GL_DEFINITIONS}) if(WITH_AUDASPACE) - list(APPEND INC - ../../../intern/audaspace/intern - ) add_definitions(-DWITH_AUDASPACE) + + if(WITH_EXTERNAL_AUDASPACE) + add_definitions(-DWITH_EXTERNAL_AUDASPACE) + list(APPEND INC_SYS ${CAUDASPACE_INCLUDE_DIRS}) + else() + list(APPEND INC ../../../intern/audaspace/intern) + endif() endif() if(WITH_CODEC_FFMPEG) -- cgit v1.2.3