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>2013-01-23 11:26:39 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-01-23 11:26:39 +0400
commit69ddc5eb99d36c7d2cf86a7537a3784d3c72777e (patch)
tree2346cd60891c2015fc59a30576d0c99b072712cc /source/creator
parent4544c234f5baf386eae9ffd98994f9905a285aaa (diff)
make bullet optional again
Diffstat (limited to 'source/creator')
-rw-r--r--source/creator/CMakeLists.txt5
1 files changed, 4 insertions, 1 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 7362745f412..2115b2a5ff6 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -856,7 +856,6 @@ endif()
bf_modifiers
bf_bmesh
bf_blenkernel
- bf_rigidbody
bf_nodes
bf_gpu
bf_blenloader
@@ -971,6 +970,10 @@ endif()
list(APPEND BLENDER_SORTED_LIBS bf_intern_locale)
endif()
+ if(WITH_BULLET)
+ list_insert_after(BLENDER_SORTED_LIBS "bf_blenkernel" "bf_rigidbody")
+ endif()
+
if(WITH_BULLET AND NOT WITH_BULLET_SYSTEM)
list_insert_after(BLENDER_SORTED_LIBS "ge_logic_ngnetwork" "extern_bullet")
endif()