summaryrefslogtreecommitdiffstatshomepage
path: root/scripts/resources
diff options
context:
space:
mode:
author James Baicoianu <james_github@baicoianu.com>2017-07-14 21:00:09 -0700
committer Vas Crabb <cuavas@users.noreply.github.com>2017-07-15 14:00:09 +1000
commit15c2bb0c08aeb3eff32ee17e70d38866192e782a (patch)
tree837f84437499220d4d59f8f29f3ad33e076ca826 /scripts/resources
parent6d634e00934d69de688fd050e464c97a1385606c (diff)
Fix save/load states in Emscripten build (#2470)
* Fix save/load states in Emscripten build * Simplified Emscripten integration points * Moved standalone JS functions to be static member functions of running_machine * Improved Emscripten main loop * Use convenience functions for cleaner code As an added bonus, this now allows for proper shutdown of the running machine when running in the Emscripten environment - previously, attempts to exit the program were just being ignored.
Diffstat (limited to 'scripts/resources')
-rw-r--r--scripts/resources/emscripten/emscripten_post.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/resources/emscripten/emscripten_post.js b/scripts/resources/emscripten/emscripten_post.js
index 92cbdd21f9b..10d4e1d5d35 100644
--- a/scripts/resources/emscripten/emscripten_post.js
+++ b/scripts/resources/emscripten/emscripten_post.js
@@ -1,8 +1,8 @@
// MAME-JavaScript function mappings
var JSMAME = JSMAME || {};
-JSMAME.get_machine = Module.cwrap('_Z14js_get_machinev', 'number');
-JSMAME.get_ui = Module.cwrap('_Z9js_get_uiv', 'number');
-JSMAME.get_sound = Module.cwrap('_Z12js_get_soundv', 'number');
+JSMAME.get_machine = Module.cwrap('_ZN15running_machine30emscripten_get_running_machineEv', 'number');
+JSMAME.get_ui = Module.cwrap('_ZN15running_machine17emscripten_get_uiEv', 'number');
+JSMAME.get_sound = Module.cwrap('_ZN15running_machine20emscripten_get_soundEv', 'number');
JSMAME.ui_set_show_fps = Module.cwrap('_ZN15mame_ui_manager12set_show_fpsEb', '', ['number', 'number']);
JSMAME.ui_get_show_fps = Module.cwrap('_ZNK15mame_ui_manager8show_fpsEv', 'number', ['number']);
JSMAME.sound_manager_mute = Module.cwrap('_ZN13sound_manager4muteEbh', '', ['number', 'number', 'number']);