actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Don't have ffmpeg's download take forever.

Browse Source 
Thanks for the assist teleshoes.
This commit is contained in:
Jason Felds
2015-03-24 19:12:28 -04:00
parent b9551cc392
commit 6963e4d493
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+6 -6
View File
@@ -300,7 +300,7 @@ elseif(LINUX)
endif() endif()
else() else()
list(APPEND FFMPEG_CONFIGURE list(APPEND FFMPEG_CONFIGURE
"${SM_EXTERN_DIR}/ffmpeg-linux/src/ffmpeg/configure" "${SM_EXTERN_DIR}/ffmpeg-linux-2.1.3/configure"
"--disable-programs" "--disable-programs"
"--disable-doc" "--disable-doc"
"--disable-avdevice" "--disable-avdevice"
@@ -315,13 +315,13 @@ elseif(LINUX)
"--enable-gpl" "--enable-gpl"
) )
endif() endif()
# NEVER use the system ffmpeg. Not worth the hassle.
# --shlibdir=$our_installdir/stepmania-$VERSION # --shlibdir=$our_installdir/stepmania-$VERSION
externalproject_add("ffmpeg" externalproject_add("ffmpeg"
DOWNLOAD_DIR "${SM_EXTERN_DIR}/ffmpeg-linux" # DOWNLOAD_DIR "${SM_EXTERN_DIR}/ffmpeg-linux"
PREFIX "${SM_EXTERN_DIR}/ffmpeg-linux" # PREFIX "${SM_EXTERN_DIR}/ffmpeg-linux"
GIT_REPOSITORY "git://source.ffmpeg.org/ffmpeg.git" # GIT_REPOSITORY "git://source.ffmpeg.org/ffmpeg.git"
GIT_TAG "n2.1.3" # 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} CONFIGURE_COMMAND ${FFMPEG_CONFIGURE}
BUILD_COMMAND "make" BUILD_COMMAND "make"
UPDATE_COMMAND "" UPDATE_COMMAND ""
src/CMakeLists.txt
+6 -5
View File
@@ -392,11 +392,12 @@ else() # Unix / Linux
"${FFMPEG_avutil_LIBRARY}" "${FFMPEG_avutil_LIBRARY}"
) )
else() else()
set(SM_FFMPEG_ROOT "${CMAKE_BINARY_DIR}/ffmpeg-prefix/src/ffmpeg-build")
list(APPEND SMDATA_LINK_LIB list(APPEND SMDATA_LINK_LIB
"${SM_EXTERN_DIR}/ffmpeg-linux/src/ffmpeg-build/libavformat/libavformat.a" "${SM_FFMPEG_ROOT}/libavformat/libavformat.a"
"${SM_EXTERN_DIR}/ffmpeg-linux/src/ffmpeg-build/libavcodec/libavcodec.a" "${SM_FFMPEG_ROOT}/libavcodec/libavcodec.a"
"${SM_EXTERN_DIR}/ffmpeg-linux/src/ffmpeg-build/libswscale/libswscale.a" "${SM_FFMPEG_ROOT}/libswscale/libswscale.a"
"${SM_EXTERN_DIR}/ffmpeg-linux/src/ffmpeg-build/libavutil/libavutil.a" "${SM_FFMPEG_ROOT}/libavutil/libavutil.a"
) )
endif() endif()
endif() endif()
@@ -531,7 +532,7 @@ target_include_directories("${SM_EXE_NAME}" PUBLIC ${SM_INCLUDE_DIRS})
if(WIN32) if(WIN32)
# TODO: Look forward to 64-bit builds. Also, Find a way to not need to hardcode this. # 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) elseif(APPLE)
# TODO: Confirm if anything special is needed. Most Mac apps are just portable .app folders. # TODO: Confirm if anything special is needed. Most Mac apps are just portable .app folders.
set(SM_INSTALL_DESTINATION "") set(SM_INSTALL_DESTINATION "")