From bd0abfd004a431fc6b4830ebe1f63cc66b04f4b9 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Sun, 3 Apr 2016 17:06:48 +0200 Subject: [PATCH] moved emscripten resources (nw) --- .../osd/sdl => scripts/resources/emscripten}/emscripten_post.js | 0 scripts/src/main.lua | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename {src/osd/sdl => scripts/resources/emscripten}/emscripten_post.js (100%) diff --git a/src/osd/sdl/emscripten_post.js b/scripts/resources/emscripten/emscripten_post.js similarity index 100% rename from src/osd/sdl/emscripten_post.js rename to scripts/resources/emscripten/emscripten_post.js 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"