Revision: 39182
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39182
Author: nazgul
Date: 2011-08-08 12:39:02 +0000 (Mon, 08 Aug 2011)
Log Message:
-----------
Camera tracking integration
===========================
- Fixing typo in scons rules
- CMake should use correct pathes for windows/osx now.
Modified Paths:
--------------
branches/soc-2011-tomato/CMakeLists.txt
branches/soc-2011-tomato/build_files/scons/config/darwin-config.py
Modified: branches/soc-2011-tomato/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/CMakeLists.txt 2011-08-08 12:18:32 UTC (rev
39181)
+++ branches/soc-2011-tomato/CMakeLists.txt 2011-08-08 12:39:02 UTC (rev
39182)
@@ -690,15 +690,15 @@
if(WITH_CODEC_FFMPEG)
set(FFMPEG_INCLUDE_DIRS
- ${LIBDIR}/ffmpeg/include
- ${LIBDIR}/ffmpeg/include/msvc
+ ${LIBDIR}/ffmpeg-0.8/include
+ ${LIBDIR}/ffmpeg-0.8/include/msvc
)
set(FFMPEG_LIBRARIES
- ${LIBDIR}/ffmpeg/lib/avcodec-53.lib
- ${LIBDIR}/ffmpeg/lib/avformat-53.lib
- ${LIBDIR}/ffmpeg/lib/avdevice-53.lib
- ${LIBDIR}/ffmpeg/lib/avutil-51.lib
- ${LIBDIR}/ffmpeg/lib/swscale-2.lib
+ ${LIBDIR}/ffmpeg-0.8/lib/avcodec-53.lib
+ ${LIBDIR}/ffmpeg-0.8/lib/avformat-53.lib
+ ${LIBDIR}/ffmpeg-0.8/lib/avdevice-53.lib
+ ${LIBDIR}/ffmpeg-0.8/lib/avutil-51.lib
+ ${LIBDIR}/ffmpeg-0.8/lib/swscale-2.lib
)
endif()
@@ -823,7 +823,7 @@
endif()
if(WITH_CODEC_FFMPEG)
- set(FFMPEG ${LIBDIR}/ffmpeg)
+ set(FFMPEG ${LIBDIR}/ffmpeg-0.8)
set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include
${FFMPEG}/include)
set(FFMPEG_LIBRARIES avcodec-53 avformat-53 avdevice-53
avutil-51 swscale-2)
set(FFMPEG_LIBPATH ${FFMPEG}/lib)
@@ -962,7 +962,7 @@
endif()
if(WITH_CODEC_FFMPEG)
- set(FFMPEG ${LIBDIR}/ffmpeg)
+ set(FFMPEG ${LIBDIR}/ffmpeg-0.8)
set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include)
set(FFMPEG_LIBRARIES avcodec avdevice avformat avutil mp3lame
swscale x264 xvidcore theora theoradec theoraenc vorbis vorbisenc vorbisfile
ogg)
set(FFMPEG_LIBPATH ${FFMPEG}/lib)
Modified: branches/soc-2011-tomato/build_files/scons/config/darwin-config.py
===================================================================
--- branches/soc-2011-tomato/build_files/scons/config/darwin-config.py
2011-08-08 12:18:32 UTC (rev 39181)
+++ branches/soc-2011-tomato/build_files/scons/config/darwin-config.py
2011-08-08 12:39:02 UTC (rev 39182)
@@ -98,7 +98,7 @@
# enable ffmpeg support
WITH_BF_FFMPEG = True # -DWITH_FFMPEG
-BF_FFMPEG = LIBDIR + '/ffmpeg-9.8'
+BF_FFMPEG = LIBDIR + '/ffmpeg-0.8'
BF_FFMPEG_INC = "${BF_FFMPEG}/include"
BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
BF_FFMPEG_LIB = 'avcodec avdevice avformat avutil mp3lame swscale x264
xvidcore theora theoradec theoraenc vorbis vorbisenc vorbisfile ogg bz2'
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
