Merge branch 'libretro:master' into master

EmulatorJS · Jun 26, 2024 · 94b048d · 94b048d
2 parents 89e155f + 535217f
commit 94b048d
Show file tree

Hide file tree

Showing 115 changed files with 7,459 additions and 2,029 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -4,7 +4,7 @@ jobs:
   build-linux:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: true
     - name: Install dependencies
@@ -14,16 +14,16 @@ jobs:
     - name: configure
       run: DUMP_CONFIG_LOG=1 ./configure
     - name: make
-      run: make -j2
+      run: make -j$(getconf _NPROCESSORS_ONLN)
 
   build-libretro:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: true
     - name: make
-      run: LDFLAGS=-Wl,--no-undefined make -j2 -f Makefile.libretro
+      run: LDFLAGS=-Wl,--no-undefined make -j$(getconf _NPROCESSORS_ONLN) -f Makefile.libretro
 
 
   build-gp2x:
@@ -32,19 +32,19 @@ jobs:
     permissions:
       packages: read
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: true
     - name: build
       run: |
         git config --global --add safe.directory $PWD
         ver=$(cut -d'"' -f2 platform/common/version.h)-$(git rev-parse --short HEAD)
         ./configure --platform=gph
-        make -j2 PLATFORM_MP3=0
+        make -j$(getconf _NPROCESSORS_ONLN) PLATFORM_MP3=0
         make -C platform/gp2x rel VER=$ver
         mv PicoDrive_$ver.zip PicoDrive-gph_$ver.zip
     - name: artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: GP2X
         path: PicoDrive-gph_*.zip
@@ -53,19 +53,19 @@ jobs:
     runs-on: ubuntu-latest
     container: ghcr.io/irixxxx/toolchain-pandora
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: true
     - name: build
       run: |
         git config --global --add safe.directory $PWD
         ver=$(cut -d'"' -f2 platform/common/version.h)-$(git rev-parse --short HEAD)
         ./configure --platform=pandora
-        make -j2
+        make -j$(getconf _NPROCESSORS_ONLN)
         make -C platform/pandora rel VER=$ver
         mv platform/pandora/PicoDrive_*.pnd .
     - name: artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: Pandora
         path: PicoDrive_*.pnd
@@ -77,7 +77,7 @@ jobs:
     - name: build environment
       run: |
         apk add git gcc g++ zip
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: true
     - name: build
@@ -86,33 +86,57 @@ jobs:
         git config --global --add safe.directory $PWD
         ver=$(cut -d'"' -f2 platform/common/version.h)-$(git rev-parse --short HEAD)
         ./configure --platform=psp
-        make -j2
+        make -j$(getconf _NPROCESSORS_ONLN)
         make -C platform/psp rel VER=$ver
     - name: artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: PSP
         path: PicoDrive_psp_*.zip
 
+  build-ps2:
+    runs-on: ubuntu-latest
+    container: ps2dev/ps2dev
+    steps:
+    - name: build environment
+      run: |
+        apk add build-base cmake git zip make
+    - uses: actions/checkout@v4
+      with:
+        submodules: true
+    - name: build
+      run: |
+        export CROSS_COMPILE=mips64r5900el-ps2-elf-
+        git config --global --add safe.directory $PWD
+        ver=$(cut -d'"' -f2 platform/common/version.h)-$(git rev-parse --short HEAD)
+        ./configure --platform=ps2
+        make -j$(getconf _NPROCESSORS_ONLN)
+        make -C platform/ps2 rel VER=$ver
+    - name: artifacts
+      uses: actions/upload-artifact@v4
+      with:
+        name: PS2
+        path: PicoDrive_ps2_*.zip
+
 
   build-dingux:
     runs-on: ubuntu-latest
     permissions:
       packages: read
     container: ghcr.io/irixxxx/toolchain-dingux
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: true
     - name: build
       run: |
         git config --global --add safe.directory $PWD
         ver=$(cut -d'"' -f2 platform/common/version.h)-$(git rev-parse --short HEAD)
         ./configure --platform=dingux
-        make -j2
+        make -j$(getconf _NPROCESSORS_ONLN)
         mv PicoDrive-dge.zip PicoDrive-dge-$ver.zip
     - name: artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: Dingux
         path: PicoDrive-dge*.zip
@@ -121,18 +145,18 @@ jobs:
     runs-on: ubuntu-latest
     container: ghcr.io/irixxxx/toolchain-opendingux
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: true
     - name: build
       run: |
         git config --global --add safe.directory $PWD
         ver=$(cut -d'"' -f2 platform/common/version.h)-$(git rev-parse --short HEAD)
         ./configure --platform=opendingux-gcw0
-        make -j2
+        make -j$(getconf _NPROCESSORS_ONLN)
         mv PicoDrive.opk PicoDrive-gcw0-$ver.opk
     - name: artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: GCW0
         path: PicoDrive-gcw0*.opk
@@ -141,18 +165,18 @@ jobs:
     runs-on: ubuntu-latest
     container: ghcr.io/irixxxx/toolchain-opendingux
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: true
     - name: build
       run: |
         git config --global --add safe.directory $PWD
         ver=$(cut -d'"' -f2 platform/common/version.h)-$(git rev-parse --short HEAD)
         ./configure --platform=opendingux
-        make -j2
+        make -j$(getconf _NPROCESSORS_ONLN)
         mv PicoDrive.opk PicoDrive-opendingux-$ver.opk
     - name: artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: Opendingux
         path: PicoDrive-opendingux*.opk
@@ -163,18 +187,18 @@ jobs:
       packages: read
     container: ghcr.io/irixxxx/toolchain-miyoo
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: true
     - name: build
       run: |
         git config --global --add safe.directory $PWD
         ver=$(cut -d'"' -f2 platform/common/version.h)-$(git rev-parse --short HEAD)
         ./configure --platform=miyoo
-        make -j2
+        make -j$(getconf _NPROCESSORS_ONLN)
         mv PicoDrive-miyoo.zip PicoDrive-miyoo-$ver.zip
     - name: artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: Miyoo
         path: PicoDrive-miyoo*.zip
@@ -183,18 +207,18 @@ jobs:
     runs-on: ubuntu-latest
     container: ghcr.io/irixxxx/toolchain-retrofw
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: true
     - name: build
       run: |
         git config --global --add safe.directory $PWD
         ver=$(cut -d'"' -f2 platform/common/version.h)-$(git rev-parse --short HEAD)
         ./configure --platform=retrofw
-        make -j2
+        make -j$(getconf _NPROCESSORS_ONLN)
         mv PicoDrive.opk PicoDrive-retrofw-$ver.opk
     - name: artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: RetroFW
         path: PicoDrive-retrofw*.opk
@@ -203,18 +227,18 @@ jobs:
     runs-on: ubuntu-latest
     container: ghcr.io/irixxxx/toolchain-odbeta-gcw0
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: true
     - name: build
       run: |
         git config --global --add safe.directory $PWD
         ver=$(cut -d'"' -f2 platform/common/version.h)-$(git rev-parse --short HEAD)
         ./configure --platform=odbeta
-        make -j2
+        make -j$(getconf _NPROCESSORS_ONLN)
         mv PicoDrive.opk PicoDrive-odbeta-gcw0-$ver.opk
     - name: artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: ODbeta gcw0
         path: PicoDrive-odbeta-*.opk
@@ -223,18 +247,18 @@ jobs:
     runs-on: ubuntu-latest
     container: ghcr.io/irixxxx/toolchain-odbeta-lepus
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: true
     - name: build
       run: |
         git config --global --add safe.directory $PWD
         ver=$(cut -d'"' -f2 platform/common/version.h)-$(git rev-parse --short HEAD)
         ./configure --platform=odbeta
-        make -j2
+        make -j$(getconf _NPROCESSORS_ONLN)
         mv PicoDrive.opk PicoDrive-odbeta-lepus-$ver.opk
     - name: artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: ODbeta lepus
         path: PicoDrive-odbeta-*.opk
@@ -243,18 +267,18 @@ jobs:
     runs-on: ubuntu-latest
     container: ghcr.io/irixxxx/toolchain-odbeta-rs90
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: true
     - name: build
       run: |
         git config --global --add safe.directory $PWD
         ver=$(cut -d'"' -f2 platform/common/version.h)-$(git rev-parse --short HEAD)
         ./configure --platform=odbeta
-        make -j2
+        make -j$(getconf _NPROCESSORS_ONLN)
         mv PicoDrive.opk PicoDrive-odbeta-rg99-$ver.opk
     - name: artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: ODbeta rg99
         path: PicoDrive-odbeta-*.opk
diff --git a/.gitignore b/.gitignore
@@ -25,8 +25,12 @@ cfg/
 libs/
 obj/
 .opk_data
+.od_data
 PicoDrive
-PicoDrive.opk
+picodrive
+picodrive_libretro*
+PicoDrive*.opk
+PicoDrive*.zip
 pico_int_offs.h
 amalgamate
 textfilter
diff --git a/.gitmodules b/.gitmodules
@@ -3,7 +3,7 @@
 	url = https://github.com/irixxxx/libpicofe.git
 [submodule "cpu/cyclone"]
 	path = cpu/cyclone
-	url = https://github.com/notaz/cyclone68000.git
+	url = https://github.com/irixxxx/cyclone68000.git
 [submodule "pico/sound/emu2413"]
 	path = pico/sound/emu2413
 	url = https://github.com/digital-sound-antiques/emu2413.git