Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Erwin <significant.bit@gmail.com>2015-10-24 20:58:06 +0300
committerMike Erwin <significant.bit@gmail.com>2015-10-25 23:19:26 +0300
commitc3cec828e82de70fe92eeb7c52869d24466d4109 (patch)
tree4364ccf75853e1c2418e9417715d3239787d791a /intern/ghost/CMakeLists.txt
parent4f767e37e8452bdc675e362b566fe9aeedb783e4 (diff)
ndof: rework Mac driver glue
Load driver dynamically at runtime instead of weak-linking the 3Dconnexion framework. Driver no longer needed at build time! Works with really old drivers (as in PowerMac old), more recent versions, and the latest which allows us to process events on a separate thread.
Diffstat (limited to 'intern/ghost/CMakeLists.txt')
-rw-r--r--intern/ghost/CMakeLists.txt10
1 files changed, 0 insertions, 10 deletions
diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt
index 761bcb4dd27..948b4bf91d1 100644
--- a/intern/ghost/CMakeLists.txt
+++ b/intern/ghost/CMakeLists.txt
@@ -166,11 +166,6 @@ elseif(APPLE AND NOT WITH_X11)
intern/GHOST_NDOFManagerCocoa.h
)
-
- list(APPEND SRC_NDOF3DCONNEXION
- intern/GHOST_NDOFManager3Dconnexion.c
- intern/GHOST_NDOFManager3Dconnexion.h
- )
endif()
if(WITH_CODEC_QUICKTIME)
@@ -338,8 +333,3 @@ endif()
add_definitions(${GL_DEFINITIONS})
blender_add_lib(bf_intern_ghost "${SRC}" "${INC}" "${INC_SYS}")
-
-# workaround for apple clang mangling extern "C" symbols
-if(WITH_INPUT_NDOF AND APPLE)
- blender_add_lib(bf_intern_ghostndof3dconnexion "${SRC_NDOF3DCONNEXION}" "${INC}" "${INC_SYS}")
-endif()