From 733073550f61cf4fbbe21aab33e9271915325109 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20M=C3=BCller?= <nexyon@gmail.com>
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/Converter/CMakeLists.txt          | 10 +++++++---
 source/gameengine/Converter/KX_ConvertActuators.cpp |  6 +++++-
 2 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'source/gameengine/Converter')

diff --git a/source/gameengine/Converter/CMakeLists.txt b/source/gameengine/Converter/CMakeLists.txt
index 6d681dd166e..dba3f4da050 100644
--- a/source/gameengine/Converter/CMakeLists.txt
+++ b/source/gameengine/Converter/CMakeLists.txt
@@ -113,10 +113,14 @@ if(WITH_BULLET)
 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()
 
 blender_add_lib(ge_converter "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/gameengine/Converter/KX_ConvertActuators.cpp b/source/gameengine/Converter/KX_ConvertActuators.cpp
index 1acbd0b1608..e5e86cd4ee6 100644
--- a/source/gameengine/Converter/KX_ConvertActuators.cpp
+++ b/source/gameengine/Converter/KX_ConvertActuators.cpp
@@ -42,7 +42,11 @@
 #include "KX_ConvertActuators.h"
 
 #ifdef WITH_AUDASPACE
-#  include "AUD_C-API.h"
+#  ifdef WITH_EXTERNAL_AUDASPACE
+#    include <audaspace/AUD_Sound.h>
+#  else
+#    include "AUD_C-API.h"
+#  endif
 #endif
 
 // Actuators
-- 
cgit v1.2.3