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:
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2011-06-25 04:49:53 +0400
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2011-06-25 04:49:53 +0400
commitd65ebf8c847c18f8be568eab4d5c65e7b630a40f (patch)
tree2795070d936c6ec7012a0339ea74d1d4b317c3d4 /source/gameengine/Ketsji/CMakeLists.txt
parent17ee056fc6d15abc4b69a24ceac0e7f3d4dffa47 (diff)
parenta03707d408b9e37cd11124c93b1516eae9522139 (diff)
Merged changes in the trunk up to revision 37799.
Note for VS2008 plus CMake users: I had to remove OpenEXR debug libs from the "blender" project properties > Linker > Additional Dependencies. Otherwise I got a number of linker errors concerning duplicated symbols between libcmt.lib and libcmtd.lib.
Diffstat (limited to 'source/gameengine/Ketsji/CMakeLists.txt')
-rw-r--r--source/gameengine/Ketsji/CMakeLists.txt8
1 files changed, 7 insertions, 1 deletions
diff --git a/source/gameengine/Ketsji/CMakeLists.txt b/source/gameengine/Ketsji/CMakeLists.txt
index a6339439bea..b5a63f44729 100644
--- a/source/gameengine/Ketsji/CMakeLists.txt
+++ b/source/gameengine/Ketsji/CMakeLists.txt
@@ -50,7 +50,6 @@ set(INC
../../../source/gameengine/SceneGraph
../../../source/gameengine/Physics/common
../../../source/gameengine/Network/LoopBackNetwork
- ../../../intern/audaspace/intern
../../../source/blender/blenloader
../../../source/blender/gpu
)
@@ -219,6 +218,13 @@ if(WITH_CODEC_FFMPEG)
add_definitions(-DWITH_FFMPEG)
endif()
+if(WITH_AUDASPACE)
+ list(APPEND INC
+ ../../../intern/audaspace/intern
+ )
+ add_definitions(-DWITH_AUDASPACE)
+endif()
+
if(WITH_BULLET)
list(APPEND INC
../../../extern/bullet2/src