[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38594] trunk/blender: cmake - option to disable the frame server
Campbell Barton
ideasman42 at gmail.com
Fri Jul 22 01:06:52 CEST 2011
Revision: 38594
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38594
Author: campbellbarton
Date: 2011-07-21 23:06:51 +0000 (Thu, 21 Jul 2011)
Log Message:
-----------
cmake - option to disable the frame server
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
trunk/blender/source/blender/blenkernel/CMakeLists.txt
trunk/blender/source/blender/blenkernel/SConscript
trunk/blender/source/blender/blenkernel/intern/writeframeserver.c
trunk/blender/source/blender/makesrna/intern/CMakeLists.txt
trunk/blender/source/blender/makesrna/intern/SConscript
trunk/blender/source/blender/makesrna/intern/rna_scene.c
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2011-07-21 22:26:58 UTC (rev 38593)
+++ trunk/blender/CMakeLists.txt 2011-07-21 23:06:51 UTC (rev 38594)
@@ -155,6 +155,7 @@
option(WITH_IMAGE_CINEON "Enable CINEON and DPX Image Support" ON)
option(WITH_IMAGE_HDR "Enable HDR Image Support" ON)
option(WITH_IMAGE_REDCODE "Enable RedCode Image Support" OFF)
+option(WITH_IMAGE_FRAMESERVER "Enable image FrameServer Support for rendering" ON)
# Audio/Video format support
option(WITH_CODEC_FFMPEG "Enable FFMPeg Support (http://ffmpeg.org)" OFF)
Modified: trunk/blender/source/blender/blenkernel/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/blenkernel/CMakeLists.txt 2011-07-21 22:26:58 UTC (rev 38593)
+++ trunk/blender/source/blender/blenkernel/CMakeLists.txt 2011-07-21 23:06:51 UTC (rev 38594)
@@ -279,6 +279,10 @@
add_definitions(-DWITH_CINEON)
endif()
+if(WITH_IMAGE_FRAMESERVER)
+ add_definitions(-DWITH_FRAMESERVER)
+endif()
+
if(WITH_IMAGE_HDR)
add_definitions(-DWITH_HDR)
endif()
Modified: trunk/blender/source/blender/blenkernel/SConscript
===================================================================
--- trunk/blender/source/blender/blenkernel/SConscript 2011-07-21 22:26:58 UTC (rev 38593)
+++ trunk/blender/source/blender/blenkernel/SConscript 2011-07-21 23:06:51 UTC (rev 38594)
@@ -22,6 +22,7 @@
defs = [ 'GLEW_STATIC' ]
defs.append('WITH_SMOKE') # TODO, make optional
+defs.append('WITH_FRAMESERVER') # TODO, make optional
if env['WITH_BF_PYTHON']:
incs += ' ../python'
Modified: trunk/blender/source/blender/blenkernel/intern/writeframeserver.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/writeframeserver.c 2011-07-21 22:26:58 UTC (rev 38593)
+++ trunk/blender/source/blender/blenkernel/intern/writeframeserver.c 2011-07-21 23:06:51 UTC (rev 38594)
@@ -22,6 +22,7 @@
*
*/
+#ifdef WITH_FRAMESERVER
#include <string.h>
#include <stdio.h>
@@ -381,3 +382,4 @@
shutdown_socket_system();
}
+#endif /* WITH_FRAMESERVER */
Modified: trunk/blender/source/blender/makesrna/intern/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/makesrna/intern/CMakeLists.txt 2011-07-21 22:26:58 UTC (rev 38593)
+++ trunk/blender/source/blender/makesrna/intern/CMakeLists.txt 2011-07-21 23:06:51 UTC (rev 38594)
@@ -171,6 +171,10 @@
add_definitions(-DWITH_HDR)
endif()
+if(WITH_IMAGE_FRAMESERVER)
+ add_definitions(-DWITH_FRAMESERVER)
+endif()
+
if(WITH_AUDASPACE)
add_definitions(-DWITH_AUDASPACE)
endif()
Modified: trunk/blender/source/blender/makesrna/intern/SConscript
===================================================================
--- trunk/blender/source/blender/makesrna/intern/SConscript 2011-07-21 22:26:58 UTC (rev 38593)
+++ trunk/blender/source/blender/makesrna/intern/SConscript 2011-07-21 23:06:51 UTC (rev 38594)
@@ -54,6 +54,8 @@
if env['WITH_BF_HDR']:
defs.append('WITH_HDR')
+defs.append('WITH_FRAMESERVER') # TODO, make optional
+
if env['WITH_BF_FFMPEG']:
defs.append('WITH_FFMPEG')
incs += ' ' + env['BF_FFMPEG_INC']
Modified: trunk/blender/source/blender/makesrna/intern/rna_scene.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_scene.c 2011-07-21 22:26:58 UTC (rev 38593)
+++ trunk/blender/source/blender/makesrna/intern/rna_scene.c 2011-07-21 23:06:51 UTC (rev 38594)
@@ -135,7 +135,9 @@
#endif
{R_AVIJPEG, "AVI_JPEG", ICON_FILE_MOVIE, "AVI JPEG", "Output video in AVI JPEG format"},
{R_AVIRAW, "AVI_RAW", ICON_FILE_MOVIE, "AVI Raw", "Output video in AVI Raw format"},
+#ifdef WITH_FRAMESERVER
{R_FRAMESERVER, "FRAMESERVER", ICON_FILE_SCRIPT, "Frame Server", "Output image to a frameserver"},
+#endif
#ifdef WITH_FFMPEG
{R_H264, "H264", ICON_FILE_MOVIE, "H.264", "Output video in H.264 format"},
{R_FFMPEG, "FFMPEG", ICON_FILE_MOVIE, "MPEG", "Output video in MPEG format"},
More information about the Bf-blender-cvs
mailing list