Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[msvc] Changes for new oiio/ffmpeg versions.

Browse Source
This commit is contained in:
lazydodo
2016-12-03 17:38:20 -07:00
parent ae04d0fcb6
commit 923eae25d1
2 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/creator/CMakeLists.txt
View File

@@ -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()