diff options
Diffstat (limited to 'source/blender/bmesh')
-rw-r--r-- | source/blender/bmesh/CMakeLists.txt | 5 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_hull.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/bmesh/CMakeLists.txt b/source/blender/bmesh/CMakeLists.txt index d2b747aa68f..92c52f5d8d0 100644 --- a/source/blender/bmesh/CMakeLists.txt +++ b/source/blender/bmesh/CMakeLists.txt @@ -189,10 +189,15 @@ endif() if(WITH_BULLET) list(APPEND INC_SYS ${BULLET_INCLUDE_DIRS} + "../../../intern/rigidbody/" ) + if(NOT WITH_SYSTEM_BULLET) list(APPEND LIB extern_bullet + ) + endif() + list(APPEND LIB ${BULLET_LIBRARIES} ) add_definitions(-DWITH_BULLET) diff --git a/source/blender/bmesh/operators/bmo_hull.c b/source/blender/bmesh/operators/bmo_hull.c index 98d4431803a..84938084aec 100644 --- a/source/blender/bmesh/operators/bmo_hull.c +++ b/source/blender/bmesh/operators/bmo_hull.c @@ -28,7 +28,7 @@ # include "BLI_listbase.h" # include "BLI_math.h" -# include "Bullet-C-Api.h" +# include "RBI_hull_api.h" /* XXX: using 128 for totelem and pchunk of mempool, no idea what good * values would be though */ |