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:
Diffstat (limited to 'source/gameengine/GamePlayer/ghost')
-rw-r--r--source/gameengine/GamePlayer/ghost/CMakeLists.txt10
-rw-r--r--source/gameengine/GamePlayer/ghost/GPG_Application.cpp6
2 files changed, 12 insertions, 4 deletions
diff --git a/source/gameengine/GamePlayer/ghost/CMakeLists.txt b/source/gameengine/GamePlayer/ghost/CMakeLists.txt
index a1bc7e88840..58e47bc4440 100644
--- a/source/gameengine/GamePlayer/ghost/CMakeLists.txt
+++ b/source/gameengine/GamePlayer/ghost/CMakeLists.txt
@@ -85,10 +85,14 @@ if(WITH_INTERNATIONAL)
endif()
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_SDL AND WITH_SDL_DYNLOAD)
diff --git a/source/gameengine/GamePlayer/ghost/GPG_Application.cpp b/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
index f06a153431e..75a301211a2 100644
--- a/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
+++ b/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
@@ -100,7 +100,11 @@ extern "C"
#include "GHOST_Rect.h"
#ifdef WITH_AUDASPACE
-# include "AUD_C-API.h"
+# ifdef WITH_EXTERNAL_AUDASPACE
+# include <audaspace/AUD_Device.h>
+# else
+# include "AUD_C-API.h"
+# endif
#endif
static void frameTimerProc(GHOST_ITimerTask* task, GHOST_TUns64 time);