Skip to content

Commit

Permalink
Update to emscripten 1.39.5 (#657)
Browse files Browse the repository at this point in the history
Update to emsdk 1.39.5 and disable new define USE_ES6_IMPORT_META as Edge does not support import.meta.
  • Loading branch information
rajsite authored Jan 7, 2020
1 parent 9d8b4dc commit 69d5f6f
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ install:
- pip install tox
- ps: Start-Process npm "run httpbin" -PassThru
- git clone https://github.com/juj/emsdk.git
- cd emsdk && git checkout 1b1f08f356d3f10d91e50c09dda6d44372ca908c && cd ..
- ps: emsdk\emsdk install sdk-1.38.30-64bit
- ps: emsdk\emsdk activate sdk-1.38.30-64bit
- cd emsdk && git checkout 369013943283939412fb2807bb0d2ded8ebd5a9e && cd ..
- ps: emsdk\emsdk install 1.39.5-fastcomp
- ps: emsdk\emsdk activate 1.39.5-fastcomp
platform:
- Win32
configuration:
Expand Down
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ install:
- nohup npm run httpbin &
- gcc -v
- git clone https://github.com/juj/emsdk.git
- (cd emsdk && git checkout 1b1f08f356d3f10d91e50c09dda6d44372ca908c)
- emsdk/emsdk install sdk-1.38.30-64bit
- emsdk/emsdk activate sdk-1.38.30-64bit
- (cd emsdk && git checkout 369013943283939412fb2807bb0d2ded8ebd5a9e)
- emsdk/emsdk install 1.39.5-fastcomp
- emsdk/emsdk activate 1.39.5-fastcomp
- cat ~/.emscripten
- (source emsdk/emsdk_env.sh && emcc -v)
before_script:
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ The emsdk toolchain is used to cross-compile Vireo to Vireo.js to run in Node.js
4. From either the extracted folder or the cloned emsdk repository run the following commands:

```console
emsdk install sdk-1.38.30-64bit
emsdk activate sdk-1.38.30-64bit
emsdk install 1.39.5-fastcomp
emsdk activate 1.39.5-fastcomp
emcc -v # should match the sdk version
```

Expand Down
2 changes: 1 addition & 1 deletion make-it/EmMakefile
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ ifeq ($(TARGET), wasm32-unknown-emscripten)
endif

# NO_DYNAMIC_EXECUTION=1 Allows Vireo to be used in CSP environments where eval() is forbidden: https://github.com/kripken/emscripten/blob/master/src/settings.js#L563
EM_OPT = $(EM_OPTFLAGS) $(TARGET_FLAG) -s NO_EXIT_RUNTIME=1 -std=c++14 -fno-exceptions -Werror --memory-init-file 0 -s NO_DYNAMIC_EXECUTION=1 -s MODULARIZE=1 -s EXPORT_NAME=VireoCreateCoreModule -s EXPORT_ES6=1 --minify 0 -s NO_FILESYSTEM=1 -s ABORTING_MALLOC=0
EM_OPT = $(EM_OPTFLAGS) $(TARGET_FLAG) -s NO_EXIT_RUNTIME=1 -std=c++14 -fno-exceptions -Werror --memory-init-file 0 -s NO_DYNAMIC_EXECUTION=1 -s MODULARIZE=1 -s EXPORT_NAME=VireoCreateCoreModule -s EXPORT_ES6=1 -s USE_ES6_IMPORT_META=0 --minify 0 -s NO_FILESYSTEM=1 -s ABORTING_MALLOC=0
EMFLAGS = -I$(INCDIR) -DkVireoOS_emscripten $(EM_OPT)
EMLIBRARY = --js-library $(CORESOURCEDIR)/library_coreHelpers.js \
--js-library $(CORESOURCEDIR)/library_eventHelpers.js \
Expand Down

0 comments on commit 69d5f6f

Please sign in to comment.