diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-02-18 01:07:18 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-18 01:07:18 +0400 |
commit | 379527581b51274d0624b72fddd016679ff2f4a3 (patch) | |
tree | d5d7726144ace01fce50ddc32cbdc8033b815457 /source | |
parent | 48006292d8b3c6c8dd4bfe87bdbe271db93cffff (diff) | |
parent | c628f04a7c39bcd178d06448f9ca5e9324141f50 (diff) |
svn merge ^/trunk/blender -r44204:44213
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/BKE_sound.h | 2 | ||||
-rw-r--r-- | source/blenderplayer/CMakeLists.txt | 4 | ||||
-rw-r--r-- | source/creator/CMakeLists.txt | 5 |
3 files changed, 9 insertions, 2 deletions
diff --git a/source/blender/blenkernel/BKE_sound.h b/source/blender/blenkernel/BKE_sound.h index 90477647b88..8b01dbde531 100644 --- a/source/blender/blenkernel/BKE_sound.h +++ b/source/blender/blenkernel/BKE_sound.h @@ -79,7 +79,7 @@ void sound_load(struct Main *main, struct bSound* sound); void sound_free(struct bSound* sound); -#ifdef AUD_CAPI +#ifdef __AUD_C_API_H__ AUD_Device* sound_mixdown(struct Scene *scene, AUD_DeviceSpecs specs, int start, float volume); #endif diff --git a/source/blenderplayer/CMakeLists.txt b/source/blenderplayer/CMakeLists.txt index d90668b7732..1bf55cd96de 100644 --- a/source/blenderplayer/CMakeLists.txt +++ b/source/blenderplayer/CMakeLists.txt @@ -186,6 +186,10 @@ endif() list(APPEND BLENDER_SORTED_LIBS extern_carve) endif() + if(WITH_GHOST_XDND) + list(APPEND BLENDER_SORTED_LIBS extern_xdnd) + endif() + if(WITH_CODEC_QUICKTIME) list(APPEND BLENDER_SORTED_LIBS bf_quicktime) endif() diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 057c19dd5c4..b39d2a5b5c2 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -830,7 +830,6 @@ endif() extern_minilzo extern_lzma extern_colamd - extern_xdnd ge_logic_ketsji extern_recastnavigation ge_phys_common @@ -894,6 +893,10 @@ endif() list(APPEND BLENDER_SORTED_LIBS extern_carve) endif() + if(WITH_GHOST_XDND) + list(APPEND BLENDER_SORTED_LIBS extern_xdnd) + endif() + foreach(SORTLIB ${BLENDER_SORTED_LIBS}) set(REMLIB ${SORTLIB}) foreach(SEARCHLIB ${BLENDER_LINK_LIBS}) |