Merge pull request #258 from Cpasjuste/dev

v6.7

.github/workflows/3ds-dev.yml

@@ -0,0 +1,58 @@
+name: 3ds-dev
+
+on:
+  push:
+    branches: [ dev ]
+  workflow_dispatch:
+
+jobs:
+
+  build-3ds-dev:
+    runs-on: ubuntu-20.04
+    container: devkitpro/devkitarm:latest
+    defaults:
+      run:
+        shell: bash
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: recursive
+
+      - name: Install build dependencies
+        run: |
+          sudo apt -yq update
+          sudo apt -yq install git build-essential cmake zip
+
+      - name: Build pfbneo
+        run: |
+          mkdir cmake-build-pfbneo && cd cmake-build-pfbneo
+          source /etc/profile.d/devkit-env.sh
+          cmake -G "Unix Makefiles" -DPLATFORM_3DS=ON -DOPTION_EMU=pfbneo \
+            -DOPTION_LIGHT=ON -DOPTION_MPV_PLAYER=OFF -DCMAKE_BUILD_TYPE=Debug ..
+          make pfbneo.deps
+          make -j $(getconf _NPROCESSORS_ONLN) pfbneo.3dsx
+
+      - name: Build pgen
+        run: |
+          mkdir cmake-build-pgen && cd cmake-build-pgen
+          source /etc/profile.d/devkit-env.sh
+          cmake -G "Unix Makefiles" -DPLATFORM_3DS=ON -DOPTION_EMU=pgen \
+            -DOPTION_LIGHT=ON -DOPTION_MPV_PLAYER=OFF -DCMAKE_BUILD_TYPE=Debug ..
+          make -j $(getconf _NPROCESSORS_ONLN) pgen.3dsx
+
+      - name: Build pnes
+        run: |
+          mkdir cmake-build-pnes && cd cmake-build-pnes
+          source /etc/profile.d/devkit-env.sh
+          cmake -G "Unix Makefiles" -DPLATFORM_3DS=ON -DOPTION_EMU=pnes \
+            -DOPTION_MPV_PLAYER=OFF -DCMAKE_BUILD_TYPE=Debug ..
+          make -j $(getconf _NPROCESSORS_ONLN) pnes.3dsx
+
+      # too slow for 3ds for now...
+      #- name: Build psnes
+        #run: |
+          #mkdir cmake-build-psnes && cd cmake-build-psnes
+          #source /etc/profile.d/devkit-env.sh
+          #cmake -G "Unix Makefiles" -DPLATFORM_3DS=ON -DOPTION_MPV_PLAYER=OFF -DOPTION_EMU=psnes -DCMAKE_BUILD_TYPE=Debug ..
+          #make -j $(getconf _NPROCESSORS_ONLN) psnes.3dsx

.github/workflows/3ds-release.yml

@@ -0,0 +1,65 @@
+name: 3ds-release
+
+on:
+  push:
+    tags:
+      - "v*.*"
+
+jobs:
+
+  build-3ds-release:
+    runs-on: ubuntu-20.04
+    container: devkitpro/devkitarm:latest
+    defaults:
+      run:
+        shell: bash
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: recursive
+
+      - name: Install build dependencies
+        run: |
+          sudo apt -yq update
+          sudo apt -yq install git build-essential cmake zip
+
+      - name: Build pfbneo
+        run: |
+          mkdir cmake-build-pfbneo && cd cmake-build-pfbneo
+          source /etc/profile.d/devkit-env.sh
+          cmake -G "Unix Makefiles" -DPLATFORM_3DS=ON \
+            -DOPTION_EMU=pfbneo -DOPTION_LIGHT=ON -DCMAKE_BUILD_TYPE=Release ..
+          make pfbneo.deps
+          make -j $(getconf _NPROCESSORS_ONLN) pfbneo.3dsx
+
+      - name: Build pgen
+        run: |
+          mkdir cmake-build-pgen && cd cmake-build-pgen
+          source /etc/profile.d/devkit-env.sh
+          cmake -G "Unix Makefiles" -DPLATFORM_3DS=ON -DOPTION_EMU=pgen \
+            -DOPTION_MPV_PLAYER=OFF -DCMAKE_BUILD_TYPE=Release ..
+          make -j $(getconf _NPROCESSORS_ONLN) pgen.3dsx
+
+      - name: Build pnes
+        run: |
+          mkdir cmake-build-pnes && cd cmake-build-pnes
+          source /etc/profile.d/devkit-env.sh
+          cmake -G "Unix Makefiles" -DPLATFORM_3DS=ON -DOPTION_EMU=pnes \
+            -DOPTION_MPV_PLAYER=OFF -DCMAKE_BUILD_TYPE=Release ..
+          make -j $(getconf _NPROCESSORS_ONLN) pnes.3dsx
+
+      # too slow for 3ds for now...
+      #- name: Build psnes
+        #run: |
+          #mkdir cmake-build-psnes && cd cmake-build-psnes
+          #source /etc/profile.d/devkit-env.sh
+          #cmake -G "Unix Makefiles" -DPLATFORM_3DS=ON -DOPTION_MPV_PLAYER=OFF -DOPTION_EMU=psnes -DCMAKE_BUILD_TYPE=Release ..
+          #make -j $(getconf _NPROCESSORS_ONLN) psnes.3dsx
+
+      - name: Release
+        uses: softprops/action-gh-release@v1
+        if: startsWith(github.ref, 'refs/tags/')
+        with:
+          files: '*.3dsx'
+          token: ${{ secrets.RELEASE_TOKEN }}

.github/workflows/switch-dev.yml

@@ -24,17 +24,6 @@ jobs:
           sudo apt -yq update
           sudo apt -yq install git build-essential cmake zip
 
-      # TODO: remove when merged
-      - name: Update SDL2
-        run: |
-          git clone --depth 1 --branch switch-sdl2-2.0.14-dev https://github.com/devkitPro/SDL.git
-          cd SDL && mkdir build && cd build
-          cmake \
-            -DCMAKE_TOOLCHAIN_FILE=/opt/devkitpro/cmake/Switch.cmake \
-            -DCMAKE_INSTALL_PREFIX=/opt/devkitpro/portlibs/switch \
-            -DCMAKE_BUILD_TYPE=Debug ..
-          make -j $(getconf _NPROCESSORS_ONLN) install
-
       - name: Build pfbneo
         run: |
           mkdir cmake-build-pfbneo && cd cmake-build-pfbneo

.github/workflows/switch-release.yml

@@ -24,17 +24,6 @@ jobs:
           sudo apt -yq update
           sudo apt -yq install git build-essential cmake zip
 
-      # TODO: remove when merged
-      - name: Update SDL2
-        run: |
-          git clone --depth 1 --branch switch-sdl2-2.0.14-dev https://github.com/devkitPro/SDL.git
-          cd SDL && mkdir build && cd build
-          cmake \
-            -DCMAKE_TOOLCHAIN_FILE=/opt/devkitpro/cmake/Switch.cmake \
-            -DCMAKE_INSTALL_PREFIX=/opt/devkitpro/portlibs/switch \
-            -DCMAKE_BUILD_TYPE=Release ..
-          make -j $(getconf _NPROCESSORS_ONLN) install
-
       - name: Build pfbneo
         run: |
           mkdir cmake-build-pfbneo && cd cmake-build-pfbneo

.github/workflows/vita-dev.yml

@@ -35,7 +35,7 @@ jobs:
           mkdir cmake-build-pfbneo && cd cmake-build-pfbneo
           export VITASDK=/usr/local/vitasdk
           cmake -G "Unix Makefiles" -DPLATFORM_VITA=ON \
-            -DOPTION_DISABLE_CONSOLES=ON -DOPTION_BUILTIN_MINIZIP=ON -DOPTION_MPV_PLAYER=OFF \
+            -DOPTION_LIGHT=ON -DOPTION_BUILTIN_MINIZIP=ON -DOPTION_MPV_PLAYER=OFF \
             -DOPTION_EMU=pfbneo -DCMAKE_BUILD_TYPE=Debug ..
           make pfbneo.deps
           make -j $(getconf _NPROCESSORS_ONLN) pfbneo.vpk

.github/workflows/vita-release.yml

@@ -34,7 +34,7 @@ jobs:
           mkdir cmake-build-pfbneo && cd cmake-build-pfbneo
           export VITASDK=/usr/local/vitasdk
           cmake -G "Unix Makefiles" -DPLATFORM_VITA=ON \
-            -DOPTION_DISABLE_CONSOLES=ON -DOPTION_BUILTIN_MINIZIP=ON -DOPTION_MPV_PLAYER=OFF \
+            -DOPTION_LIGHT=ON -DOPTION_BUILTIN_MINIZIP=ON -DOPTION_MPV_PLAYER=OFF \
             -DOPTION_EMU=pfbneo -DCMAKE_BUILD_TYPE=Release ..
           make pfbneo.deps
           make -j $(getconf _NPROCESSORS_ONLN) pfbneo.vpk

.gitignore

@@ -4,3 +4,6 @@ ss_dev_id.key
 ss_dev_pwd.key
 ss_user_id.key
 ss_user_pwd.key
+
+# android
+keystore.properties

CMakeLists.txt

@@ -31,7 +31,7 @@ add_subdirectory(sscrap)
 project(pemu)
 set(PROJECT_AUTHOR cpasjuste)
 set(VERSION_MAJOR 6)
-set(VERSION_MINOR 5)
+set(VERSION_MINOR 7)
 
 # pemu (ui)
 add_subdirectory(ui)

README.md

@@ -7,6 +7,9 @@
 [![switch-release](https://github.com/Cpasjuste/pemu/actions/workflows/switch-release.yml/badge.svg)](https://github.com/Cpasjuste/pemu/actions/workflows/switch-release.yml)
 [![switch-dev](https://github.com/Cpasjuste/pemu/actions/workflows/switch-dev.yml/badge.svg)](https://github.com/Cpasjuste/pemu/actions/workflows/switch-dev.yml)
 
+[![3ds-release](https://github.com/Cpasjuste/pemu/actions/workflows/3ds-release.yml/badge.svg)](https://github.com/Cpasjuste/pemu/actions/workflows/3ds-release.yml)
+[![3ds-dev](https://github.com/Cpasjuste/pemu/actions/workflows/3ds-dev.yml/badge.svg)](https://github.com/Cpasjuste/pemu/actions/workflows/3ds-dev.yml)
+
 [![ps4-release](https://github.com/Cpasjuste/pemu/actions/workflows/ps4-release.yml/badge.svg)](https://github.com/Cpasjuste/pemu/actions/workflows/ps4-release.yml)
 [![ps4-dev](https://github.com/Cpasjuste/pemu/actions/workflows/ps4-dev.yml/badge.svg)](https://github.com/Cpasjuste/pemu/actions/workflows/ps4-dev.yml)
 
@@ -15,102 +18,24 @@
 
 ## pEMU: Portable Emulator
 
-**<ins>Building on ubuntu for ubuntu</ins>**
-- Install build dependencies:
-    ```
-    sudo apt -yq update
-    sudo apt -yq install \
-        git zip build-essential cmake xxd \
-        liblzma-dev libsdl2-dev libconfig-dev libcurl4-openssl-dev libtinyxml2-dev \
-        libconfig-dev libglm-dev libfreetype6-dev libpng-dev libminizip-dev zlib1g-dev \
-        libvdpau-dev libva-dev libavcodec-dev libavfilter-dev libavformat-dev libavutil-dev \
-        libpostproc-dev libswresample-dev libswscale-dev libmpv-dev libass-dev libbz2-dev \
-        libfribidi-dev libzip-dev libarchive-dev libfuse-dev
-    ```
-- clone pemu repository:
-    ```
-    git clone --recursive https://github.com/Cpasjuste/pemu.git`
-    ```
-- build (replace `pfbneo` with emulator target: `pfbneo`, `psnes`, `pnes`, `pgen` or remove this option for all emulators):
-	```
-	mkdir cmake-build && cd cmake-build
-	cmake -G "Unix Makefiles" -DPLATFORM_LINUX=ON -DOPTION_BUILTIN_LIBCONFIG=ON \
-        -DOPTION_EMU=pfbneo -DCMAKE_BUILD_TYPE=Release ..
-	make pfbneo.deps
-	make -j $(getconf _NPROCESSORS_ONLN) pfbneo_linux_release
-	```
-
-**<ins>Building on ubuntu for nintendo switch</ins>**
-- Install build dependencies:
-    ```
-    sudo apt -yq update
-    sudo apt -yq install zip git autoconf libtool automake build-essential cmake
-    ```
-- Install switch toolchain:
-    ```
-    wget https://github.com/devkitPro/pacman/releases/download/v1.0.2/devkitpro-pacman.amd64.deb
-    sudo dpkg -i devkitpro-pacman.amd64.deb
-    sudo dkp-pacman -Syu
-    sudo dkp-pacman --noconfirm -S switch-dev switch-portlibs
-    ```
-- clone pemu repository:
-    ```
-    git clone --recursive https://github.com/Cpasjuste/pemu.git`
-    ```
-- build (replace `pfbneo` with emulator target: `pfbneo`, `psnes`, `pnes`, `pgen` or remove this option for all emulators):
-    ```
-    mkdir cmake-build && cd cmake-build
-    source /etc/profile.d/devkit-env.sh
-    cmake -G "Unix Makefiles" -DPLATFORM_SWITCH=ON -DOPTION_EMU=pfbneo \
-        -DCMAKE_BUILD_TYPE=Release ..
-    make pfbneo.deps
-    make -j $(getconf _NPROCESSORS_ONLN) pfbneo_switch_release
-    ```
-
-**<ins>Building on ubuntu for sony ps4</ins>**
-- Install build dependencies:
-    ```
-    sudo apt -yq update
-    sudo apt -yq install git build-essential cmake zip libgpgme11
-    ```
-- Install ps4 toolchain:
-    ```
-    wget https://github.com/PacBrew/pacbrew-pacman/releases/download/pacbrew-release-1.0/pacbrew-pacman-1.0.deb
-    sudo dpkg -i pacbrew-pacman-1.0.deb
-    sudo pacbrew-pacman -Syu
-    sudo pacbrew-pacman --noconfirm -S ps4-openorbis ps4-openorbis-portlibs
-    ```
-- clone pemu repository:
-    ```
-    git clone --recursive https://github.com/Cpasjuste/pemu.git`
-    ```
-- build (replace `pfbneo` with emulator target: `pfbneo`, `psnes`, `pnes`, `pgen` or remove this option for all emulators):
-    ```
-    mkdir cmake-build && cd cmake-build
-    export OPENORBIS=/opt/pacbrew/ps4/openorbis
-    cmake -G "Unix Makefiles" -DPLATFORM_PS4=ON -DOPTION_EMU=pfbneo -DCMAKE_BUILD_TYPE=Release ..
-    make pfbneo.deps
-    make -j $(getconf _NPROCESSORS_ONLN) pfbneo_ps4_release
-    ```
-
-**<ins>Building on windows for windows</ins>**
-- download, install and update [MYSYS2](http://www.msys2.org/)
-  - install build dependencies:
-    ```
-      pacman -S --noconfirm --needed git zip perl make \
-        mingw-w64-x86_64-binutils mingw-w64-x86_64-gcc mingw-w64-x86_64-make mingw-w64-x86_64-cmake mingw-w64-x86_64-pkgconf \
-        mingw-w64-x86_64-SDL2 mingw-w64-x86_64-freetype mingw-w64-x86_64-glm \
-        mingw-w64-x86_64-glew mingw-w64-x86_64-libconfig mingw-w64-x86_64-tinyxml2 \
-        mingw-w64-x86_64-mpv mingw-w64-x86_64-zlib mingw-w64-x86_64-minizip mingw-w64-x86_64-libarchive
-    ```
-- clone pemu repository:
-    ```
-    git clone --recursive https://github.com/Cpasjuste/pemu.git`
-    ```
-- build (replace `pfbneo` with emulator target: `pfbneo`, `psnes`, `pnes`, `pgen` or remove this option for all emulators):
-    ```
-    mkdir cmake-build && cd cmake-build
-    cmake -G "MSYS Makefiles" -DPLATFORM_WINDOWS=ON -DOPTION_EMU=pfbneo -DCMAKE_BUILD_TYPE=Release ..
-    make pfbneo.deps
-    make pfbneo
-    ```
+**<ins>Building</ins>**
+- [Linux](https://github.com/Cpasjuste/pemu/blob/master/.github/workflows/linux-release.yml)
+- [Windows](https://github.com/Cpasjuste/pemu/blob/master/.github/workflows/windows-release.yml)
+- [Nintendo Switch](https://github.com/Cpasjuste/pemu/blob/master/.github/workflows/switch-release.yml)
+- [Sony PS4](https://github.com/Cpasjuste/pemu/blob/master/.github/workflows/ps4-release.yml)
+- [Sony PS VITA](https://github.com/Cpasjuste/pemu/blob/master/.github/workflows/vita-release.yml)
+
+**<ins>Common instructions</ins>**
+- "pEMU" emulators use [embedded (romfs)](https://github.com/Cpasjuste/pemu/tree/master/pfbneo/data/common/romfs) "gamelist.xml" files to manage your rom files.
+Since version 6.7, the emulator will also look inside your configured rom folders for a "gamelist.xml" file (EmulationStation format, which can be made with ["Skraper"](https://www.skraper.net/) for example).
+This will overwrite the embedded "gamelist.xml" database. Please take note that only the "\<image>" and "\<video>" media tags are supported.
+- Default skins are also [embedded (romfs)](https://github.com/Cpasjuste/pemu/tree/master/data/common/romfs/skins/default) in the application.
+You can overwrite parts of the default theme by creating a folder named "default" in the "skins" directory of the data folder, and adding a ["config.cfg.override"](https://github.com/Cpasjuste/pemu/tree/master/pgen/data/common/romfs/skins/default/config.cfg.override) (and/or a ["config.cfg.override.43"](https://github.com/Cpasjuste/pemu/tree/master/data/common/romfs/skins/default/config.cfg.override.43) for 4/3 screens) file.
+You can also create a new directory with a new name to create a new theme, the [default](https://github.com/Cpasjuste/pemu/tree/master/data/common/romfs/skins/default) one is a good start to look at.
+Please note that the theme code/api is subject to change without warning, do not loose too much time on this...
+
+**<ins>Custom instructions</ins>**
+- [pfbneo](https://github.com/Cpasjuste/pemu/tree/master/pfbneo)
+- [pgen](https://github.com/Cpasjuste/pemu/tree/master/pgen)
+- [pnes](https://github.com/Cpasjuste/pemu/tree/master/pnes)
+- [psnes](https://github.com/Cpasjuste/pemu/tree/master/psnes)