From 923eae25d1abf7b93edf553982877672f6259dcb Mon Sep 17 00:00:00 2001
From: lazydodo <github@lazydodo.com>
Date: Sat, 3 Dec 2016 17:38:20 -0700
Subject: [msvc] Changes for new oiio/ffmpeg versions.

---
 source/creator/CMakeLists.txt | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

(limited to 'source/creator')

diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 04a79f6498f..eea45545949 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -713,10 +713,7 @@ elseif(WIN32)
 			)
 
 			if(WITH_PYTHON_INSTALL_NUMPY)
-				set(PYTHON_NUMPY_VERSION 1.9)
-				if((MSVC_VERSION EQUAL 1900) OR (MSVC_VERSION EQUAL 1910))
-					set(PYTHON_NUMPY_VERSION 1.11)
-				endif()
+				set(PYTHON_NUMPY_VERSION 1.10)
 				add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${BLENDER_VERSION}/python/lib/site-packages
 					COMMAND ${CMAKE_COMMAND} -E
 					        make_directory ${CMAKE_CURRENT_BINARY_DIR}/${BLENDER_VERSION}/python/lib/site-packages)
@@ -830,11 +827,12 @@ elseif(WIN32)
 		else()
 			install(
 				FILES
-					${LIBDIR}/ffmpeg/lib/avcodec-55.dll
-					${LIBDIR}/ffmpeg/lib/avformat-55.dll
-					${LIBDIR}/ffmpeg/lib/avdevice-55.dll
-					${LIBDIR}/ffmpeg/lib/avutil-52.dll
-					${LIBDIR}/ffmpeg/lib/swscale-2.dll
+					${LIBDIR}/ffmpeg/lib/avcodec-57.dll
+					${LIBDIR}/ffmpeg/lib/avformat-57.dll
+					${LIBDIR}/ffmpeg/lib/avdevice-57.dll
+					${LIBDIR}/ffmpeg/lib/avutil-55.dll
+					${LIBDIR}/ffmpeg/lib/swscale-4.dll
+					${LIBDIR}/ffmpeg/lib/swresample-2.dll
 				DESTINATION "."
 			)
 		endif()
-- 
cgit v1.2.3