diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-10-16 13:27:02 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-10-16 13:27:02 +0400 |
| commit | bc1cca8d006f5c9cc6a6e695b2a12bb208694bb5 (patch) | |
| tree | be020bb501c70e4e5c517ca804d65b4b346a317c /source/creator | |
| parent | e5fbd93cecc8527467cfe33a4c74a252c3d39828 (diff) | |
- blender player builds again with CMake.
- remove duplicate entries for libs for blender binary (where possible)
Diffstat (limited to 'source/creator')
| -rw-r--r-- | source/creator/CMakeLists.txt | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 0433f76c846..f2ea4d3dc75 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -451,9 +451,6 @@ IF(WITH_FLUID) LIST(APPEND BLENDER_LINK_LIBS bf_intern_elbeem) ENDIF(WITH_FLUID) -IF(CMAKE_SYSTEM_NAME MATCHES "Linux") - LIST(APPEND BLENDER_LINK_LIBS extern_binreloc) -ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux") #IF(UNIX) # Sort libraries @@ -498,7 +495,6 @@ ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux") bf_editor_animation bf_editor_datafiles - bf_intern_bsp bf_render bf_intern_opennl bf_python @@ -529,8 +525,6 @@ ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux") bf_intern_memutil bf_intern_guardedalloc bf_intern_ctr - bf_intern_moto - bf_windowmanager bf_blroutines bf_converter bf_dummy @@ -545,19 +539,13 @@ ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux") bf_oglrasterizer bf_expressions bf_scenegraph - bf_intern_moto - bf_blroutines kx_network - bf_kernel + bf_kernel + bf_python # duplicate for BPY_eval_driver bf_ngnetwork extern_bullet bf_loopbacknetwork - bf_intern_itasc - bf_common bf_intern_moto - bf_python - bf_python_ext - extern_binreloc extern_glew extern_openjpeg bf_videotex @@ -565,10 +553,12 @@ ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux") bf_dna bf_blenfont bf_intern_audaspace - bf_intern_decimate - ) + IF(CMAKE_SYSTEM_NAME MATCHES "Linux") + LIST(APPEND BLENDER_SORTED_LIBS extern_binreloc) + ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux") + IF(WITH_CXX_GUARDEDALLOC) LIST(APPEND BLENDER_SORTED_LIBS bf_intern_guardedalloc_cpp) ENDIF(WITH_CXX_GUARDEDALLOC) |