make bullet optional again

2013-01-23 07:26:39 +00:00
parent 4544c234f5
commit 69ddc5eb99
30 changed files with 247 additions and 104 deletions
--- 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()