From 34ccb1ae6628da2a1e6a02291b42134b4911cb54 Mon Sep 17 00:00:00 2001 From: Justin Kerk Date: Tue, 26 Apr 2016 05:29:40 +0000 Subject: [PATCH] Update function signatures for Emscripten (nw) --- scripts/resources/emscripten/emscripten_post.js | 4 ++-- scripts/src/main.lua | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/resources/emscripten/emscripten_post.js b/scripts/resources/emscripten/emscripten_post.js index 6bfad8790cb..aa7dac53894 100644 --- a/scripts/resources/emscripten/emscripten_post.js +++ b/scripts/resources/emscripten/emscripten_post.js @@ -3,8 +3,8 @@ 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.ui_set_show_fps = Module.cwrap('_ZN10ui_manager12set_show_fpsEb', '', ['number', 'number']); -JSMAME.ui_get_show_fps = Module.cwrap('_ZNK10ui_manager8show_fpsEv', 'number', ['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']); JSMAME.sdl_pauseaudio = Module.cwrap('SDL_PauseAudio', '', ['number']); var JSMESS = JSMAME; diff --git a/scripts/src/main.lua b/scripts/src/main.lua index ec37c0a518e..56c93a996ee 100644 --- a/scripts/src/main.lua +++ b/scripts/src/main.lua @@ -123,7 +123,7 @@ end emccopts = emccopts .. " -s TOTAL_MEMORY=268435456" emccopts = emccopts .. " -s DISABLE_EXCEPTION_CATCHING=2" emccopts = emccopts .. " -s EXCEPTION_CATCHING_WHITELIST='[\"__ZN15running_machine17start_all_devicesEv\",\"__ZN12cli_frontend7executeEiPPc\"]'" - emccopts = emccopts .. " -s EXPORTED_FUNCTIONS=\"['_main', '_malloc', '__Z14js_get_machinev', '__Z9js_get_uiv', '__Z12js_get_soundv', '__ZN10ui_manager12set_show_fpsEb', '__ZNK10ui_manager8show_fpsEv', '__ZN13sound_manager4muteEbh', '_SDL_PauseAudio']\"" + emccopts = emccopts .. " -s EXPORTED_FUNCTIONS=\"['_main', '_malloc', '__Z14js_get_machinev', '__Z9js_get_uiv', '__Z12js_get_soundv', '__ZN15mame_ui_manager12set_show_fpsEb', '__ZNK15mame_ui_manager8show_fpsEv', '__ZN13sound_manager4muteEbh', '_SDL_PauseAudio']\"" emccopts = emccopts .. " --pre-js " .. _MAKE.esc(MAME_DIR) .. "src/osd/modules/sound/js_sound.js" emccopts = emccopts .. " --post-js " .. _MAKE.esc(MAME_DIR) .. "scripts/resources/emscripten/emscripten_post.js" emccopts = emccopts .. " --embed-file " .. _MAKE.esc(MAME_DIR) .. "bgfx/chains@bgfx/chains"