80486DX2-66/taisei
1
0
Fork 1
Code Issues Activity

build,ci: update emscripten to 3.1.51 and fix build

Browse source
This commit is contained in:
Andrei Alexeyev 2023-12-17 04:41:49 +01:00
parent ddd27ab9b1
commit 96635c6092
No known key found for this signature in database
GPG key ID: 72D26128040B9690
4 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/main.yml vendored
View file

@ -28,7 +28,7 @@ on:
env:
MESON_VERSION: '0.63.3'
EM_VERSION: '3.1.44'
EM_VERSION: '3.1.51'
EM_CACHE_FOLDER: 'emsdk'
TAISEI_NOPRELOAD: 0
TAISEI_PRELOAD_REQUIRED: 1

2
.github/workflows/release.yml vendored
View file

@ -40,7 +40,7 @@ on:
env:
DEFAULT_REF: 'master'
MESON_VERSION: '0.63.3'
EM_VERSION: '3.1.44'
EM_VERSION: '3.1.51'
EM_CACHE_FOLDER: 'emsdk'
TAISEI_NOPRELOAD: 0
TAISEI_PRELOAD_REQUIRED: 1

2
emscripten/preamble.js
View file

@ -151,8 +151,6 @@ function SyncFS(is_load, ccptr) {
document.addEventListener('keydown', resumeAudio);
})();
var dynCall;
if(typeof dynCall === 'undefined') {
dynCall = window['dynCall'] = Module['dynCall'] = function dynCall(sig, ptr, args) {
return wasmTable.get(ptr).apply(this, args);

5
src/meson.build
View file

@ -284,9 +284,7 @@ if host_machine.system() == 'emscripten'
em_link_outputs = []
em_link_output_suffixes = ['html', 'wasm', 'js'] # first element is significant
em_data_dir = config.get_unquoted('TAISEI_BUILDCONF_DATA_PATH')
em_common_args = [
'-s', 'DEFAULT_TO_CXX=0',
]
em_common_args = []
em_link_args = [
'-O@0@'.format(get_option('optimization')),
'-s', 'ALLOW_MEMORY_GROWTH=1',
@ -304,6 +302,7 @@ if host_machine.system() == 'emscripten'
'-s', 'FETCH_SUPPORT_INDEXEDDB=0',
'-s', 'FILESYSTEM=1',
'-s', 'FORCE_FILESYSTEM=1',
'-s', 'GL_ENABLE_GET_PROC_ADDRESS',
'-s', 'GL_POOL_TEMP_BUFFERS=0',
'-s', 'GL_PREINITIALIZED_CONTEXT=1',
'-s', 'GL_SUPPORT_AUTOMATIC_ENABLE_EXTENSIONS=0',