Skip to content

Commit

Permalink
update build scripts to use executable instead of separate *.o files
Browse files Browse the repository at this point in the history
  • Loading branch information
bgrins committed Nov 22, 2013
1 parent d1760dd commit 04af278
Show file tree
Hide file tree
Showing 4 changed files with 7,726 additions and 7,756 deletions.
9 changes: 5 additions & 4 deletions build/build_lgpl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@ echo "Beginning Build:"

cd ffmpeg

emconfigure ./configure --cc="emcc" --target-os=none --cpu=generic --arch=x86_64 --disable-ffplay --disable-ffprobe --disable-ffserver --disable-asm --enable-pic --disable-doc --disable-devices --disable-pthreads --disable-w32threads --disable-network --enable-small --disable-hwaccels --disable-parsers --disable-bsfs --disable-debug --disable-zlib
make clean;
emmake make;
emcc -O2 -s VERBOSE=1 -s ASM_JS=0 -s TOTAL_MEMORY=33554432 -v libavutil/*.o libavcodec/*.o libavformat/*.o libavdevice/*.o libswresample/*.o libavfilter/*.o libswscale/*.o *.o -o ../ffmpeg.js --pre-js ../ffmpeg_pre.js --post-js ../ffmpeg_post.js
emconfigure ./configure --cc="emcc" --enable-cross-compile --target-os=none --arch=x86_32 --cpu=generic --disable-ffplay --disable-ffprobe --disable-ffserver --disable-asm --disable-doc --disable-devices --disable-pthreads --disable-w32threads --disable-network --disable-hwaccels --disable-parsers --disable-bsfs --disable-debug --disable-zlib --disable-protocols --disable-indevs --disable-outdevs --enable-protocol=file --enable-pic --enable-small
make clean
make
cp ffmpeg ffmpeg.bc
emcc -s VERBOSE=1 -s ASM_JS=0 -s TOTAL_MEMORY=33554432 -O2 -v ffmpeg.bc -o ../ffmpeg.js --pre-js ../ffmpeg_pre.js --post-js ../ffmpeg_post.js

cd ../

Expand Down
9 changes: 5 additions & 4 deletions build/build_lgpl_asm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@ echo "Beginning Build:"

cd ffmpeg

emconfigure ./configure --cc="emcc" --target-os=none --cpu=generic --arch=x86_64 --disable-ffplay --disable-ffprobe --disable-ffserver --disable-asm --enable-pic --disable-doc --disable-devices --disable-pthreads --disable-w32threads --disable-network --enable-small --disable-hwaccels --disable-parsers --disable-bsfs --disable-debug --disable-zlib
make clean;
emmake make;
emcc -O2 -s VERBOSE=1 -s TOTAL_MEMORY=33554432 -v libavutil/*.o libavcodec/*.o libavformat/*.o libavdevice/*.o libswresample/*.o libavfilter/*.o libswscale/*.o *.o -o ../ffmpeg_asm.js --pre-js ../ffmpeg_pre.js --post-js ../ffmpeg_post.js
emconfigure ./configure --cc="emcc" --enable-cross-compile --target-os=none --arch=x86_32 --cpu=generic --disable-ffplay --disable-ffprobe --disable-ffserver --disable-asm --disable-doc --disable-devices --disable-pthreads --disable-w32threads --disable-network --disable-hwaccels --disable-parsers --disable-bsfs --disable-debug --disable-zlib --disable-protocols --disable-indevs --disable-outdevs --enable-protocol=file --enable-pic --enable-small
make clean
make
cp ffmpeg ffmpeg.bc
emcc -s VERBOSE=1 -s TOTAL_MEMORY=33554432 -O2 -v ffmpeg.bc -o ../ffmpeg_asm.js --pre-js ../ffmpeg_pre.js --post-js ../ffmpeg_post.js

cd ../

Expand Down
7,706 changes: 3,845 additions & 3,861 deletions build/ffmpeg.js

Large diffs are not rendered by default.

7,758 changes: 3,871 additions & 3,887 deletions build/ffmpeg_asm.js

Large diffs are not rendered by default.

0 comments on commit 04af278

Please sign in to comment.