windows / msvc bump to python 3.5
authorMartijn Berger <martijn.berger@gmail.com>
Sun, 15 Nov 2015 10:21:26 +0000 (11:21 +0100)
committerMartijn Berger <martijn.berger@gmail.com>
Sun, 15 Nov 2015 10:21:26 +0000 (11:21 +0100)
CMakeLists.txt
build_files/scons/config/win32-vc-config.py
build_files/scons/config/win64-vc-config.py

index 26b841f85c49e81504a28b4a5269cee099d9d005..14eb2af58a45340a931aa3c73c983df2207c38df 100644 (file)
@@ -1450,7 +1450,7 @@ elseif(WIN32)
                endif()
 
                if(WITH_PYTHON)
-                       set(PYTHON_VERSION 3.4) # CACHE STRING)
+                       set(PYTHON_VERSION 3.5) # CACHE STRING)
 
                        string(REPLACE "." "" _PYTHON_VERSION_NO_DOTS ${PYTHON_VERSION})
                        # Use shared libs for vc2008 and vc2010 until we actually have vc2010 libs
index 9bd23a46d662da77b00140fa500ac47f6ea366e3..07d0dda05e58f9d97202bc14a4b5ac3dcbebbba0 100644 (file)
@@ -21,7 +21,7 @@ BF_FFMPEG_LIB = 'avformat-55.lib avcodec-55.lib avdevice-55.lib avutil-52.lib sw
 BF_FFMPEG_DLL = '${BF_FFMPEG_LIBPATH}/avformat-55.dll ${BF_FFMPEG_LIBPATH}/avcodec-55.dll ${BF_FFMPEG_LIBPATH}/avdevice-55.dll ${BF_FFMPEG_LIBPATH}/avutil-52.dll ${BF_FFMPEG_LIBPATH}/swscale-2.dll'
 
 BF_PYTHON = LIBDIR + '/python'
-BF_PYTHON_VERSION = '3.4'
+BF_PYTHON_VERSION = '3.5'
 BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
 BF_PYTHON_BINARY = 'python'
 BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION[0]}${BF_PYTHON_VERSION[2]}'
index adacc2946c58f2d9dbcf57064302bf271ba4ac7d..3b4551565c60416a6a071eabd07cd0af70b2eb91 100644 (file)
@@ -22,7 +22,7 @@ BF_FFMPEG_DLL = '${BF_FFMPEG_LIBPATH}/avformat-55.dll ${BF_FFMPEG_LIBPATH}/avcod
     
 
 BF_PYTHON = LIBDIR + '/python'
-BF_PYTHON_VERSION = '3.4'
+BF_PYTHON_VERSION = '3.5'
 BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
 BF_PYTHON_BINARY = 'python'
 BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION[0]}${BF_PYTHON_VERSION[2]}'