@@ -40,22 +40,22 @@ execute_process(
4040 OUTPUT_STRIP_TRAILING_WHITESPACE)
4141
4242# Download prebuilt ffmpeg
43- if (NOT EXISTS "${CMAKE_BINARY_DIR} /external /ffmpeg.zip" )
43+ if (NOT EXISTS "${CMAKE_BINARY_DIR} /3rdparty /ffmpeg.zip" )
4444 message (STATUS "Downloading FFMPEG prebuilts..." )
45- file (DOWNLOAD https://github.com/Vita3K /ffmpeg-core/releases/download/${FFMPEG_GIT_SHA} /${FFMPEG_PREBUILTS_NAME}
46- "${CMAKE_BINARY_DIR} /external /ffmpeg.zip" SHOW_PROGRESS
45+ file (DOWNLOAD https://github.com/RPCS3 /ffmpeg-core/releases/download/${FFMPEG_GIT_SHA} /${FFMPEG_PREBUILTS_NAME}
46+ "${CMAKE_BINARY_DIR} /3rdparty /ffmpeg.zip" SHOW_PROGRESS
4747 STATUS FILE_STATUS)
4848 list (GET FILE_STATUS 0 STATUS_CODE)
4949 if (NOT STATUS_CODE EQUAL 0)
50- file (REMOVE "${CMAKE_BINARY_DIR} /external /ffmpeg.zip" ) # CMake create 0 byte file even if URL is invalid. So need to delete it.
50+ file (REMOVE "${CMAKE_BINARY_DIR} /3rdparty /ffmpeg.zip" ) # CMake create 0 byte file even if URL is invalid. So need to delete it.
5151 message (FATAL_ERROR "No FFMPEG prebuilt found with corresponding commit SHA (${FFMPEG_GIT_SHA} )" )
5252 endif ()
5353endif ()
5454
55- if (NOT EXISTS "${CMAKE_BINARY_DIR} /external /ffmpeg/lib" )
56- file (MAKE_DIRECTORY "${CMAKE_BINARY_DIR} /external /ffmpeg/lib" )
57- execute_process (COMMAND ${CMAKE_COMMAND} -E tar xzf "${CMAKE_BINARY_DIR} /external /ffmpeg.zip"
58- WORKING_DIRECTORY "${CMAKE_BINARY_DIR} /external /ffmpeg/lib" )
55+ if (NOT EXISTS "${CMAKE_BINARY_DIR} /3rdparty /ffmpeg/lib" )
56+ file (MAKE_DIRECTORY "${CMAKE_BINARY_DIR} /3rdparty /ffmpeg/lib" )
57+ execute_process (COMMAND ${CMAKE_COMMAND} -E tar xzf "${CMAKE_BINARY_DIR} /3rdparty /ffmpeg.zip"
58+ WORKING_DIRECTORY "${CMAKE_BINARY_DIR} /3rdparty /ffmpeg/lib" )
5959endif ()
6060
6161set (LIB_PREFIX "lib" )
@@ -73,9 +73,9 @@ elseif (APPLE)
7373endif ()
7474
7575target_link_libraries (${FFMPEG_CORE_NAME} INTERFACE
76- "${CMAKE_BINARY_DIR} /external /ffmpeg/lib/${LIB_PREFIX} avformat.${LIB_EXT} "
77- "${CMAKE_BINARY_DIR} /external /ffmpeg/lib/${LIB_PREFIX} avcodec.${LIB_EXT} "
78- "${CMAKE_BINARY_DIR} /external /ffmpeg/lib/${LIB_PREFIX} swscale.${LIB_EXT} "
79- "${CMAKE_BINARY_DIR} /external /ffmpeg/lib/${LIB_PREFIX} avutil.${LIB_EXT} "
80- "${CMAKE_BINARY_DIR} /external /ffmpeg/lib/${LIB_PREFIX} avfilter.${LIB_EXT} "
81- "${CMAKE_BINARY_DIR} /external /ffmpeg/lib/${LIB_PREFIX} swresample.${LIB_EXT} " )
76+ "${CMAKE_BINARY_DIR} /3rdparty /ffmpeg/lib/${LIB_PREFIX} avformat.${LIB_EXT} "
77+ "${CMAKE_BINARY_DIR} /3rdparty /ffmpeg/lib/${LIB_PREFIX} avcodec.${LIB_EXT} "
78+ "${CMAKE_BINARY_DIR} /3rdparty /ffmpeg/lib/${LIB_PREFIX} swscale.${LIB_EXT} "
79+ "${CMAKE_BINARY_DIR} /3rdparty /ffmpeg/lib/${LIB_PREFIX} avutil.${LIB_EXT} "
80+ "${CMAKE_BINARY_DIR} /3rdparty /ffmpeg/lib/${LIB_PREFIX} avfilter.${LIB_EXT} "
81+ "${CMAKE_BINARY_DIR} /3rdparty /ffmpeg/lib/${LIB_PREFIX} swresample.${LIB_EXT} " )
0 commit comments