ndof: build system cleanup
authorMike Erwin <significant.bit@gmail.com>
Tue, 24 May 2016 05:57:17 +0000 (01:57 -0400)
committerMike Erwin <significant.bit@gmail.com>
Tue, 24 May 2016 05:57:17 +0000 (01:57 -0400)
Only Linux needs a lib linked in (libspnav).

ghostndof3dconnexion refers to an obsolete Mac driver shim.

build_files/cmake/macros.cmake
source/blenderplayer/CMakeLists.txt

index f14c954b0255dbe65c049c55e10a9e2872765104..47fc86c4f20b531e5d28d9d9e8b728d738fcb903 100644 (file)
@@ -435,9 +435,6 @@ function(setup_liblinks
        if(WITH_MEM_JEMALLOC)
                target_link_libraries(${target} ${JEMALLOC_LIBRARIES})
        endif()
-       if(WITH_INPUT_NDOF)
-               target_link_libraries(${target} ${NDOF_LIBRARIES})
-       endif()
        if(WITH_MOD_CLOTH_ELTOPO)
                target_link_libraries(${target} ${LAPACK_LIBRARIES})
        endif()
@@ -451,6 +448,9 @@ function(setup_liblinks
                if(WITH_OPENMP_STATIC)
                        target_link_libraries(${target} ${OpenMP_LIBRARIES})
                endif()
+               if(WITH_INPUT_NDOF)
+                       target_link_libraries(${target} ${NDOF_LIBRARIES})
+               endif()
        endif()
 
        # We put CLEW and CUEW here because OPENSUBDIV_LIBRARIES dpeends on them..
@@ -661,10 +661,6 @@ function(SETUP_BLENDER_SORTED_LIBS)
                list(APPEND BLENDER_SORTED_LIBS bf_quicktime)
        endif()
 
-       if(WITH_INPUT_NDOF)
-               list(APPEND BLENDER_SORTED_LIBS bf_intern_ghostndof3dconnexion)
-       endif()
-       
        if(WITH_MOD_BOOLEAN)
                list(APPEND BLENDER_SORTED_LIBS extern_carve)
        endif()
index 4b828408e459c63f84994af8000c42c4ef467f87..6f32d50c2fe0f374809b042176b513ed6434aaf0 100644 (file)
@@ -111,7 +111,6 @@ endif()
                ge_player_common 
                bf_intern_string 
                bf_intern_ghost
-               bf_intern_ghostndof3dconnexion
                bf_rna
                bf_blenkernel
                bf_depsgraph