Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorDaniel Genrich <daniel.genrich@gmx.net>2010-02-23 01:56:28 +0300
committerDaniel Genrich <daniel.genrich@gmx.net>2010-02-23 01:56:28 +0300
commit8a31fab3041d4c9804fdce036dc70637f4993507 (patch)
tree727ee36f18b98b737830d01fd9d327a3e36f9ac2 /config
parenta7d606a2ff2b696fb61e20b96320d7ed4513f688 (diff)
Win64: Bugfix for non working scons, thanks to matd for the fix!
jesterKing: please check if the win32 dll's aren't needed anymore. Seems that they are compiled into ffmpeg, right?
Diffstat (limited to 'config')
-rw-r--r--config/win64-vc-config.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/config/win64-vc-config.py b/config/win64-vc-config.py
index 9ba52d4c774..41772dea14b 100644
--- a/config/win64-vc-config.py
+++ b/config/win64-vc-config.py
@@ -2,11 +2,11 @@ LCGDIR = '#../lib/win64'
LIBDIR = '${LCGDIR}'
# enable ffmpeg support
-WITH_BF_FFMPEG = False # -DWITH_FFMPEG
+WITH_BF_FFMPEG = True # -DWITH_FFMPEG
BF_FFMPEG = LIBDIR +'/ffmpeg'
BF_FFMPEG_INC = '${BF_FFMPEG}/include ${BF_FFMPEG}/include/msvc '
BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
-BF_FFMPEG_LIB = 'avformat-52.lib avcodec-51.lib avdevice-52.lib avutil-49.lib swscale-0.lib'
+BF_FFMPEG_LIB = 'avformat-52.lib avcodec-52.lib avdevice-52.lib avutil-50.lib swscale-0.lib'
BF_PYTHON = LIBDIR + '/python'
BF_PYTHON_VERSION = '3.1'