[msvc] Changes for new oiio/ffmpeg versions.
authorlazydodo <github@lazydodo.com>
Sun, 4 Dec 2016 00:38:20 +0000 (17:38 -0700)
committerlazydodo <github@lazydodo.com>
Sun, 4 Dec 2016 00:38:20 +0000 (17:38 -0700)
build_files/cmake/platform/platform_win32_msvc.cmake
source/creator/CMakeLists.txt

index 96c9ec91d11619b4d228708364d864932f11fb7e..3b50351a1313fa9f1c663941b026735826254028 100644 (file)
@@ -238,14 +238,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()
@@ -380,6 +380,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)
index 04a79f6498f78a1515e17856eae18b9e8ce5521c..eea4554594936c39ee5693a8e2cffe5cf9b40f74 100644 (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()