Commit 77d8fb3f authored by Linshizhi's avatar Linshizhi

Merge branch 'BROWSER' of gitlab.ilaihua.com:linshizhi/paraencode into BROWSER

parents 83ada0c7 003d0513
...@@ -17,10 +17,10 @@ THIRD_DIR=${WORKPATH}/lib/third/build ...@@ -17,10 +17,10 @@ THIRD_DIR=${WORKPATH}/lib/third/build
FFMPEG_PROTO=${WORKPATH}/src/protos/src FFMPEG_PROTO=${WORKPATH}/src/protos/src
WASM_DIR=${WORKPATH}/src/wasms WASM_DIR=${WORKPATH}/src/wasms
#ENCODER_DEBUG="-O3" ENCODER_DEBUG="-O3"
#MUXER_DEBUG="-O3" MUXER_DEBUG="-O3"
ENCODER_DEBUG="-O3 -g -fno-inline -gseparate-dwarf=encoder.debug.wasm -s SEPARATE_DWARF_URL=http://localhost:9876/encoder.debug.wasm" #ENCODER_DEBUG="-O3 -g -fno-inline -gseparate-dwarf=encoder.debug.wasm -s SEPARATE_DWARF_URL=http://localhost:9876/encoder.debug.wasm"
MUXER_DEBUG="-O3 -g -fno-inline -gseparate-dwarf=muxer.debug.wasm -s SEPARATE_DWARF_URL=http://localhost:9876/muxer.debug.wasm" #MUXER_DEBUG="-O3 -g -fno-inline -gseparate-dwarf=muxer.debug.wasm -s SEPARATE_DWARF_URL=http://localhost:9876/muxer.debug.wasm"
#DEBUG="-g2" #DEBUG="-g2"
BUILD_DIR=${WORKPATH}/Build BUILD_DIR=${WORKPATH}/Build
...@@ -102,7 +102,7 @@ FLAGS_ENCODER=( ...@@ -102,7 +102,7 @@ FLAGS_ENCODER=(
-Wno-deprecated-declarations -Wno-pointer-sign -Wno-implicit-int-float-conversion -Wno-switch -Wno-parentheses -Qunused-arguments -Wno-deprecated-declarations -Wno-pointer-sign -Wno-implicit-int-float-conversion -Wno-switch -Wno-parentheses -Qunused-arguments
-lavdevice -lavfilter -lavformat -lavcodec -lswresample -lswscale -lavutil -lpostproc -lm -lx264 -lz -lavdevice -lavfilter -lavformat -lavcodec -lswresample -lswscale -lavutil -lpostproc -lm -lx264 -lz
$WASM_DIR/encoder.cc $WASM_DIR/encoder.c
-s FORCE_FILESYSTEM=1 -s FORCE_FILESYSTEM=1
-s WASM=1 -s WASM=1
......
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