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:
authorCampbell Barton <ideasman42@gmail.com>2011-06-23 13:27:56 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-06-23 13:27:56 +0400
commit2023db70a88c9c5ae7b38eccfee54b6f35780b5f (patch)
tree59f071e5f75e12f344567665ecc0370a0b091eb9 /source/gameengine/BlenderRoutines
parent9c2aa3d0ffb93881bf1e2763ab28893533f02bd7 (diff)
cmake option to build without an audio library.
Diffstat (limited to 'source/gameengine/BlenderRoutines')
-rw-r--r--source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp4
-rw-r--r--source/gameengine/BlenderRoutines/CMakeLists.txt8
2 files changed, 10 insertions, 2 deletions
diff --git a/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp b/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
index 1eeb7c0f94b..a3ea85b605c 100644
--- a/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
+++ b/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
@@ -95,7 +95,9 @@ extern float BKE_screen_view3d_zoom_to_fac(float camzoom);
#include "BKE_ipo.h"
/***/
-#include "AUD_C-API.h"
+#ifdef WITH_AUDASPACE
+# include "AUD_C-API.h"
+#endif
//XXX #include "BSE_headerbuttons.h"
#include "BKE_context.h"
diff --git a/source/gameengine/BlenderRoutines/CMakeLists.txt b/source/gameengine/BlenderRoutines/CMakeLists.txt
index a67e2eb7038..fbaa1a9765d 100644
--- a/source/gameengine/BlenderRoutines/CMakeLists.txt
+++ b/source/gameengine/BlenderRoutines/CMakeLists.txt
@@ -4,7 +4,6 @@ set(INC
../../../intern/string
../../../intern/container
../../../intern/guardedalloc
- ../../../intern/audaspace/intern
../../../source/gameengine/Rasterizer/RAS_OpenGLRasterizer
../../../source/gameengine/Converter
../../../source/blender/imbuf
@@ -59,7 +58,14 @@ set(SRC
add_definitions(-DGLEW_STATIC)
+if(WITH_AUDASPACE)
+ add_definitions(-DWITH_AUDASPACE)
+endif()
+
if(WITH_CODEC_FFMPEG)
+ list(APPEND INC
+ ../../../intern/audaspace/intern
+ )
add_definitions(-DWITH_FFMPEG)
endif()