merge dev

.github/workflows/3ds-dev.yml

@@ -24,35 +24,15 @@ jobs:
           sudo apt -yq update
           sudo apt -yq install git build-essential cmake zip
 
-      - name: Build pfbneo
+      - name: Configure
         run: |
-          mkdir cmake-build-pfbneo && cd cmake-build-pfbneo
+          cd $GITHUB_WORKSPACE
           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
+          mkdir cmake-build && cd cmake-build
+          cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Debug .. \
+            -DPLATFORM_3DS=ON -DOPTION_LIGHT=ON -DOPTION_MPV_PLAYER=OFF
 
       - 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=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
+          cd $GITHUB_WORKSPACE/cmake-build
+          make pgen.3dsx

.github/workflows/3ds-release.yml

@@ -4,6 +4,7 @@ on:
   push:
     tags:
       - "v*.*"
+  workflow_dispatch:
 
 jobs:
 
@@ -24,43 +25,15 @@ jobs:
           sudo apt -yq update
           sudo apt -yq install git build-essential cmake zip
 
-      - name: Build pfbneo
+      - name: Configure
         run: |
-          mkdir cmake-build-pfbneo && cd cmake-build-pfbneo
+          cd $GITHUB_WORKSPACE
           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=Release ..
-          make pfbneo.deps
-          make -j $(getconf _NPROCESSORS_ONLN) pfbneo.3dsx
+          mkdir cmake-build && cd cmake-build
+          cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release .. \
+            -DPLATFORM_3DS=ON -DOPTION_LIGHT=ON -DOPTION_MPV_PLAYER=OFF
 
       - 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
-
-      # not ready at all...
-      #- name: Release
-      #  uses: softprops/action-gh-release@v1
-      #  if: startsWith(github.ref, 'refs/tags/')
-      #  with:
-      #    files: '*.3dsx'
-      #    token: ${{ secrets.GITHUB_TOKEN }}
+          cd $GITHUB_WORKSPACE/cmake-build
+          make pgen.3dsx

.github/workflows/linux-dev.yml

@@ -24,33 +24,36 @@ jobs:
               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
+              libfribidi-dev libzip-dev libarchive-dev
 
-      - name: Build pfbneo
+      - name: Configure
         run: |
           cd $GITHUB_WORKSPACE
-          mkdir cmake-build-pfbneo && cd cmake-build-pfbneo
-          cmake -G "Unix Makefiles" -DPLATFORM_LINUX=ON -DOPTION_EMU=pfbneo -DCMAKE_BUILD_TYPE=Debug ..
+          mkdir cmake-build && cd cmake-build
+          cmake -G "Unix Makefiles" -DPLATFORM_LINUX=ON -DCMAKE_BUILD_TYPE=Debug ..
+
+      - name: Build pfbneo
+        run: |
+          cd $GITHUB_WORKSPACE/cmake-build
           make pfbneo.deps
-          make -j $(getconf _NPROCESSORS_ONLN) pfbneo
+          make pfbneo
 
       - name: Build pgen
         run: |
-          cd $GITHUB_WORKSPACE
-          mkdir cmake-build-pgen && cd cmake-build-pgen
-          cmake -G "Unix Makefiles" -DPLATFORM_LINUX=ON -DOPTION_EMU=pgen -DCMAKE_BUILD_TYPE=Debug ..
-          make -j $(getconf _NPROCESSORS_ONLN) pgen
+          cd $GITHUB_WORKSPACE/cmake-build
+          make pgen
 
       - name: Build pnes
         run: |
-          cd $GITHUB_WORKSPACE
-          mkdir cmake-build-pnes && cd cmake-build-pnes
-          cmake -G "Unix Makefiles" -DPLATFORM_LINUX=ON -DOPTION_EMU=pnes -DCMAKE_BUILD_TYPE=Debug ..
-          make -j $(getconf _NPROCESSORS_ONLN) pnes
+          cd $GITHUB_WORKSPACE/cmake-build
+          make pnes
 
       - name: Build psnes
         run: |
-          cd $GITHUB_WORKSPACE
-          mkdir cmake-build-psnes && cd cmake-build-psnes
-          cmake -G "Unix Makefiles" -DPLATFORM_LINUX=ON -DOPTION_EMU=psnes -DCMAKE_BUILD_TYPE=Debug ..
-          make -j $(getconf _NPROCESSORS_ONLN) psnes
+          cd $GITHUB_WORKSPACE/cmake-build
+          make psnes
+
+      - name: Build pgba
+        run: |
+          cd $GITHUB_WORKSPACE/cmake-build
+          make pgba

.github/workflows/linux-release.yml

@@ -4,6 +4,7 @@ on:
   push:
     tags:
       - "v*.*"
+  workflow_dispatch:
 
 jobs:
 
@@ -24,40 +25,48 @@ jobs:
               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
+              libfribidi-dev libzip-dev libarchive-dev
+
+      - name: Configure
+        run: |
+          cd $GITHUB_WORKSPACE
+          mkdir cmake-build && cd cmake-build
+          cmake -G "Unix Makefiles" -DPLATFORM_LINUX=ON -DCMAKE_BUILD_TYPE=Release ..
 
       - name: Build pfbneo
         run: |
-          mkdir cmake-build-pfbneo && cd cmake-build-pfbneo
-          cmake -G "Unix Makefiles" -DPLATFORM_LINUX=ON -DOPTION_EMU=pfbneo -DCMAKE_BUILD_TYPE=Release ..
+          cd $GITHUB_WORKSPACE/cmake-build
           make pfbneo.deps
-          make -j $(getconf _NPROCESSORS_ONLN) pfbneo
-          mv pfbneo/pfbneo $GITHUB_WORKSPACE/pfbneo-linux
+          make pfbneo_linux_release
+          mv *.zip $GITHUB_WORKSPACE
 
       - name: Build pgen
         run: |
-          mkdir cmake-build-pgen && cd cmake-build-pgen
-          cmake -G "Unix Makefiles" -DPLATFORM_LINUX=ON -DOPTION_EMU=pgen -DCMAKE_BUILD_TYPE=Release ..
-          make -j $(getconf _NPROCESSORS_ONLN) pgen
-          mv pgen/pgen $GITHUB_WORKSPACE/pgen-linux
+          cd $GITHUB_WORKSPACE/cmake-build
+          make pgen_linux_release
+          mv *.zip $GITHUB_WORKSPACE
 
       - name: Build pnes
         run: |
-          mkdir cmake-build-pnes && cd cmake-build-pnes
-          cmake -G "Unix Makefiles" -DPLATFORM_LINUX=ON -DOPTION_EMU=pnes -DCMAKE_BUILD_TYPE=Release ..
-          make -j $(getconf _NPROCESSORS_ONLN) pnes
-          mv pnes/pnes $GITHUB_WORKSPACE/pnes-linux
+          cd $GITHUB_WORKSPACE/cmake-build
+          make pnes_linux_release
+          mv *.zip $GITHUB_WORKSPACE
 
       - name: Build psnes
         run: |
-          mkdir cmake-build-psnes && cd cmake-build-psnes
-          cmake -G "Unix Makefiles" -DPLATFORM_LINUX=ON -DOPTION_EMU=psnes -DCMAKE_BUILD_TYPE=Release ..
-          make -j $(getconf _NPROCESSORS_ONLN) psnes
-          mv psnes/psnes $GITHUB_WORKSPACE/psnes-linux
+          cd $GITHUB_WORKSPACE/cmake-build
+          make psnes_linux_release
+          mv *.zip $GITHUB_WORKSPACE
+
+      - name: Build pgba
+        run: |
+          cd $GITHUB_WORKSPACE/cmake-build
+          make pgba_linux_release
+          mv *.zip $GITHUB_WORKSPACE
 
       - name: Release
         uses: softprops/action-gh-release@v1
         if: startsWith(github.ref, 'refs/tags/')
         with:
-          files: '*-linux'
+          files: '*.zip'
           token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/ps4-dev.yml

@@ -27,35 +27,35 @@ jobs:
           sudo pacbrew-pacman -Syu
           sudo pacbrew-pacman --noconfirm -S ps4-openorbis ps4-openorbis-portlibs
 
-      - name: Build pfbneo
+      - name: Configure
         run: |
           cd $GITHUB_WORKSPACE
-          mkdir cmake-build-pfbneo && cd cmake-build-pfbneo
+          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=Debug ..
+          cmake -G "Unix Makefiles" -DPLATFORM_PS4=ON -DCMAKE_BUILD_TYPE=Debug ..
+
+      - name: Build pfbneo
+        run: |
+          cd $GITHUB_WORKSPACE/cmake-build
           make pfbneo.deps
-          make -j $(getconf _NPROCESSORS_ONLN) pfbneo_pkg
+          make pfbneo_pkg
 
       - name: Build pgen
         run: |
-          cd $GITHUB_WORKSPACE
-          mkdir cmake-build-pgen && cd cmake-build-pgen
-          export OPENORBIS=/opt/pacbrew/ps4/openorbis
-          cmake -G "Unix Makefiles" -DPLATFORM_PS4=ON -DOPTION_EMU=pgen -DCMAKE_BUILD_TYPE=Debug ..
-          make -j $(getconf _NPROCESSORS_ONLN) pgen_pkg
+          cd $GITHUB_WORKSPACE/cmake-build
+          make pgen_pkg
 
       - name: Build pnes
         run: |
-          cd $GITHUB_WORKSPACE
-          mkdir cmake-build-pnes && cd cmake-build-pnes
-          export OPENORBIS=/opt/pacbrew/ps4/openorbis
-          cmake -G "Unix Makefiles" -DPLATFORM_PS4=ON -DOPTION_EMU=pnes -DCMAKE_BUILD_TYPE=Debug ..
-          make -j $(getconf _NPROCESSORS_ONLN) pnes_pkg
+          cd $GITHUB_WORKSPACE/cmake-build
+          make pnes_pkg
 
       - name: Build psnes
         run: |
-          cd $GITHUB_WORKSPACE
-          mkdir cmake-build-psnes && cd cmake-build-psnes
-          export OPENORBIS=/opt/pacbrew/ps4/openorbis
-          cmake -G "Unix Makefiles" -DPLATFORM_PS4=ON -DOPTION_EMU=psnes -DCMAKE_BUILD_TYPE=Debug ..
-          make -j $(getconf _NPROCESSORS_ONLN) psnes_pkg
+          cd $GITHUB_WORKSPACE/cmake-build
+          make psnes_pkg
+
+      - name: Build pgba
+        run: |
+          cd $GITHUB_WORKSPACE/cmake-build
+          make pgba_pkg

.github/workflows/ps4-release.yml

@@ -4,6 +4,7 @@ on:
   push:
     tags:
       - "v*.*"
+  workflow_dispatch:
 
 jobs:
 
@@ -27,37 +28,42 @@ jobs:
           sudo pacbrew-pacman -Syu
           sudo pacbrew-pacman --noconfirm -S ps4-openorbis ps4-openorbis-portlibs
 
-      - name: Build pfbneo
+      - name: Configure
         run: |
-          mkdir cmake-build-pfbneo && cd cmake-build-pfbneo
+          cd $GITHUB_WORKSPACE
+          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 ..
+          cmake -G "Unix Makefiles" -DPLATFORM_PS4=ON -DCMAKE_BUILD_TYPE=Release ..
+
+      - name: Build pfbneo
+        run: |
+          cd $GITHUB_WORKSPACE/cmake-build
           make pfbneo.deps
-          make -j $(getconf _NPROCESSORS_ONLN) pfbneo_pkg
+          make pfbneo_pkg
           mv *.pkg $GITHUB_WORKSPACE
 
       - name: Build pgen
         run: |
-          mkdir cmake-build-pgen && cd cmake-build-pgen
-          export OPENORBIS=/opt/pacbrew/ps4/openorbis
-          cmake -G "Unix Makefiles" -DPLATFORM_PS4=ON -DOPTION_EMU=pgen -DCMAKE_BUILD_TYPE=Release ..
-          make -j $(getconf _NPROCESSORS_ONLN) pgen_pkg
+          cd $GITHUB_WORKSPACE/cmake-build
+          make pgen_pkg
           mv *.pkg $GITHUB_WORKSPACE
 
       - name: Build pnes
         run: |
-          mkdir cmake-build-pnes && cd cmake-build-pnes
-          export OPENORBIS=/opt/pacbrew/ps4/openorbis
-          cmake -G "Unix Makefiles" -DPLATFORM_PS4=ON -DOPTION_EMU=pnes -DCMAKE_BUILD_TYPE=Release ..
-          make -j $(getconf _NPROCESSORS_ONLN) pnes_pkg
+          cd $GITHUB_WORKSPACE/cmake-build
+          make pnes_pkg
           mv *.pkg $GITHUB_WORKSPACE
 
       - name: Build psnes
         run: |
-          mkdir cmake-build-psnes && cd cmake-build-psnes
-          export OPENORBIS=/opt/pacbrew/ps4/openorbis
-          cmake -G "Unix Makefiles" -DPLATFORM_PS4=ON -DOPTION_EMU=psnes -DCMAKE_BUILD_TYPE=Release ..
-          make -j $(getconf _NPROCESSORS_ONLN) psnes_pkg
+          cd $GITHUB_WORKSPACE/cmake-build
+          make psnes_pkg
+          mv *.pkg $GITHUB_WORKSPACE
+
+      - name: Build pgba
+        run: |
+          cd $GITHUB_WORKSPACE/cmake-build
+          make pgba_pkg
           mv *.pkg $GITHUB_WORKSPACE
 
       - name: Release