diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-08-16 22:59:45 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-08-16 22:59:45 +0400 |
commit | c7fce6be2ea6dcc1ecdf52a8f5d1608d45117e8f (patch) | |
tree | f05893bc77462e43e2be9b492b19beb7318b8244 /CMakeLists.txt | |
parent | 360fcd73fe2868ba32c65697e21ed1bbab8b649a (diff) |
Cycles: svn merge -r39132:39457 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index bbd9598780d..3cc935939f4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1089,6 +1089,10 @@ elseif(APPLE) if(NOT 3D_CONNEXION_CLIENT_LIBRARY) set(WITH_INPUT_NDOF OFF) endif() + + if(WITH_INPUT_NDOF) + set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -weak_framework 3DconnexionClient") + endif() endif() else() |