Merge pull request #6246 from fr500/fixes

Fixes

CHANGES.md

@@ -42,6 +42,7 @@
 - PSP: Enable threading support through pthreads.
 - SHADERS: SPIRV-Cross/slang shader support for D3D11.
 - SHIELD ATV: Allow the remote / gamepad takeover hack to work with the 2017 gamepad
+- SUBSYSTEM: Subsystem saves now respect the save directory
 - VULKAN: Fix swapchain recreation bug on Nvidia GPUs with Windows 10 (resolved in Windows Nvidia driver version 390.77).
 - WINDOWS: Improved Unicode support (for cores/directory creation and 7zip archives).
 - WINDOWS: Show progress meter on taskbar for downloads (Windows 7 and up).

pkg/emscripten/libretro/embed.html

@@ -31,9 +31,9 @@
                           <a class="dropdown-item" href="." data-core="fceumm">FCEUmm</a>
                           <a class="dropdown-item" href="." data-core="gambatte">Gambatte</a>
                           <a class="dropdown-item" href="." data-core="genesis_plus_gx">Genesis Plus GX</a>
-                          <a class="dropdown-item" href="https://libretro.itch.io/retroarch" data-core="nestopia">Nestopia (NES)</a>
+                          <a class="dropdown-item" href="." data-core="nestopia">Nestopia (NES)</a>
-                          <a class="dropdown-item" href="https://libretro.itch.io/retroarch" data-core="snes9x2010">Snes9x 2010 (SNES)</a>
+                          <a class="dropdown-item" href="." data-core="snes9x2010">Snes9x 2010 (SNES)</a>
-                          <a class="dropdown-item" href="https://libretro.itch.io/retroarch" data-core="vba_next">VBA Next (Gameboy Advance)</a>
+                          <a class="dropdown-item" href="." data-core="vba_next">VBA Next (Gameboy Advance)</a>
                         </div>
                         <button class="btn btn-primary disabled" id="btnRun" onclick="startRetroArch()" disabled>
                            <span class="fa fa-spinner fa-spin" id="icnRun"></span> Run
@@ -78,7 +78,7 @@
    <script src="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.3/js/bootstrap.min.js"></script>
    <script src="analytics.js"></script>
    <!--script src="//wzrd.in/standalone/browserfs@0.6.1"></script-->
-   <script src="//web.libretro.com/browserfs.min.js"></script>
+   <script src="browserfs.min.js"></script>
    <script src="libretro.js"></script>
    <div align="center">
    <a href="https://www.patreon.com/libretro">

pkg/emscripten/libretro/indexer

@@ -0,0 +1,35 @@
+#! /usr/bin/env coffee
+
+fs = require 'fs'
+path = require 'path'
+
+symLinks = {}
+
+rdSync = (dpath, tree, name) ->
+  files = fs.readdirSync(dpath)
+  for file in files
+    # ignore non-essential directories / files
+    continue if file in ['.git', 'node_modules', 'bower_components', 'build'] or file[0] is '.'
+    fpath = dpath + '/' + file
+    try
+      # Avoid infinite loops.
+      lstat = fs.lstatSync(fpath)
+      if lstat.isSymbolicLink()
+        symLinks[lstat.dev] ?= {}
+        # Ignore if we've seen it before
+        continue if symLinks[lstat.dev][lstat.ino]?
+        symLinks[lstat.dev][lstat.ino] = 0
+
+      fstat = fs.statSync(fpath)
+      if fstat.isDirectory()
+        tree[file] = child = {}
+        rdSync(fpath, child, file)
+      else
+        tree[file] = null
+    catch e
+      # Ignore and move on.
+  return tree
+
+fs_listing = rdSync(process.cwd(), {}, '/')
+console.log(JSON.stringify(fs_listing))
+

pkg/emscripten/libretro/readme.txt

@@ -0,0 +1,11 @@
+1. download the build from https://buildbot.libretro.com/nightly/emscripten/
+2. unzip that somewhere in your web server tree
+3. download the asset bundle from https://buildbot.libretro.com/assets/frontend/bundle.zip
+4. extract the bundle in  /assets/frontend/bundle
+5. create an assets/cores dir, you can put game data in that dir
+6. chmod +x indexer
+7. run the indexer script (you need coffeescript) like this: ./indexer ./assets/frontend > ./assets/frontend/.index-xhr
+8. run the indexer script (you need coffeescript) like this: ./indexer ./assets/cores > ./assets/cores/.index-xhr
+
+That should be it, you can add more cores to the list by editing index.html
+