diff options
| -rwxr-xr-x | build/make/iosbuild.sh | 12 | ||||
| -rw-r--r-- | vp9/common/vp9_thread_common.h | 6 |
2 files changed, 6 insertions, 12 deletions
diff --git a/build/make/iosbuild.sh b/build/make/iosbuild.sh index 927f3e532..6f7180d08 100755 --- a/build/make/iosbuild.sh +++ b/build/make/iosbuild.sh @@ -25,7 +25,6 @@ CONFIGURE_ARGS="--disable-docs DIST_DIR="_dist" FRAMEWORK_DIR="VPX.framework" HEADER_DIR="${FRAMEWORK_DIR}/Headers/vpx" -MAKE_JOBS=1 SCRIPT_DIR=$(dirname "$0") LIBVPX_SOURCE_DIR=$(cd ${SCRIPT_DIR}/../..; pwd) LIPO=$(xcrun -sdk iphoneos${SDK} -find lipo) @@ -58,7 +57,7 @@ build_target() { ${CONFIGURE_ARGS} ${EXTRA_CONFIGURE_ARGS} ${target_specific_flags} \ ${devnull} export DIST_DIR - eval make -j ${MAKE_JOBS} dist ${devnull} + eval make dist ${devnull} cd "${old_pwd}" vlog "***Done building target: ${target}***" @@ -203,7 +202,6 @@ cat << EOF Usage: ${0##*/} [arguments] --help: Display this message and exit. --extra-configure-args <args>: Extra args to pass when configuring libvpx. - --jobs: Number of make jobs. --preserve-build-output: Do not delete the build directory. --show-build-output: Show output from each library build. --targets <targets>: Override default target list. Defaults: @@ -238,10 +236,6 @@ while [ -n "$1" ]; do iosbuild_usage exit ;; - --jobs) - MAKE_JOBS="$2" - shift - ;; --preserve-build-output) PRESERVE_BUILD_OUTPUT=yes ;; @@ -274,11 +268,11 @@ cat << EOF EXTRA_CONFIGURE_ARGS=${EXTRA_CONFIGURE_ARGS} FRAMEWORK_DIR=${FRAMEWORK_DIR} HEADER_DIR=${HEADER_DIR} - MAKE_JOBS=${MAKE_JOBS} - PRESERVE_BUILD_OUTPUT=${PRESERVE_BUILD_OUTPUT} LIBVPX_SOURCE_DIR=${LIBVPX_SOURCE_DIR} LIPO=${LIPO} + MAKEFLAGS=${MAKEFLAGS} ORIG_PWD=${ORIG_PWD} + PRESERVE_BUILD_OUTPUT=${PRESERVE_BUILD_OUTPUT} TARGETS="${TARGETS}" EOF fi diff --git a/vp9/common/vp9_thread_common.h b/vp9/common/vp9_thread_common.h index db6587fcb..b3b60c253 100644 --- a/vp9/common/vp9_thread_common.h +++ b/vp9/common/vp9_thread_common.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef VP9_COMMON_VP9_LOOPFILTER_THREAD_H_ -#define VP9_COMMON_VP9_LOOPFILTER_THREAD_H_ +#ifndef VP9_COMMON_VP9_THREAD_COMMON_H_ +#define VP9_COMMON_VP9_THREAD_COMMON_H_ #include "./vpx_config.h" #include "vp9/common/vp9_loopfilter.h" #include "vpx_util/vpx_thread.h" @@ -62,4 +62,4 @@ void vp9_accumulate_frame_counts(struct FRAME_COUNTS *accum, } // extern "C" #endif -#endif // VP9_COMMON_VP9_LOOPFILTER_THREAD_H_ +#endif // VP9_COMMON_VP9_THREAD_COMMON_H_ |