summaryrefslogtreecommitdiffstatshomepage
path: root/scripts
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2016-04-03 17:06:48 +0200
committer Miodrag Milanovic <mmicko@gmail.com>2016-04-03 17:19:41 +0200
commitbd0abfd004a431fc6b4830ebe1f63cc66b04f4b9 (patch)
tree87b199499c0a1eb4ed025923d16ed266df1c93b2 /scripts
parent528a39fc54cf7648d51094505e84dc6c4f8f3692 (diff)
moved emscripten resources (nw)
Diffstat (limited to 'scripts')
-rw-r--r--scripts/resources/emscripten/emscripten_post.js10
-rw-r--r--scripts/src/main.lua2
2 files changed, 11 insertions, 1 deletions
diff --git a/scripts/resources/emscripten/emscripten_post.js b/scripts/resources/emscripten/emscripten_post.js
new file mode 100644
index 00000000000..6bfad8790cb
--- /dev/null
+++ b/scripts/resources/emscripten/emscripten_post.js
@@ -0,0 +1,10 @@
+// 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.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.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 93c0dd12140..f65786074b7 100644
--- a/scripts/src/main.lua
+++ b/scripts/src/main.lua
@@ -125,7 +125,7 @@ end
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 .. " --pre-js " .. _MAKE.esc(MAME_DIR) .. "src/osd/modules/sound/js_sound.js"
- emccopts = emccopts .. " --post-js " .. _MAKE.esc(MAME_DIR) .. "src/osd/sdl/emscripten_post.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"
emccopts = emccopts .. " --embed-file " .. _MAKE.esc(MAME_DIR) .. "bgfx/effects@bgfx/effects"
emccopts = emccopts .. " --embed-file " .. _MAKE.esc(MAME_DIR) .. "bgfx/shaders/gles@bgfx/shaders/gles"