Upgrade emscripten & ffmpeg
This commit is contained in:
parent
2cd16a9d22
commit
be676060ba
@ -1,13 +1,13 @@
|
|||||||
# syntax=docker/dockerfile-upstream:master-labs
|
# syntax=docker/dockerfile-upstream:master-labs
|
||||||
|
|
||||||
# Base emsdk image with environment variables.
|
# Base emsdk image with environment variables.
|
||||||
FROM emscripten/emsdk:3.1.29 AS emsdk-base
|
FROM emscripten/emsdk:3.1.40 AS emsdk-base
|
||||||
ARG EXTRA_CFLAGS
|
ARG EXTRA_CFLAGS
|
||||||
ARG EXTRA_LDFLAGS
|
ARG EXTRA_LDFLAGS
|
||||||
ARG FFMPEG_ST
|
ARG FFMPEG_ST
|
||||||
ARG FFMPEG_MT
|
ARG FFMPEG_MT
|
||||||
ENV INSTALL_DIR=/opt
|
ENV INSTALL_DIR=/opt
|
||||||
ENV FFMPEG_VERSION=n5.1.2
|
ENV FFMPEG_VERSION=n6.0
|
||||||
ENV CFLAGS="-I$INSTALL_DIR/include $CFLAGS $EXTRA_CFLAGS"
|
ENV CFLAGS="-I$INSTALL_DIR/include $CFLAGS $EXTRA_CFLAGS"
|
||||||
ENV CXXFLAGS="$CFLAGS"
|
ENV CXXFLAGS="$CFLAGS"
|
||||||
ENV LDFLAGS="-L$INSTALL_DIR/lib $LDFLAGS $CFLAGS $EXTRA_LDFLAGS"
|
ENV LDFLAGS="-L$INSTALL_DIR/lib $LDFLAGS $CFLAGS $EXTRA_LDFLAGS"
|
||||||
|
Loading…
Reference in New Issue
Block a user