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:
authorCampbell Barton <ideasman42@gmail.com>2011-08-11 08:53:57 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-08-11 08:53:57 +0400
commit226e424cb2cb52edfba0f098a4ac4537fd1db914 (patch)
treed49d1d0376872d008b7315d7600ceca346cd96bf /CMakeLists.txt
parent6f08f18d2708b84cab782b0019149b3cb552dbd7 (diff)
parent50277c48ba5bf9eae418453159e421489895dafd (diff)
svn merge -r39057:39286 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a0a0359d8d7..cf083b87bc7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1010,6 +1010,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()