diff options
| author | lazydodo <github@lazydodo.com> | 2017-02-03 19:47:54 +0300 |
|---|---|---|
| committer | lazydodo <github@lazydodo.com> | 2017-02-03 19:47:54 +0300 |
| commit | a3e746733d7c358eb6293288283aaac51740f9ae (patch) | |
| tree | 48b94557306172b626680c62afe08b0acba778ab | |
| parent | 8fa3801c49cdb25a99d8963eb9ec81d1298297a6 (diff) | |
[msvc] cmake fixes to support the recent for oiio/ffmpeg/numpy version changes.
| -rw-r--r-- | build_files/cmake/platform/platform_win32_msvc.cmake | 15 | ||||
| -rw-r--r-- | source/creator/CMakeLists.txt | 16 |
2 files changed, 15 insertions, 16 deletions
diff --git a/build_files/cmake/platform/platform_win32_msvc.cmake b/build_files/cmake/platform/platform_win32_msvc.cmake index 5efda52b2c5..ecdba59978e 100644 --- a/build_files/cmake/platform/platform_win32_msvc.cmake +++ b/build_files/cmake/platform/platform_win32_msvc.cmake @@ -236,14 +236,14 @@ if(WITH_CODEC_FFMPEG) windows_find_package(FFMPEG) if(NOT FFMPEG_FOUND) warn_hardcoded_paths(ffmpeg) - set(FFMPEG_LIBRARY_VERSION 55) - set(FFMPEG_LIBRARY_VERSION_AVU 52) + set(FFMPEG_LIBRARY_VERSION 57) + set(FFMPEG_LIBRARY_VERSION_AVU 55) set(FFMPEG_LIBRARIES - ${LIBDIR}/ffmpeg/lib/avcodec-${FFMPEG_LIBRARY_VERSION}.lib - ${LIBDIR}/ffmpeg/lib/avformat-${FFMPEG_LIBRARY_VERSION}.lib - ${LIBDIR}/ffmpeg/lib/avdevice-${FFMPEG_LIBRARY_VERSION}.lib - ${LIBDIR}/ffmpeg/lib/avutil-${FFMPEG_LIBRARY_VERSION_AVU}.lib - ${LIBDIR}/ffmpeg/lib/swscale-2.lib + ${LIBDIR}/ffmpeg/lib/avcodec.lib + ${LIBDIR}/ffmpeg/lib/avformat.lib + ${LIBDIR}/ffmpeg/lib/avdevice.lib + ${LIBDIR}/ffmpeg/lib/avutil.lib + ${LIBDIR}/ffmpeg/lib/swscale.lib ) endif() endif() @@ -378,6 +378,7 @@ if(WITH_OPENIMAGEIO) set(OPENCOLORIO_DEFINITIONS "-DOCIO_STATIC_BUILD") set(OPENIMAGEIO_IDIFF "${OPENIMAGEIO}/bin/idiff.exe") add_definitions(-DOIIO_STATIC_BUILD) + add_definitions(-DOIIO_NO_SSE=1) endif() if(WITH_LLVM) diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index f65688e1304..2df5ddc81af 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) - 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() |