Commit: 886349fd982847466b3215f8b5eebf71ea86f3ac
Author: Mike Erwin
Date: Tue May 24 01:57:17 2016 -0400
Branches: master
https://developer.blender.org/rB886349fd982847466b3215f8b5eebf71ea86f3ac
ndof: build system cleanup
Only Linux needs a lib linked in (libspnav).
ghostndof3dconnexion refers to an obsolete Mac driver shim.
===================================================================
M build_files/cmake/macros.cmake
M source/blenderplayer/CMakeLists.txt
===================================================================
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index f14c954..47fc86c 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -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()
diff --git a/source/blenderplayer/CMakeLists.txt
b/source/blenderplayer/CMakeLists.txt
index 4b82840..6f32d50 100644
--- a/source/blenderplayer/CMakeLists.txt
+++ b/source/blenderplayer/CMakeLists.txt
@@ -111,7 +111,6 @@ endif()
ge_player_common
bf_intern_string
bf_intern_ghost
- bf_intern_ghostndof3dconnexion
bf_rna
bf_blenkernel
bf_depsgraph
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
