Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

FIX: build for emcc 2.0.9 #149

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

FIX: build for emcc 2.0.9 #149

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,10 +194,9 @@ build/ffmpeg-webm/ffmpeg.bc: $(WEBM_SHARED_DEPS)
--enable-libopus \
--enable-libvpx \
--extra-cflags="-s USE_ZLIB=1 -I../libvpx/dist/include" \
--extra-ldflags="-L../libvpx/dist/lib" \
--extra-ldflags="-r -L../libvpx/dist/lib" \
&& \
emmake make -j && \
cp ffmpeg ffmpeg.bc
emmake make -j EXESUF=.bc
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I recommend using .o since this is not necessarily a bitcode file


build/ffmpeg-mp4/ffmpeg.bc: $(MP4_SHARED_DEPS)
cd build/ffmpeg-mp4 && \
Expand All @@ -209,10 +208,9 @@ build/ffmpeg-mp4/ffmpeg.bc: $(MP4_SHARED_DEPS)
--enable-libmp3lame \
--enable-libx264 \
--extra-cflags="-s USE_ZLIB=1 -I../lame/dist/include" \
--extra-ldflags="-L../lame/dist/lib" \
--extra-ldflags="-r -L../lame/dist/lib" \
&& \
emmake make -j && \
cp ffmpeg ffmpeg.bc
emmake make -j EXESUF=.bc
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When emconfigure is use emmake is not necessary. All the emscripten-specific details will be encoding into the autoconf-generated makefile. emmake is for normal non-autoconf-based Makefiles

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What should this line be changed to then?


EMCC_COMMON_ARGS = \
-O3 \
Expand Down