kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Camera tracking integration

Browse Source 
===========================

- Fixing typo in scons rules
- CMake should use correct pathes for windows/osx now.
This commit is contained in:
Sergey Sharybin 2011-08-08 12:39:02 +00:00
parent 08c4aaa01b
commit cda2e61784
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
CMakeLists.txt
View File

@ -690,15 +690,15 @@ elseif(WIN32)
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 @@ elseif(WIN32)
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 @@ elseif(APPLE)
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)

2
build_files/scons/config/darwin-config.py
View File

@ -98,7 +98,7 @@ else:
# 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'