Skip to content

Fix emscripten build #258

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

Open
liulongbiao wants to merge 5 commits into
base: master
Choose a base branch
from
+10 −3
Open

Fix emscripten build #258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ed8a2dd
[build] update emcc check in cpp_cmd
liulongbiao Aug 28, 2019
bf1ad06
[build] encode utf8 for c_namgled_names
liulongbiao Aug 28, 2019
467d9b4
add some LINKFLAGS for product
liulongbiao Aug 28, 2019
1c71ba7
[build] skip tests and docs for emscripten
liulongbiao Aug 28, 2019
9092747
[build] add emscripten EXPORT_NAME
liulongbiao Aug 28, 2019
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
Empty file added python/__init__.py
View file
Open in desktop
Empty file.
Empty file added python/lib/__init__.py
View file
Open in desktop
Empty file.
2 changes: 1 addition & 1 deletion python/lib/gen_external.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ def get_preprocessor():
print("Warning: could not guess preprocessor, using env's CC")
cpp_cmd = os.environ.get('CC', 'cc').split()
cpp_cmd += ['-E']
if 'emcc' in cpp_cmd:
if any('emcc' in f for f in cpp_cmd):
cpp_cmd += ['-x', 'c'] # emcc defaults to c++, force C language
return cpp_cmd

Expand Down
2 changes: 1 addition & 1 deletion scripts/build_emscripten
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ checkprog emmake
emconfigure ./waf configure --with-target-platform emscripten $*

# build
emmake ./waf build
emmake ./waf build --disable-tests --disable-examples --disable-docs
9 changes: 8 additions & 1 deletion wscript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,12 @@ def configure(ctx):
ctx.env.LINKFLAGS += ['-O0']
else:
ctx.env.LINKFLAGS += ['-Oz']
ctx.env.LINKFLAGS += ['-s','ASSERTIONS=0']
ctx.env.LINKFLAGS += ['-s','STRICT=1']
ctx.env.LINKFLAGS += ['-s','MODULARIZE=1']
ctx.env.LINKFLAGS += ['-s','EXPORT_NAME=aubio']
ctx.env.LINKFLAGS += ['-s','FILESYSTEM=0']
ctx.env.LINKFLAGS += ['-s','MALLOC=emmalloc']
ctx.env.cshlib_PATTERN = '%s.min.js'

# doesnt ship file system support in lib
Expand All @@ -283,9 +289,10 @@ def configure(ctx):
objects += ['fvec_t', 'cvec_t', 'fmat_t']
lib = generate_lib_from_c_declarations(objects, c_decls)
exported_funcnames = get_all_func_names_from_lib(lib)
c_mangled_names = ['_' + s for s in exported_funcnames]
c_mangled_names = [('_' + s).encode('utf8') for s in exported_funcnames]
ctx.env.LINKFLAGS_cshlib += ['-s',
'EXPORTED_FUNCTIONS=%s' % c_mangled_names]
ctx.env.LINKFLAGS_cshlib += ['-s', 'EXTRA_EXPORTED_RUNTIME_METHODS=["ccall", "cwrap"]']

# check support for C99 __VA_ARGS__ macros
check_c99_varargs = '''
Expand Down