diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-01-03 04:23:52 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-01-03 04:23:52 +0400 |
| commit | c2839bfe76139ed753e6b99118001bba5f2fa6ee (patch) | |
| tree | b1edb08f125ccf8220e41d359ef80c38f6213f32 /source/creator | |
| parent | 1a7638fa94fbe9c6244d054d20efa3405153747f (diff) | |
add option WITH_SYSTEM_BULLET to link against the bullet installation found on the system.
Note: this doesn't work yet for everything with latest stable bullet (2.81), need to look into why and likely apply some patches upstream.
However I managed to link blender by disabling some features, likely it can be made to work without too much trouble.
Diffstat (limited to 'source/creator')
| -rw-r--r-- | source/creator/CMakeLists.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index c53f27c7326..3fa646ac884 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -893,7 +893,6 @@ endif() ge_scenegraph ge_logic_network ge_logic_ngnetwork - extern_bullet ge_logic_loopbacknetwork bf_intern_moto extern_openjpeg @@ -972,6 +971,10 @@ endif() list(APPEND BLENDER_SORTED_LIBS bf_intern_locale) endif() + if(WITH_BULLET AND NOT WITH_BULLET_SYSTEM) + list_insert_after(BLENDER_SORTED_LIBS "ge_logic_ngnetwork" "extern_bullet") + endif() + foreach(SORTLIB ${BLENDER_SORTED_LIBS}) set(REMLIB ${SORTLIB}) foreach(SEARCHLIB ${BLENDER_LINK_LIBS}) |