- blender player builds again with CMake.
authorCampbell Barton <ideasman42@gmail.com>
Sat, 16 Oct 2010 09:27:02 +0000 (09:27 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 16 Oct 2010 09:27:02 +0000 (09:27 +0000)
- remove duplicate entries for libs for blender binary (where possible)

source/blenderplayer/CMakeLists.txt
source/creator/CMakeLists.txt

index a61152d37ba4adef83f35cd21c04eb6e606c1cfa..b1dbde8d4b1bdd41f2af8a73c96fa99ba73cce84 100644 (file)
@@ -65,7 +65,7 @@ IF(UNIX)
                gp_ghost 
                gp_common 
                bf_intern_string 
-               bf_intern_ghost 
+               bf_intern_ghost
                bf_rna
                bf_blenkernel
                bf_blenloader 
@@ -81,10 +81,10 @@ IF(UNIX)
                bf_oglrasterizer 
                bf_expressions 
                bf_scenegraph
-               bf_ikplugin
-               bf_intern_itasc
-               bf_intern_ik
-               bf_intern_smoke
+               bf_ikplugin
+               bf_intern_itasc
+               bf_intern_ik
+               bf_intern_smoke
                bf_modifiers
                bf_intern_moto 
                bf_kernel 
@@ -114,6 +114,8 @@ IF(UNIX)
                extern_binreloc
                extern_glew
                extern_minilzo
+               bf_intern_ghost # duplicate for linking
+               bf_blenkernel # duplicate for linking
        )
   
        IF(WITH_QUICKTIME)
index 0433f76c84657e9f2aa14df266ec0a29d34fe9a8..f2ea4d3dc7589169cc2a685e75bb5a7ae13c9283 100644 (file)
@@ -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)