diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-09-12 11:34:53 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-09-12 11:34:53 +0300 |
| commit | a3241a8ff79e0e5cdd485e278331d8ca3322447b (patch) | |
| tree | 33b148e65a23725a47530a6f5f04b94981c4f7ce /build_files | |
| parent | cf376bc451e56d03b4176e519793b2eccd75d0d6 (diff) | |
CMake: Fix compilation with Bullet enabled
Obvious bug in recent CName cleanup commit, while BGE library
was indeed mentioned on that line it was to put Bullet libraries
after all the other libraries.
One day we should really switch to a CMake dependency graph to
take care of library dependencies.
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/cmake/macros.cmake | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index 5ee1d88bfcb..620c843a15b 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -754,6 +754,10 @@ function(SETUP_BLENDER_SORTED_LIBS) list_insert_after(BLENDER_SORTED_LIBS "bf_blenkernel" "bf_intern_rigidbody") endif() + if(WITH_BULLET AND NOT WITH_SYSTEM_BULLET) + list_insert_after(BLENDER_SORTED_LIBS "extern_openjpeg" "extern_bullet") + endif() + if(WIN32) list(APPEND BLENDER_SORTED_LIBS bf_intern_gpudirect) endif() |