diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-06-13 15:09:13 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-06-13 15:09:13 +0400 |
| commit | eed13b43b19c619ccdcda67b17c0da65ad44879c (patch) | |
| tree | aa759322ad2b18becaf237671dd71ffbda9c2076 /config/win32-vc-config.py | |
| parent | e10e1ac04e63ed04a5712e515ed28eb92a78fd62 (diff) | |
| parent | 2f1e118c30946bd3117c59cd45f13d79e4b612ec (diff) | |
merged from trunk 20741:20848
* Missing changes to release/windows/installer
* Sequencer fixes in source/blender/src/seqaudio.c dont apply to 2.5
* brechts fix for #18855 r20763 wasnt merged, does this apply to 2.5?
Diffstat (limited to 'config/win32-vc-config.py')
| -rw-r--r-- | config/win32-vc-config.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/win32-vc-config.py b/config/win32-vc-config.py index 1fc1d219f57..04e87a23ed1 100644 --- a/config/win32-vc-config.py +++ b/config/win32-vc-config.py @@ -9,10 +9,10 @@ BF_FFMPEG_LIBPATH='${BF_FFMPEG}/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 = '2.5' +BF_PYTHON_VERSION = '2.6' BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}' BF_PYTHON_BINARY = 'python' -BF_PYTHON_LIB = 'python25' +BF_PYTHON_LIB = 'python26' BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib' WITH_BF_OPENAL = True |