diff options
author | 2021-12-23 13:18:06 +1100 | |
---|---|---|
committer | 2021-12-23 13:18:06 +1100 | |
commit | b18717cb19abfdb21eeab261f88e30f5c9d03468 (patch) | |
tree | 38d0b7f7af1e5b6534b038b68c6791890d827d48 /scripts/src | |
parent | f08d005c853c9b6432e12de3307d735b53524ff7 (diff) | |
parent | 3fd7f8ac576a9e40fcbc76184882bdf98d403537 (diff) |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'scripts/src')
-rw-r--r-- | scripts/src/bus.lua | 2 | ||||
-rw-r--r-- | scripts/src/cpu.lua | 19 | ||||
-rw-r--r-- | scripts/src/main.lua | 57 |
3 files changed, 14 insertions, 64 deletions
diff --git a/scripts/src/bus.lua b/scripts/src/bus.lua index 385312f48f1..2a6b0d4ffd2 100644 --- a/scripts/src/bus.lua +++ b/scripts/src/bus.lua @@ -3030,6 +3030,8 @@ if (BUSES["NES_CTRL"]~=null) then MAME_DIR .. "src/devices/bus/nes_ctrl/partytap.h", MAME_DIR .. "src/devices/bus/nes_ctrl/powerpad.cpp", MAME_DIR .. "src/devices/bus/nes_ctrl/powerpad.h", + MAME_DIR .. "src/devices/bus/nes_ctrl/snesadapter.cpp", + MAME_DIR .. "src/devices/bus/nes_ctrl/snesadapter.h", MAME_DIR .. "src/devices/bus/nes_ctrl/suborkey.cpp", MAME_DIR .. "src/devices/bus/nes_ctrl/suborkey.h", MAME_DIR .. "src/devices/bus/nes_ctrl/zapper.cpp", diff --git a/scripts/src/cpu.lua b/scripts/src/cpu.lua index c0ef6eac85d..ae338a86b75 100644 --- a/scripts/src/cpu.lua +++ b/scripts/src/cpu.lua @@ -2223,20 +2223,23 @@ end if CPUS["SM510"] then files { MAME_DIR .. "src/devices/cpu/sm510/sm510base.cpp", + MAME_DIR .. "src/devices/cpu/sm510/sm510base.h", MAME_DIR .. "src/devices/cpu/sm510/sm510.h", + MAME_DIR .. "src/devices/cpu/sm510/sm510.cpp", MAME_DIR .. "src/devices/cpu/sm510/sm510op.cpp", - MAME_DIR .. "src/devices/cpu/sm510/sm510core.cpp", - MAME_DIR .. "src/devices/cpu/sm510/sm511core.cpp", - MAME_DIR .. "src/devices/cpu/sm510/sm530.h", - MAME_DIR .. "src/devices/cpu/sm510/sm530op.cpp", - MAME_DIR .. "src/devices/cpu/sm510/sm530core.cpp", + MAME_DIR .. "src/devices/cpu/sm510/sm511.h", + MAME_DIR .. "src/devices/cpu/sm510/sm511.cpp", MAME_DIR .. "src/devices/cpu/sm510/sm500.h", + MAME_DIR .. "src/devices/cpu/sm510/sm500.cpp", MAME_DIR .. "src/devices/cpu/sm510/sm500op.cpp", - MAME_DIR .. "src/devices/cpu/sm510/sm500core.cpp", - MAME_DIR .. "src/devices/cpu/sm510/sm5acore.cpp", + MAME_DIR .. "src/devices/cpu/sm510/sm5a.h", + MAME_DIR .. "src/devices/cpu/sm510/sm5a.cpp", + MAME_DIR .. "src/devices/cpu/sm510/sm530.h", + MAME_DIR .. "src/devices/cpu/sm510/sm530.cpp", + MAME_DIR .. "src/devices/cpu/sm510/sm530op.cpp", MAME_DIR .. "src/devices/cpu/sm510/sm590.h", + MAME_DIR .. "src/devices/cpu/sm510/sm590.cpp", MAME_DIR .. "src/devices/cpu/sm510/sm590op.cpp", - MAME_DIR .. "src/devices/cpu/sm510/sm590core.cpp", } end diff --git a/scripts/src/main.lua b/scripts/src/main.lua index 8183f5b8748..c638c852350 100644 --- a/scripts/src/main.lua +++ b/scripts/src/main.lua @@ -85,62 +85,7 @@ end targetextension ".exe" configuration { "asmjs" } - targetextension ".bc" - if os.getenv("EMSCRIPTEN") then - local emccopts = "" - .. " -O" .. _OPTIONS["OPTIMIZE"] - .. " -s USE_SDL=2" - .. " -s USE_SDL_TTF=2" - .. " --memory-init-file 0" - .. " -s DISABLE_EXCEPTION_CATCHING=2" - .. " -s EXCEPTION_CATCHING_WHITELIST=\"['__ZN15running_machine17start_all_devicesEv','__ZN12cli_frontend7executeEiPPc','__ZN8chd_file11open_commonEb','__ZN8chd_file13read_metadataEjjRNSt3__212basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEE','__ZN8chd_file13read_metadataEjjRNSt3__26vectorIhNS0_9allocatorIhEEEE','__ZNK19netlist_mame_device19base_validity_checkER16validity_checker']\"" - .. " -s EXPORTED_FUNCTIONS=\"['_main', '_malloc', '__ZN15running_machine30emscripten_get_running_machineEv', '__ZN15running_machine17emscripten_get_uiEv', '__ZN15running_machine20emscripten_get_soundEv', '__ZN15mame_ui_manager12set_show_fpsEb', '__ZNK15mame_ui_manager8show_fpsEv', '__ZN13sound_manager4muteEbh', '_SDL_PauseAudio', '_SDL_SendKeyboardKey', '__ZN15running_machine15emscripten_saveEPKc', '__ZN15running_machine15emscripten_loadEPKc', '__ZN15running_machine21emscripten_hard_resetEv', '__ZN15running_machine21emscripten_soft_resetEv', '__ZN15running_machine15emscripten_exitEv']\"" - .. " -s EXTRA_EXPORTED_RUNTIME_METHODS=\"['cwrap']\"" - .. " -s ERROR_ON_UNDEFINED_SYMBOLS=0" - .. " -s USE_WEBGL2=1" - .. " -s LEGACY_GL_EMULATION=1" - .. " -s GL_UNSAFE_OPTS=0" - .. " --pre-js " .. _MAKE.esc(MAME_DIR) .. "src/osd/modules/sound/js_sound.js" - .. " --post-js " .. _MAKE.esc(MAME_DIR) .. "scripts/resources/emscripten/emscripten_post.js" - .. " --embed-file " .. _MAKE.esc(MAME_DIR) .. "bgfx/chains@bgfx/chains" - .. " --embed-file " .. _MAKE.esc(MAME_DIR) .. "bgfx/effects@bgfx/effects" - .. " --embed-file " .. _MAKE.esc(MAME_DIR) .. "bgfx/shaders/essl@bgfx/shaders/essl" - .. " --embed-file " .. _MAKE.esc(MAME_DIR) .. "artwork/bgfx@artwork/bgfx" - .. " --embed-file " .. _MAKE.esc(MAME_DIR) .. "artwork/slot-mask.png@artwork/slot-mask.png" - - if _OPTIONS["SYMBOLS"]~=nil and _OPTIONS["SYMBOLS"]~="0" then - emccopts = emccopts - .. " -g" .. _OPTIONS["SYMLEVEL"] - .. " -s DEMANGLE_SUPPORT=1" - end - - if _OPTIONS["WEBASSEMBLY"] then - emccopts = emccopts - .. " -s WASM=" .. _OPTIONS["WEBASSEMBLY"] - else - emccopts = emccopts - .. " -s WASM=1" - end - - if _OPTIONS["WEBASSEMBLY"]~=nil and _OPTIONS["WEBASSEMBLY"]=="0" then - -- define a fixed memory size because allowing memory growth disables asm.js optimizations - emccopts = emccopts - .. " -s ALLOW_MEMORY_GROWTH=0" - .. " -s TOTAL_MEMORY=268435456" - else - emccopts = emccopts - .. " -s ALLOW_MEMORY_GROWTH=1" - end - - if _OPTIONS["ARCHOPTS"] then - emccopts = emccopts .. " " .. _OPTIONS["ARCHOPTS"] - end - - postbuildcommands { - --os.getenv("EMSCRIPTEN") .. "/emcc " .. emccopts .. " $(TARGET) -o " .. _MAKE.esc(MAME_DIR) .. _OPTIONS["target"] .. _OPTIONS["subtarget"] .. ".js", - os.getenv("EMSCRIPTEN") .. "/emcc " .. emccopts .. " $(TARGET) -o " .. _MAKE.esc(MAME_DIR) .. _OPTIONS["target"] .. _OPTIONS["subtarget"] .. ".html", - } - end + targetextension ".html" configuration { } |