Revision: 20747
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20747
Author: blendix
Date: 2009-06-09 12:30:16 +0200 (Tue, 09 Jun 2009)
Log Message:
-----------
2.5:
* Fix compilation with FFMPEG.
* Ensure FFMPEG and similar flags are set during RNA compile,
so the right output formats show.
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/blenkernel/intern/writeffmpeg.c
branches/blender2.5/blender/source/blender/makesrna/intern/CMakeLists.txt
branches/blender2.5/blender/source/blender/makesrna/intern/Makefile
branches/blender2.5/blender/source/blender/makesrna/intern/SConscript
Modified:
branches/blender2.5/blender/source/blender/blenkernel/intern/writeffmpeg.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/writeffmpeg.c
2009-06-09 10:30:11 UTC (rev 20746)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/writeffmpeg.c
2009-06-09 10:30:16 UTC (rev 20747)
@@ -242,8 +242,8 @@
#ifdef FFMPEG_CODEC_TIME_BASE
frame->pts = rd->cfra - rd->sfra;
#endif
- if (G.scene->r.mode & R_FIELDS) {
- frame->top_field_first = ((G.scene->r.mode & R_ODDFIELD) != 0);
+ if (rd->mode & R_FIELDS) {
+ frame->top_field_first = ((rd->mode & R_ODDFIELD) != 0);
}
outsize = avcodec_encode_video(c, video_buffer, video_buffersize,
Modified:
branches/blender2.5/blender/source/blender/makesrna/intern/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/CMakeLists.txt
2009-06-09 10:30:11 UTC (rev 20746)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/CMakeLists.txt
2009-06-09 10:30:16 UTC (rev 20747)
@@ -41,6 +41,26 @@
INCLUDE_DIRECTORIES(../../../../intern/guardedalloc .. ../../makesdna
../../blenkernel ../../blenlib ../../windowmanager ../../editors/include .)
FILE(GLOB INC_FILES ../*.h ../../makesdna/*.h)
+IF(WITH_OPENEXR)
+ ADD_DEFINITIONS(-DWITH_OPENEXR)
+ENDIF(WITH_OPENEXR)
+
+IF(WITH_OPENJPEG)
+ ADD_DEFINITIONS(-DWITH_OPENJPEG)
+ENDIF(WITH_OPENJPEG)
+
+IF(WITH_DDS)
+ ADD_DEFINITIONS(-DWITH_DDS)
+ENDIF(WITH_DDS)
+
+IF(WITH_QUICKTIME)
+ ADD_DEFINITIONS(-DWITH_QUICKTIME)
+ENDIF(WITH_QUICKTIME)
+
+IF(WITH_FFMPEG)
+ ADD_DEFINITIONS(-DWITH_FFMPEG)
+ENDIF(WITH_FFMPEG)
+
# Build makesrna executable
ADD_EXECUTABLE(makesrna ${SRC} ${INC_FILES})
TARGET_LINK_LIBRARIES(makesrna bf_dna)
Modified: branches/blender2.5/blender/source/blender/makesrna/intern/Makefile
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/Makefile
2009-06-09 10:30:11 UTC (rev 20746)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/Makefile
2009-06-09 10:30:16 UTC (rev 20747)
@@ -53,6 +53,26 @@
CPPFLAGS += -I..
CPPFLAGS += -I.
+ifeq ($(WITH_FFMPEG),true)
+ CPPFLAGS += -DWITH_FFMPEG
+endif
+
+ifeq ($(WITH_OPENEXR), true)
+ CPPFLAGS += -DWITH_OPENEXR
+endif
+
+ifeq ($(WITH_DDS), true)
+ CPPFLAGS += -DWITH_DDS
+endif
+
+ifeq ($(WITH_OPENJPEG), true)
+ CPPFLAGS += -DWITH_OPENJPEG
+endif
+
+ifeq ($(WITH_QUICKTIME), true)
+ CPPFLAGS += -DWITH_QUICKTIME
+endif
+
ifeq ($(OS),windows)
# Windows needs these extra libs because of winstuff... It is not
# _really_ needed, but it is the easiest fix for now. If you have
Modified: branches/blender2.5/blender/source/blender/makesrna/intern/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/SConscript
2009-06-09 10:30:11 UTC (rev 20746)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/SConscript
2009-06-09 10:30:16 UTC (rev 20747)
@@ -24,6 +24,25 @@
rna = env.Clone()
makesrna_tool.Append(CCFLAGS = '-DBASE_HEADER="\\"source/blender/makesrna/\\""
')
+defs = []
+
+if env['WITH_BF_OPENEXR']:
+ defs.append('WITH_OPENEXR')
+
+if env['WITH_BF_OPENJPEG']:
+ defs.append('WITH_OPENJPEG')
+
+if env['WITH_BF_DDS']:
+ defs.append('WITH_DDS')
+
+if env['WITH_BF_FFMPEG']:
+ defs.append('WITH_FFMPEG')
+
+if env['WITH_BF_QUICKTIME']:
+ defs.append('WITH_QUICKTIME')
+
+makesrna_tool.Append(CPPDEFINES=defs)
+
makesrna_tool.Append (CPPPATH = ['#/intern/guardedalloc',
'../../blenlib',
'../../blenkernel',
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
