diff --git a/scripts/android/ffmpeg.sh b/scripts/android/ffmpeg.sh index 2cdae1b..c8dd207 100755 --- a/scripts/android/ffmpeg.sh +++ b/scripts/android/ffmpeg.sh @@ -12,7 +12,7 @@ source "${BASEDIR}"/scripts/function-"${FFMPEG_KIT_BUILD_TYPE}".sh 1>>"${BASEDIR LIB_NAME="ffmpeg" echo -e "----------------------------------------------------------------" 1>>"${BASEDIR}"/build.log 2>&1 -echo -e "\nINFO: Building ${LIB_NAME} with the following environment variables\n" 1>>"${BASEDIR}"/build.log 2>&1 +echo -e "\nINFO: Building ${LIB_NAME} for ${HOST} with the following environment variables\n" 1>>"${BASEDIR}"/build.log 2>&1 env 1>>"${BASEDIR}"/build.log 2>&1 echo -e "----------------------------------------------------------------\n" 1>>"${BASEDIR}"/build.log 2>&1 echo -e "INFO: System information\n" 1>>"${BASEDIR}"/build.log 2>&1 diff --git a/scripts/apple/ffmpeg-kit.sh b/scripts/apple/ffmpeg-kit.sh index cc795d7..576663b 100755 --- a/scripts/apple/ffmpeg-kit.sh +++ b/scripts/apple/ffmpeg-kit.sh @@ -6,7 +6,7 @@ source "${BASEDIR}"/scripts/function-"${FFMPEG_KIT_BUILD_TYPE}".sh 1>>"${BASEDIR LIB_NAME="ffmpeg-kit" echo -e "----------------------------------------------------------------" 1>>"${BASEDIR}"/build.log 2>&1 -echo -e "\nINFO: Building ${LIB_NAME} with the following environment variables\n" 1>>"${BASEDIR}"/build.log 2>&1 +echo -e "\nINFO: Building ${LIB_NAME} for ${HOST} with the following environment variables\n" 1>>"${BASEDIR}"/build.log 2>&1 env 1>>"${BASEDIR}"/build.log 2>&1 echo -e "----------------------------------------------------------------\n" 1>>"${BASEDIR}"/build.log 2>&1 echo -e "INFO: System information\n" 1>>"${BASEDIR}"/build.log 2>&1 diff --git a/scripts/apple/ffmpeg.sh b/scripts/apple/ffmpeg.sh index 5bfa2c0..0d43ae7 100755 --- a/scripts/apple/ffmpeg.sh +++ b/scripts/apple/ffmpeg.sh @@ -12,7 +12,7 @@ source "${BASEDIR}"/scripts/function-"${FFMPEG_KIT_BUILD_TYPE}".sh 1>>"${BASEDIR LIB_NAME="ffmpeg" echo -e "----------------------------------------------------------------" 1>>"${BASEDIR}"/build.log 2>&1 -echo -e "\nINFO: Building ${LIB_NAME} with the following environment variables\n" 1>>"${BASEDIR}"/build.log 2>&1 +echo -e "\nINFO: Building ${LIB_NAME} for ${HOST} with the following environment variables\n" 1>>"${BASEDIR}"/build.log 2>&1 env 1>>"${BASEDIR}"/build.log 2>&1 echo -e "----------------------------------------------------------------\n" 1>>"${BASEDIR}"/build.log 2>&1 echo -e "INFO: System information\n" 1>>"${BASEDIR}"/build.log 2>&1 diff --git a/scripts/run-android.sh b/scripts/run-android.sh index 5ce3b95..29cf4e9 100755 --- a/scripts/run-android.sh +++ b/scripts/run-android.sh @@ -4,15 +4,6 @@ source "${BASEDIR}"/scripts/function-"${FFMPEG_KIT_BUILD_TYPE}".sh || return 1 LIB_NAME=$1 - -echo -e "----------------------------------------------------------------" -echo -e "\nINFO: Building ${LIB_NAME} with the following environment variables\n" -env -echo -e "----------------------------------------------------------------\n" -echo -e "INFO: System information\n" -echo -e "INFO: $(uname -a)\n" -echo -e "----------------------------------------------------------------\n" - ENABLED_LIBRARY_PATH="${LIB_INSTALL_BASE}/${LIB_NAME}" # DELETE THE PREVIOUS BUILD OF THE LIBRARY @@ -31,6 +22,14 @@ export CXXFLAGS=$(get_cxxflags "${LIB_NAME}") export LDFLAGS=$(get_ldflags "${LIB_NAME}") export PKG_CONFIG_LIBDIR="${INSTALL_PKG_CONFIG_DIR}" +echo -e "----------------------------------------------------------------" +echo -e "\nINFO: Building ${LIB_NAME} for ${HOST} with the following environment variables\n" +env +echo -e "----------------------------------------------------------------\n" +echo -e "INFO: System information\n" +echo -e "INFO: $(uname -a)\n" +echo -e "----------------------------------------------------------------\n" + cd "${BASEDIR}"/src/"${LIB_NAME}" || return 1 LIB_INSTALL_PREFIX="${ENABLED_LIBRARY_PATH}" diff --git a/scripts/run-apple.sh b/scripts/run-apple.sh index 397d6bc..0ac1198 100755 --- a/scripts/run-apple.sh +++ b/scripts/run-apple.sh @@ -4,15 +4,6 @@ source "${BASEDIR}"/scripts/function-"${FFMPEG_KIT_BUILD_TYPE}".sh || return 1 LIB_NAME=$1 - -echo -e "----------------------------------------------------------------" -echo -e "\nINFO: Building ${LIB_NAME} with the following environment variables\n" -env -echo -e "----------------------------------------------------------------\n" -echo -e "INFO: System information\n" -echo -e "INFO: $(uname -a)\n" -echo -e "----------------------------------------------------------------\n" - ENABLED_LIBRARY_PATH="${LIB_INSTALL_BASE}/${LIB_NAME}" # DELETE THE PREVIOUS BUILD OF THE LIBRARY @@ -37,6 +28,14 @@ LIB_INSTALL_PREFIX="${ENABLED_LIBRARY_PATH}" BUILD_DIR=$(get_cmake_build_directory) CMAKE_SYSTEM_NAME=$(get_apple_cmake_system_name) +echo -e "----------------------------------------------------------------" +echo -e "\nINFO: Building ${LIB_NAME} for ${HOST} with the following environment variables\n" +env +echo -e "----------------------------------------------------------------\n" +echo -e "INFO: System information\n" +echo -e "INFO: $(uname -a)\n" +echo -e "----------------------------------------------------------------\n" + rm -rf "${LIB_INSTALL_PREFIX}" || return 1 rm -rf "${BUILD_DIR}" || return 1