summaryrefslogtreecommitdiffstatshomepage
path: root/scripts/src/main.lua
diff options
context:
space:
mode:
author algestam <henrik@algestam.se>2019-12-03 22:03:19 +0100
committer algestam <henrik@algestam.se>2019-12-03 22:03:19 +0100
commitf5869f4018b690567f600f08ba51745c42e2da60 (patch)
tree3227a3fc0334bfde0f5d3c3aecb3d8e95360ad1a /scripts/src/main.lua
parent88238e2d61a5a454a890fa69765df79b27586b74 (diff)
Add bgfx artwork path for Emscripten build (nw)
Diffstat (limited to 'scripts/src/main.lua')
-rw-r--r--scripts/src/main.lua1
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/src/main.lua b/scripts/src/main.lua
index 992ac602168..4be1b9af7af 100644
--- a/scripts/src/main.lua
+++ b/scripts/src/main.lua
@@ -160,6 +160,7 @@ end
.. " --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
itgraph'>* asmjit: new 3rdparty library Patrick Mackinlay2020-05-281-0/+1 | * srcclean and manual cleanup (nw) Vas Crabb2020-04-261-3/+3 | * main.lua: fix linking order of netlist. (nw) couriersud2020-04-181-5/+5 | | | | | | Moved netlist between dasm and utils,expat,... link statements This fixes the resolution of symbols in netlist code which may be used in machine/netlist.cpp. Change tested on ubuntu, windows and macosx. * Maintenance: Vas Crabb2020-03-041-0/+1 | | | | | | | * Removed empty nl_examples from dist.mak * Added copyright acknowledgements and full text of licenses to binary distribution * Fixed up the list of third-party libraries * Moved WDL fft.c to 3rdparty * Add bgfx artwork path for Emscripten build (nw) algestam2019-12-031-0/+1 | * Build system maintenance: Vas Crabb2019-10-041-4/+4 | | | | | | | | | | | * Re-write makedep.py for better performance and better parsing front-end * Make srcclean deal with kinds of preprocessor abuse I never want to see in real life (nw) The new parser front-end is better at recognising C++ syntax and also substantially faster - bootstrapping a single-driver build should be noticeably quicker. Having a single parser for C++, .lst and .flt files also gets us a bit closer to making it simpler to create custom subtargets. * (nw) Clean up the mess on master Vas Crabb2019-03-261-0/+8 | | | | | | | | | | | | | This effectively reverts b380514764cf857469bae61c11143a19f79a74c5 and c24473ddff715ecec2e258a6eb38960cf8c8e98e, restoring the state at 598cd5227223c3b04ca31f0dbc1981256d9ea3ff. Before pushing, please check that what you're about to push is sane. Check your local commit log and ensure there isn't anything out-of-place before pushing to mainline. When things like this happen, it wastes everyone's time. I really don't need this in a week when real work™ is busting my balls and I'm behind where I want to be with preparing for MAME release. * Revert "conflict resolution (nw)" andreasnaive2019-03-251-8/+0 | | | | | This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing changes made to 009cba4fb8102102168ef32870892438327f3705. * enable sub-second snapshot timers (nw) (#4493) Peter Ferrie2019-02-041-0/+7 | | | | | | | | | | | | | | * enable sub-second snapshot timers (nw) * switch to attotime, accept doubles * support LLVM extension in MSVC make vsllvm using extension from here: https://marketplace.visualstudio.com/items?itemName=LLVMExtensions.llvm-toolchain * r4000: experimental mips3 implementation (nw) Patrick Mackinlay2019-02-011-0/+1 | | | | | | WIP checkpoint: while I believe it's largely accurate (and very slow), neither jazz nor sgi systems can fully boot yet using this device, so it remains experimental. This implementation should go away when it has helped identify the improvements required for mips3. * Fix errors with single-driver build of vsnes.cpp [Justin Kerk] Justin Kerk2018-12-301-2/+2 | * Don't error on undefined GL symbols for the WebAssembly target (#4187) Justin Kerk2018-10-231-0/+1 | * Better Emscripten parameter handling, & update docs (nw) Justin Kerk2018-07-211-4/+1 | * Update WebAssembly parameters for current Emscripten (nw) Justin Kerk2018-07-151-1/+4 | * Fixed issues with CHD loading under Emscripten. [Justin Kerk] Justin Kerk2018-03-281-1/+1 | * Disable multithreading on the Emscripten target as it is not currently ↵ Justin Kerk2018-03-061-0/+1 | | | | supported. Fixes e.g. drivers using discrete audio components. [Justin Kerk] * VS Compile Fix Björn Moser2018-01-081-2/+2 | * Updated GENie, BGFX, BX, added BIMG since it is separated now, updated all ↵ Miodrag Milanovic2017-12-011-0/+1 | | | | shader binaries and MAME part of code to support new interfaces [Miodrag Milanovic] * Attempted to sanitize/rationalize how we access UTF-8 command line arguments ↵ npwoods2017-09-181-5/+0 | | | | | | | | | | | (#2532) Specifically, this creates a call osd_get_command_line() that returns UTF-8 command line arguments as std::vector<std::string>. On non-Windows platforms, this does nothing more than build the vector. On Windows, this invokes GetCommandLineW() and CommandLineToArgvW(). This also attempts to unwind usage of wmain()/_tmain() on Windows, which is not standard. Related to this, this fixes a bug in Imgtool; specifically, non-7 bit ASCII was not being handled correctly in Windows. This is really an admission that the way that Windows handles Unicode and command line arguments sucks, and it is my belief that having a wmain() or _tmain() declaration specific for Windows is a worse solution. C'est la vie. I'm very open to the idea that src/osd/osdcore.[cpp|h] is not the best place to do this. Let me know if I should move it. * Export soft_reset, hard_reset, exit, load, and save functions for Emscripten ↵ James Baicoianu2017-07-151-1/+1 | | | | builds * Fix save/load states in Emscripten build (#2470) James Baicoianu2017-07-151-1/+1 | | | | | | | | | * 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. * linenoise: replace linenoise-ng with a different port that is simpler and ↵ cracyc2017-05-131-1/+1 | | | | | | uses a different UTF8 parser [Carl] plugins/console: better completions [Carl] * Update build scripts, BX is now static library (nw) Miodrag Milanovic2017-02-051-0/+1 | * Initial PortAudio backend with build script changes to support library ↵ inte alls2017-01-111-0/+10 | | | | version 20161030 * Introduced utf8proc and created wrapper code to expose a prettier API Nathan Woods2016-12-311-0/+1 | * Enable building projects that are separate of MAME but use same core and ↵ Miodrag Milanovic2016-12-081-0/+4 | | | | lives in separate git tree (nw) * srcclean (nw) Vas Crabb2016-11-271-2/+2 | * As promised, removing this part of code since it is used for compilers ↵ Miodrag Milanovic2016-11-231-1/+0 | | | | check, no need for this to be in release (nw) * added OPTION_HOMEPATH to point to read/write folder,for now used by LUA ↵ Miodrag Milanovic2016-11-121-0/+4 | | | | | | scripts (nw) Copied all needed files so plugins could be started under UWP * move asset files to proper place Miodrag Milanovic2016-11-111-3/+3 | * Some more work on UWP (nw) Miodrag Milanovic2016-11-101-0/+30 | * Add more UWP support (nw)