--- openal-soft-1.16.0/CMakeLists.txt.1 2017-03-06 20:28:29.522762930 +0300 +++ openal-soft-1.16.0/CMakeLists.txt 2017-03-06 20:29:41.657713043 +0300 @@ -997,10 +997,10 @@ IF(SDL_SOUND_FOUND AND CMAKE_VERSION VERSION_LESS "2.8.8") INCLUDE_DIRECTORIES(${SDL2_INCLUDE_DIR} ${SDL_SOUND_INCLUDE_DIR}) ENDIF() - FIND_PACKAGE(FFmpeg COMPONENTS AVFORMAT AVCODEC AVUTIL SWSCALE SWRESAMPLE) - IF(FFMPEG_FOUND AND CMAKE_VERSION VERSION_LESS "2.8.8") - INCLUDE_DIRECTORIES(${FFMPEG_INCLUDE_DIRS}) - ENDIF() +# FIND_PACKAGE(FFmpeg COMPONENTS AVFORMAT AVCODEC AVUTIL SWSCALE SWRESAMPLE) +# IF(FFMPEG_FOUND AND CMAKE_VERSION VERSION_LESS "2.8.8") +# INCLUDE_DIRECTORIES(${FFMPEG_INCLUDE_DIRS}) +# ENDIF() ENDIF() ENDIF() @@ -1206,29 +1206,29 @@ ) SET(FFVER_OK FALSE) - IF(FFMPEG_FOUND) - SET(FFVER_OK TRUE) - IF(AVFORMAT_VERSION VERSION_LESS "55.33.100") - MESSAGE(STATUS "libavformat is too old! (${AVFORMAT_VERSION}, wanted 55.33.100)") - SET(FFVER_OK FALSE) - ENDIF() - IF(AVCODEC_VERSION VERSION_LESS "55.52.102") - MESSAGE(STATUS "libavcodec is too old! (${AVCODEC_VERSION}, wanted 55.52.102)") - SET(FFVER_OK FALSE) - ENDIF() - IF(AVUTIL_VERSION VERSION_LESS "52.66.100") - MESSAGE(STATUS "libavutil is too old! (${AVUTIL_VERSION}, wanted 52.66.100)") - SET(FFVER_OK FALSE) - ENDIF() - IF(SWSCALE_VERSION VERSION_LESS "2.5.102") - MESSAGE(STATUS "libswscale is too old! (${SWSCALE_VERSION}, wanted 2.5.102)") - SET(FFVER_OK FALSE) - ENDIF() - IF(SWRESAMPLE_VERSION VERSION_LESS "0.18.100") - MESSAGE(STATUS "libswresample is too old! (${SWRESAMPLE_VERSION}, wanted 0.18.100)") - SET(FFVER_OK FALSE) - ENDIF() - ENDIF() +# IF(FFMPEG_FOUND) +# SET(FFVER_OK TRUE) +# IF(AVFORMAT_VERSION VERSION_LESS "55.33.100") +# MESSAGE(STATUS "libavformat is too old! (${AVFORMAT_VERSION}, wanted 55.33.100)") +# SET(FFVER_OK FALSE) +# ENDIF() +# IF(AVCODEC_VERSION VERSION_LESS "55.52.102") +# MESSAGE(STATUS "libavcodec is too old! (${AVCODEC_VERSION}, wanted 55.52.102)") +# SET(FFVER_OK FALSE) +# ENDIF() +# IF(AVUTIL_VERSION VERSION_LESS "52.66.100") +# MESSAGE(STATUS "libavutil is too old! (${AVUTIL_VERSION}, wanted 52.66.100)") +# SET(FFVER_OK FALSE) +# ENDIF() +# IF(SWSCALE_VERSION VERSION_LESS "2.5.102") +# MESSAGE(STATUS "libswscale is too old! (${SWSCALE_VERSION}, wanted 2.5.102)") +# SET(FFVER_OK FALSE) +# ENDIF() +# IF(SWRESAMPLE_VERSION VERSION_LESS "0.18.100") +# MESSAGE(STATUS "libswresample is too old! (${SWRESAMPLE_VERSION}, wanted 0.18.100)") +# SET(FFVER_OK FALSE) +# ENDIF() +# ENDIF() IF(FFVER_OK AND NOT MSVC) ADD_EXECUTABLE(alffplay examples/alffplay.c) TARGET_LINK_LIBRARIES(alffplay common ex-common ${SDL2_LIBRARY} ${LIBNAME} ${FFMPEG_LIBRARIES})