Version 1.2.1

Co-authored-by: Allan Niles <74841470+allancoding@users.noreply.github.com>
Co-authored-by: ElectronicsArchiver <85485984+ElectronicsArchiver@users.noreply.github.com>
Co-authored-by: GreyHope <hello@greyhope.uk>
This commit is contained in:
Ethan O'Brien 2022-05-23 21:53:00 -05:00
parent 7a8c11dba9
commit 9c0dc51aa0
8 changed files with 143 additions and 43 deletions

View file

@ -1,52 +1,129 @@
## data directory <br>
# Data Folder
This is a note, All core files (files that end with `.data`) are compiled versions on [retroarch](https://github.com/libretro/RetroArch) <br>
Changes from the original software can be viewed [here](https://github.com/ethanaobrien/RetroArch). ## Cores[![Badge GPLv3]][GPLv3]
All core files are licensed with the GNU General Public License version 3.0 All files ending in `.data` have been compiled with **[RetroArch]**.
*Check my **[Fork]** for changes made to the original software.*
### compiling the cores <br>
<br>
<br>
I have only ever gotten this to work on ubuntu. ## Building
*Instructions have only been confirmed working for **Ubuntu**.*
First, install dependencies <br>
``` ### Dependencies
sudo apt install -y binutils-mips-linux-gnu build-essential git pkgconf python3
- **[Build Essential]**
- **[PkgConf]**
- **[BinUtils]**
- **[Python]**
- **[Git]**
<br>
```sh
sudo apt install -y \
binutils-mips-linux-gnu \
build-essential \
pkgconf \
python3 \
git
``` ```
To build wasm: <br>
<br>
clone the repository ### WASM
``` 1. **Clone** the repository.
git clone https://github.com/ethanaobrien/RetroArch.git
```
then, navigate to the `/dist-scripts/` direcotry, then, from here run ```sh
git clone https://github.com/ethanaobrien/RetroArch.git
```
<br>
``` 2. Navigate to `/dist-scripts/`
emmake ./dist-cores.sh emscripten
```
to build files to build the wasm: <br>
clone the repository 3. Build with:
``` ```sh
git clone https://github.com/libretro/libretro-fceumm.git emmake ./dist-cores.sh emscripten
``` ```
then, enter whatever directory the Makefile.libretro is located in (there may not be a Makefile.libretro). In this case it is the base directory <br>
<br>
then, run ### LibRetro
```
emmake make -f Makefile.libretro platform=emscripten
```
if there is no Makefile.libretro file, then remove `-f Makefile.libretro`
Then, copy the `.bc` file to the dist-cores directory (see above) 1. **Clone** the repository.
```sh
git clone https://github.com/libretro/libretro-fceumm.git
```
<br>
2. The next steps depend on whether or <br>
not you have a`Makefile.libretro`.
<br>
#### With
- Navigate to the folder with the makefile.
- Build with:
```sh
emmake make -f Makefile.libretro platform=emscripten
```
<br>
#### Without
- Stay in the base directory of the project.
- Build with:
```sh
emmake make platform=emscripten
```
<br>
3. Copy the `.bc` file to the `/dist-cores/` folder.
<br>
<!----------------------------------------------------------------------------->
[RetroArch]: https://github.com/libretro/RetroArch
[Fork]: https://github.com/ethanaobrien/RetroArch
[GPLv3]: cores/LICENSE
<!-------------------------------{ Dependencies }------------------------------>
[Build Essential]: https://packages.ubuntu.com/focal/build-essential
[BinUtils]: https://www.gnu.org/software/binutils/
[PkgConf]: http://pkgconf.org/
[Python]: https://www.python.org/
[Git]: https://git-scm.com/
<!---------------------------------{ Badges }---------------------------------->
[Badge GPLv3]: https://img.shields.io/badge/License-GPL_3-blue.svg?style=flat

View file

@ -6216,7 +6216,7 @@ window.EJS_main = function(_0xa88a13, _0x17edbf, _0x2c1832) {
var a = function(_0x154660, _0x15626f) { var a = function(_0x154660, _0x15626f) {
if (!(_0x154660 instanceof _0x15626f)) throw new TypeError('Cannot call a class as a function'); if (!(_0x154660 instanceof _0x15626f)) throw new TypeError('Cannot call a class as a function');
}(this, _0x6954aa); }(this, _0x6954aa);
this.version = '1.1.6'; this.version = '1.2.1';
this.system = ''; this.system = '';
this.adUrl = null; this.adUrl = null;
this.gameName = null; this.gameName = null;

File diff suppressed because one or more lines are too long

View file

@ -1,5 +1,5 @@
(async function() { (async function() {
var VERSION = 1.6; var VERSION = 1.7;
if ((window.location && ['localhost', '127.0.0.1'].includes(location.hostname)) || if ((window.location && ['localhost', '127.0.0.1'].includes(location.hostname)) ||
'undefined' != typeof EJS_DEBUG_XX && true === EJS_DEBUG_XX) { 'undefined' != typeof EJS_DEBUG_XX && true === EJS_DEBUG_XX) {
fetch('https://raw.githack.com/ethanaobrien/emulatorjs/main/data/version.json').then(response => { fetch('https://raw.githack.com/ethanaobrien/emulatorjs/main/data/version.json').then(response => {
@ -49,7 +49,6 @@
script.onload = resolve; script.onload = resolve;
}) })
} }
window.onerror = function(e) {alert(e)}
if ('undefined' != typeof EJS_DEBUG_XX && true === EJS_DEBUG_XX) { if ('undefined' != typeof EJS_DEBUG_XX && true === EJS_DEBUG_XX) {
await loadStyle('emu-css.css'); await loadStyle('emu-css.css');
await loadScript('emu-main.js'); await loadScript('emu-main.js');

View file

@ -1,11 +1,35 @@
## Minifying
It is recommended to minify the javascript files before putting them on your server for production. This will make the emulator load faster (and use less bandwidth) # Minifying
to minify, first, if you do not have nodejs, please install it from [here](https://nodejs.org/en/download/) Before pushing the script files onto your production <br>
server it is recommended to minify them to save on <br>
load times as well as bandwidth.
then, open a terminal window and navigate to the minify directory <br>
then, run `npm i` ## Requirements
then, run `node index.js` - **[NodeJS]**
<br>
## Steps
1. Open a terminal in`/data/minify`.
2. Install the dependencies with:
```sh
npm install
```
3. Start the minification with:
```sh
node index.js
```
<!----------------------------------------------------------------------------->
[NodeJS]: https://nodejs.org/en/download/

View file

@ -1 +1 @@
{ "current_version": 1.6 } { "current_version": 1.7 }

BIN
docs/favicon.ico Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 126 KiB

View file

@ -3,7 +3,7 @@
<head> <head>
<title>EmulatorJS</title> <title>EmulatorJS</title>
<link rel = icon href = docs/Logo.png> <link rel = icon href = docs/favicon.ico sizes = "16x16 32x32 48x48 64x64" type = image/vnd.microsoft.icon>
<meta name = viewport content = "width = device-width, initial-scale = 1"> <meta name = viewport content = "width = device-width, initial-scale = 1">
<style> <style>
@ -176,4 +176,4 @@
box.ondragleave = () => box.removeAttribute("drag") box.ondragleave = () => box.removeAttribute("drag")
</script> </script>
</body> </body>
</html> </html>