Commit: 9b76dd10858313a9c6ca4733cd8ddc21d2d93842
Author: Campbell Barton
Date: Fri Jun 10 20:07:44 2016 +1000
Branches: temp-decklink
https://developer.blender.org/rB9b76dd10858313a9c6ca4733cd8ddc21d2d93842
CMake: rename WITH_DECKLINK -> WITH_GAMEENGINE_DECKLINK
===================================================================
M CMakeLists.txt
M build_files/cmake/macros.cmake
M intern/CMakeLists.txt
M source/blenderplayer/CMakeLists.txt
M source/gameengine/VideoTexture/CMakeLists.txt
M source/gameengine/VideoTexture/DeckLink.cpp
M source/gameengine/VideoTexture/DeckLink.h
M source/gameengine/VideoTexture/Exception.cpp
M source/gameengine/VideoTexture/VideoDeckLink.cpp
M source/gameengine/VideoTexture/VideoDeckLink.h
M source/gameengine/VideoTexture/blendVideoTex.cpp
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1e94bb7..e7a0f7a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -229,8 +229,8 @@ 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)
option(WITH_PLAYER "Build Player" OFF)
-option(WITH_DECKLINK "Support BlackMagicDesign DeckLink cards in the BGE"
ON)
option(WITH_OPENCOLORIO "Enable OpenColorIO color management"
${_init_OPENCOLORIO})
# Compositor
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index 15bee2a..d29f086 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -685,7 +685,7 @@ function(SETUP_BLENDER_SORTED_LIBS)
list_insert_after(BLENDER_SORTED_LIBS "ge_logic_ngnetwork"
"extern_bullet")
endif()
- if(WITH_DECKLINK)
+ if(WITH_GAMEENGINE_DECKLINK)
list(APPEND BLENDER_SORTED_LIBS bf_intern_decklink)
endif()
diff --git a/intern/CMakeLists.txt b/intern/CMakeLists.txt
index b36ea3b..9a54767 100644
--- a/intern/CMakeLists.txt
+++ b/intern/CMakeLists.txt
@@ -34,7 +34,7 @@ add_subdirectory(mikktspace)
add_subdirectory(glew-mx)
add_subdirectory(eigen)
-if (WITH_DECKLINK)
+if (WITH_GAMEENGINE_DECKLINK)
add_subdirectory(decklink)
endif()
diff --git a/source/blenderplayer/CMakeLists.txt
b/source/blenderplayer/CMakeLists.txt
index 5694a29..206007b 100644
--- a/source/blenderplayer/CMakeLists.txt
+++ b/source/blenderplayer/CMakeLists.txt
@@ -215,7 +215,7 @@ endif()
list(APPEND BLENDER_SORTED_LIBS bf_intern_locale)
endif()
- if(WITH_DECKLINK)
+ if(WITH_GAMEENGINE_DECKLINK)
list(APPEND BLENDER_SORTED_LIBS bf_intern_decklink)
endif()
diff --git a/source/gameengine/VideoTexture/CMakeLists.txt
b/source/gameengine/VideoTexture/CMakeLists.txt
index aa7267a..1eb09b0 100644
--- a/source/gameengine/VideoTexture/CMakeLists.txt
+++ b/source/gameengine/VideoTexture/CMakeLists.txt
@@ -112,8 +112,8 @@ if(WITH_CODEC_FFMPEG)
)
endif()
-if(WITH_DECKLINK)
- add_definitions(-DWITH_DECKLINK)
+if(WITH_GAMEENGINE_DECKLINK)
+ add_definitions(-DWITH_GAMEENGINE_DECKLINK)
endif()
blender_add_lib(ge_videotex "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/gameengine/VideoTexture/DeckLink.cpp
b/source/gameengine/VideoTexture/DeckLink.cpp
index e9b583d..0506756 100644
--- a/source/gameengine/VideoTexture/DeckLink.cpp
+++ b/source/gameengine/VideoTexture/DeckLink.cpp
@@ -29,7 +29,7 @@
* \ingroup bgevideotex
*/
-#ifdef WITH_DECKLINK
+#ifdef WITH_GAMEENGINE_DECKLINK
// implementation
@@ -810,4 +810,4 @@ PyTypeObject DeckLinkType =
DeckLink_new, /* tp_new */
};
-#endif /* WITH_DECKLINK */
+#endif /* WITH_GAMEENGINE_DECKLINK */
diff --git a/source/gameengine/VideoTexture/DeckLink.h
b/source/gameengine/VideoTexture/DeckLink.h
index 5870451..1c96af7 100644
--- a/source/gameengine/VideoTexture/DeckLink.h
+++ b/source/gameengine/VideoTexture/DeckLink.h
@@ -32,7 +32,7 @@
#ifndef __DECKLINK_H__
#define __DECKLINK_H__
-#ifdef WITH_DECKLINK
+#ifdef WITH_GAMEENGINE_DECKLINK
#include "EXP_PyObjectPlus.h"
#include <structmember.h>
@@ -81,6 +81,6 @@ extern PyTypeObject DeckLinkType;
HRESULT decklink_ReadDisplayMode(const char *format, size_t len,
BMDDisplayMode *displayMode);
HRESULT decklink_ReadPixelFormat(const char *format, size_t len,
BMDPixelFormat *displayMode);
-#endif /* WITH_DECKLINK */
+#endif /* WITH_GAMEENGINE_DECKLINK */
#endif /* __DECKLINK_H__ */
diff --git a/source/gameengine/VideoTexture/Exception.cpp
b/source/gameengine/VideoTexture/Exception.cpp
index 322b7f9..9f82987 100644
--- a/source/gameengine/VideoTexture/Exception.cpp
+++ b/source/gameengine/VideoTexture/Exception.cpp
@@ -225,7 +225,7 @@ void registerAllExceptions(void)
SourceVideoEmptyDesc.registerDesc();
SourceVideoCreationDesc.registerDesc();
OffScreenInvalidDesc.registerDesc();
-#ifdef WITH_DECKLINK
+#ifdef WITH_GAMEENGINE_DECKLINK
AutoDetectionNotAvailDesc.registerDesc();
DeckLinkBadDisplayModeDesc.registerDesc();
DeckLinkBadPixelFormatDesc.registerDesc();
diff --git a/source/gameengine/VideoTexture/VideoDeckLink.cpp
b/source/gameengine/VideoTexture/VideoDeckLink.cpp
index 50421f4..d9558a7 100644
--- a/source/gameengine/VideoTexture/VideoDeckLink.cpp
+++ b/source/gameengine/VideoTexture/VideoDeckLink.cpp
@@ -29,7 +29,7 @@
* \ingroup bgevideotex
*/
-#ifdef WITH_DECKLINK
+#ifdef WITH_GAMEENGINE_DECKLINK
// FFmpeg defines its own version of stdint.h on Windows.
// Decklink needs FFmpeg, so it uses its version of stdint.h
@@ -1222,5 +1222,5 @@ PyTypeObject VideoDeckLinkType =
// DeckLink Capture Delegate Class
////////////////////////////////////////////
-#endif // WITH_DECKLINK
+#endif // WITH_GAMEENGINE_DECKLINK
diff --git a/source/gameengine/VideoTexture/VideoDeckLink.h
b/source/gameengine/VideoTexture/VideoDeckLink.h
index fc55460..be81f63 100644
--- a/source/gameengine/VideoTexture/VideoDeckLink.h
+++ b/source/gameengine/VideoTexture/VideoDeckLink.h
@@ -32,7 +32,7 @@
#ifndef __VIDEODECKLINK_H__
#define __VIDEODECKLINK_H__
-#ifdef WITH_DECKLINK
+#ifdef WITH_GAMEENGINE_DECKLINK
/* this needs to be parsed with __cplusplus defined before included through
DeckLink_compat.h */
#if defined(__FreeBSD__)
@@ -251,6 +251,6 @@ public:
};
-#endif /* WITH_DECKLINK */
+#endif /* WITH_GAMEENGINE_DECKLINK */
#endif /* __VIDEODECKLINK_H__ */
diff --git a/source/gameengine/VideoTexture/blendVideoTex.cpp
b/source/gameengine/VideoTexture/blendVideoTex.cpp
index fd10f8f..9b046d4 100644
--- a/source/gameengine/VideoTexture/blendVideoTex.cpp
+++ b/source/gameengine/VideoTexture/blendVideoTex.cpp
@@ -128,7 +128,7 @@ static PyMethodDef moduleMethods[] =
extern PyTypeObject VideoFFmpegType;
extern PyTypeObject ImageFFmpegType;
#endif
-#ifdef WITH_DECKLINK
+#ifdef WITH_GAMEENGINE_DECKLINK
extern PyTypeObject VideoDeckLinkType;
extern PyTypeObject DeckLinkType;
#endif
@@ -149,7 +149,7 @@ static void registerAllTypes(void)
pyImageTypes.add(&VideoFFmpegType, "VideoFFmpeg");
pyImageTypes.add(&ImageFFmpegType, "ImageFFmpeg");
#endif
-#ifdef WITH_DECKLINK
+#ifdef WITH_GAMEENGINE_DECKLINK
pyImageTypes.add(&VideoDeckLinkType, "VideoDeckLink");
#endif
pyImageTypes.add(&ImageBuffType, "ImageBuff");
@@ -201,7 +201,7 @@ PyMODINIT_FUNC initVideoTexturePythonBinding(void)
return NULL;
if (PyType_Ready(&TextureType) < 0)
return NULL;
-#ifdef WITH_DECKLINK
+#ifdef WITH_GAMEENGINE_DECKLINK
if (PyType_Ready(&DeckLinkType) < 0)
return NULL;
#endif
@@ -218,7 +218,7 @@ PyMODINIT_FUNC initVideoTexturePythonBinding(void)
Py_INCREF(&TextureType);
PyModule_AddObject(m, "Texture", (PyObject *)&TextureType);
-#ifdef WITH_DECKLINK
+#ifdef WITH_GAMEENGINE_DECKLINK
Py_INCREF(&DeckLinkType);
PyModule_AddObject(m, "DeckLink", (PyObject *)&DeckLinkType);
#endif
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
