Skip to content

F
ffmpeg.wasm-core
Commit e075c066 authored by Jerome Wu's avatar Jerome Wu
Browse files
Options

Fix path issue in macos

parent 1099b3f5
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
configure
View file @ e075c066
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
# #
# Set PKG_CONFIG_PATH manually # Set PKG_CONFIG_PATH manually
export PKG_CONFIG_PATH=/src/build/lib/pkgconfig export PKG_CONFIG_PATH=$PWD/build/lib/pkgconfig
# Prevent locale nonsense from breaking basic text processing. # Prevent locale nonsense from breaking basic text processing.
LC_ALL=C LC_ALL=C
......
wasm/build-scripts/var.sh
View file @ e075c066
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
set -euo pipefail set -euo pipefail
# Include llvm binaries # Include llvm binaries
export PATH=$PATH:/emsdk/upstream/bin export PATH=$PATH:$EMSDK/upstream/bin
# Flags for code optimization, focus on speed instead # Flags for code optimization, focus on speed instead
# of size # of size
...@@ -31,7 +31,7 @@ ROOT_DIR=$PWD ...@@ -31,7 +31,7 @@ ROOT_DIR=$PWD
BUILD_DIR=$ROOT_DIR/build BUILD_DIR=$ROOT_DIR/build
# Toolchain file path for cmake # Toolchain file path for cmake
TOOLCHAIN_FILE=/emsdk/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake TOOLCHAIN_FILE=$EMSDK/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake
CFLAGS="-s USE_PTHREADS=1 -I$BUILD_DIR/include $OPTIM_FLAGS" CFLAGS="-s USE_PTHREADS=1 -I$BUILD_DIR/include $OPTIM_FLAGS"
LDFLAGS="$CFLAGS -L$BUILD_DIR/lib" LDFLAGS="$CFLAGS -L$BUILD_DIR/lib"
...@@ -69,5 +69,6 @@ FFMPEG_CONFIG_FLAGS_BASE=( ...@@ -69,5 +69,6 @@ FFMPEG_CONFIG_FLAGS_BASE=(
--dep-cc=emcc --dep-cc=emcc
) )
echo "EMSDK=$EMSDK"
echo "OPTIM_FLAGS=$OPTIM_FLAGS" echo "OPTIM_FLAGS=$OPTIM_FLAGS"
echo "BUILD_DIR=$BUILD_DIR" echo "BUILD_DIR=$BUILD_DIR"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment