Don't have ffmpeg's download take forever.
Thanks for the assist teleshoes.
This commit is contained in:
+6
-6
@@ -300,7 +300,7 @@ elseif(LINUX)
|
||||
endif()
|
||||
else()
|
||||
list(APPEND FFMPEG_CONFIGURE
|
||||
"${SM_EXTERN_DIR}/ffmpeg-linux/src/ffmpeg/configure"
|
||||
"${SM_EXTERN_DIR}/ffmpeg-linux-2.1.3/configure"
|
||||
"--disable-programs"
|
||||
"--disable-doc"
|
||||
"--disable-avdevice"
|
||||
@@ -315,13 +315,13 @@ elseif(LINUX)
|
||||
"--enable-gpl"
|
||||
)
|
||||
endif()
|
||||
# NEVER use the system ffmpeg. Not worth the hassle.
|
||||
# --shlibdir=$our_installdir/stepmania-$VERSION
|
||||
externalproject_add("ffmpeg"
|
||||
DOWNLOAD_DIR "${SM_EXTERN_DIR}/ffmpeg-linux"
|
||||
PREFIX "${SM_EXTERN_DIR}/ffmpeg-linux"
|
||||
GIT_REPOSITORY "git://source.ffmpeg.org/ffmpeg.git"
|
||||
GIT_TAG "n2.1.3"
|
||||
# DOWNLOAD_DIR "${SM_EXTERN_DIR}/ffmpeg-linux"
|
||||
# PREFIX "${SM_EXTERN_DIR}/ffmpeg-linux"
|
||||
# GIT_REPOSITORY "git://source.ffmpeg.org/ffmpeg.git"
|
||||
# GIT_TAG "n2.1.3"
|
||||
DOWNLOAD_COMMAND git clone "--branch" "n2.1.3" "--depth" "1" "git://source.ffmpeg.org/ffmpeg.git" "${SM_EXTERN_DIR}/ffmpeg-linux-2.1.3"
|
||||
CONFIGURE_COMMAND ${FFMPEG_CONFIGURE}
|
||||
BUILD_COMMAND "make"
|
||||
UPDATE_COMMAND ""
|
||||
|
||||
+6
-5
@@ -392,11 +392,12 @@ else() # Unix / Linux
|
||||
"${FFMPEG_avutil_LIBRARY}"
|
||||
)
|
||||
else()
|
||||
set(SM_FFMPEG_ROOT "${CMAKE_BINARY_DIR}/ffmpeg-prefix/src/ffmpeg-build")
|
||||
list(APPEND SMDATA_LINK_LIB
|
||||
"${SM_EXTERN_DIR}/ffmpeg-linux/src/ffmpeg-build/libavformat/libavformat.a"
|
||||
"${SM_EXTERN_DIR}/ffmpeg-linux/src/ffmpeg-build/libavcodec/libavcodec.a"
|
||||
"${SM_EXTERN_DIR}/ffmpeg-linux/src/ffmpeg-build/libswscale/libswscale.a"
|
||||
"${SM_EXTERN_DIR}/ffmpeg-linux/src/ffmpeg-build/libavutil/libavutil.a"
|
||||
"${SM_FFMPEG_ROOT}/libavformat/libavformat.a"
|
||||
"${SM_FFMPEG_ROOT}/libavcodec/libavcodec.a"
|
||||
"${SM_FFMPEG_ROOT}/libswscale/libswscale.a"
|
||||
"${SM_FFMPEG_ROOT}/libavutil/libavutil.a"
|
||||
)
|
||||
endif()
|
||||
endif()
|
||||
@@ -531,7 +532,7 @@ target_include_directories("${SM_EXE_NAME}" PUBLIC ${SM_INCLUDE_DIRS})
|
||||
|
||||
if(WIN32)
|
||||
# TODO: Look forward to 64-bit builds. Also, Find a way to not need to hardcode this.
|
||||
set(SM_INSTALL_DESTINATION "C:/Program Files (x86)")
|
||||
set(SM_INSTALL_DESTINATION "C:/Program Files (x86)/StepMania 5")
|
||||
elseif(APPLE)
|
||||
# TODO: Confirm if anything special is needed. Most Mac apps are just portable .app folders.
|
||||
set(SM_INSTALL_DESTINATION "")
|
||||
|
||||
Reference in New Issue
Block a user