Commit: b8112a896003d34ce1099c3cc8f4fee6bd3520cc
Author: Brecht Van Lommel
Date:   Sat Jun 11 23:47:35 2016 +0200
Branches: master
https://developer.blender.org/rBb8112a896003d34ce1099c3cc8f4fee6bd3520cc

Fix OS X build after Decklink changes, it is not supported yet so don't enable 
it.

===================================================================

M       CMakeLists.txt

===================================================================

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e7a0f7a..1c933d3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -229,7 +229,11 @@ option(WITH_BULLET        "Enable Bullet (Physics Engine)" 
ON)
 option(WITH_SYSTEM_BULLET "Use the systems bullet library (currently 
unsupported due to missing features in upstream!)" )
 mark_as_advanced(WITH_SYSTEM_BULLET)
 option(WITH_GAMEENGINE    "Enable Game Engine" ${_init_GAMEENGINE})
-option(WITH_GAMEENGINE_DECKLINK "Support BlackMagicDesign DeckLink cards in 
the Game Engine" ON)
+if(APPLE)
+       set(WITH_GAMEENGINE_DECKLINK OFF)
+else()
+       option(WITH_GAMEENGINE_DECKLINK "Support BlackMagicDesign DeckLink 
cards in the Game Engine" ON)
+endif()
 option(WITH_PLAYER        "Build Player" OFF)
 option(WITH_OPENCOLORIO   "Enable OpenColorIO color management" 
${_init_OPENCOLORIO})

_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to