Skip to content

Commit adee53e

Browse files
kivutarkivutar
authored
Update go modules (#547)
1 parent 2c9a4fd commit adee53e

File tree

14 files changed

+118
-212
lines changed

14 files changed

+118
-212
lines changed

‎.github/workflows/cd.yml

Lines changed: 30 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
submodules: true
2020
- uses: actions/setup-go@v5
2121
with:
22-
go-version: '1.22.3'
22+
go-version: '1.23.4'
2323
- run: echo "VERSION=$(echo ${{ github.event.release.tag_name }} | cut -c 2-)" >> $GITHUB_ENV
2424
- run: sudo apt-get update -q
2525
- run: sudo apt-get install libopenal-dev xorg-dev libgl1-mesa-dev libwayland-dev libxkbcommon-dev -y --allow-unauthenticated
@@ -36,30 +36,32 @@ jobs:
3636
asset_paths: '["./Ludo-*.tar.gz*", "./*.deb"]'
3737

3838
build_linux_wayland_arm:
39-
runs-on: ubuntu-22.04
39+
runs-on: ubuntu-24.04
4040
steps:
4141
- uses: actions/checkout@v4
4242
with:
4343
submodules: true
4444
- uses: actions/setup-go@v5
4545
with:
46-
go-version: '1.22.3'
46+
go-version: '1.23.4'
4747
- run: echo "VERSION=$(echo ${{ github.event.release.tag_name }} | cut -c 2-)" >> $GITHUB_ENV
4848
- run: sudo apt update -q
4949
- run: sudo apt install binutils-multiarch
5050
- run: sudo dpkg --add-architecture armhf
51+
- run: sudo rm -rf /etc/apt/sources.list.d/*s
5152
- run: echo "" | sudo tee /etc/apt/sources.list
52-
- run: echo "deb [arch=amd64] http://us.archive.ubuntu.com/ubuntu/ jammy main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
53-
- run: echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports jammy main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
54-
- run: echo "deb [arch=amd64] http://us.archive.ubuntu.com/ubuntu/ jammy-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
55-
- run: echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports jammy-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
56-
- run: echo "deb [arch=amd64] http://us.archive.ubuntu.com/ubuntu/ jammy-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
57-
- run: echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports jammy-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
53+
- run: echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports noble main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
54+
- run: echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports noble-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
55+
- run: echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports noble-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
56+
- run: echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports noble-security main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
57+
- run: echo "deb [arch=amd64] http://us.archive.ubuntu.com/ubuntu/ noble main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
58+
- run: echo "deb [arch=amd64] http://us.archive.ubuntu.com/ubuntu/ noble-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
59+
- run: echo "deb [arch=amd64] http://us.archive.ubuntu.com/ubuntu/ noble-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
60+
- run: echo "deb [arch=amd64] http://us.archive.ubuntu.com/ubuntu/ noble-security main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
5861
- run: sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 6B05F25D762E3157
5962
- run: sudo apt update -q
60-
- run: sudo apt install -f libgl1-mesa-dev:amd64 libc6-dev:armhf gcc-arm-linux-gnueabihf libopenal-dev:armhf libgl1-mesa-dev:armhf libxcursor-dev:armhf libxrandr-dev:armhf libxinerama-dev:armhf libxi-dev:armhf libwayland-dev:armhf libxkbcommon-dev:armhf -y --allow-unauthenticated
61-
- run: export PKG_CONFIG_PATH=/usr/lib/arm-linux-gnueabihf/pkgconfig/
62-
- run: GOOS=linux GOARCH=arm GOARM=7 CGO_ENABLED=1 CC=arm-linux-gnueabihf-gcc go build -tags wayland -v
63+
- run: sudo apt install -f libc6-dev:armhf gcc-arm-linux-gnueabihf libopenal-dev:armhf libgl1-mesa-dev:armhf libxcursor-dev:armhf libxrandr-dev:armhf libxinerama-dev:armhf libxi-dev:armhf libwayland-dev:armhf libxkbcommon-dev:armhf -y --allow-unauthenticated
64+
- run: PKG_CONFIG_PATH=/usr/lib/arm-linux-gnueabihf/pkgconfig/ GOOS=linux GOARCH=arm GOARM=7 CGO_ENABLED=1 CC=arm-linux-gnueabihf-gcc go build -tags wayland -v
6365
- run: OS=Linux ARCH=arm DISPDRIVER=wayland VERSION=$VERSION make tar
6466
- run: OS=Linux ARCH=arm DISPDRIVER=wayland VERSION=$VERSION make deb
6567
- run: sha256sum Ludo-Linux-wayland-arm-${VERSION}.tar.gz > Ludo-Linux-wayland-arm-${VERSION}.tar.gz.sha256
@@ -79,7 +81,7 @@ jobs:
7981
submodules: true
8082
- uses: actions/setup-go@v5
8183
with:
82-
go-version: '1.22.3'
84+
go-version: '1.23.4'
8385
- run: echo "VERSION=$(echo ${{ github.event.release.tag_name }} | cut -c 2-)" >> $GITHUB_ENV
8486
- run: sudo apt-get update -q
8587
- run: sudo apt-get install libopenal-dev xorg-dev libgl1-mesa-dev -y --allow-unauthenticated
@@ -96,30 +98,32 @@ jobs:
9698
asset_paths: '["./Ludo-*.tar.gz*", "./*.deb"]'
9799

98100
build_linux_x11_arm:
99-
runs-on: ubuntu-20.04
101+
runs-on: ubuntu-24.04
100102
steps:
101103
- uses: actions/checkout@v4
102104
with:
103105
submodules: true
104106
- uses: actions/setup-go@v5
105107
with:
106-
go-version: '1.22.3'
108+
go-version: '1.23.4'
107109
- run: echo "VERSION=$(echo ${{ github.event.release.tag_name }} | cut -c 2-)" >> $GITHUB_ENV
108110
- run: sudo apt update -q
109111
- run: sudo apt install binutils-multiarch
110112
- run: sudo dpkg --add-architecture armhf
113+
- run: sudo rm -rf /etc/apt/sources.list.d/*s
111114
- run: echo "" | sudo tee /etc/apt/sources.list
112-
- run: echo "deb [arch=amd64] http://us.archive.ubuntu.com/ubuntu/ jammy main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
113-
- run: echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports jammy main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
114-
- run: echo "deb [arch=amd64] http://us.archive.ubuntu.com/ubuntu/ jammy-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
115-
- run: echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports jammy-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
116-
- run: echo "deb [arch=amd64] http://us.archive.ubuntu.com/ubuntu/ jammy-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
117-
- run: echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports jammy-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
115+
- run: echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports noble main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
116+
- run: echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports noble-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
117+
- run: echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports noble-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
118+
- run: echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports noble-security main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
119+
- run: echo "deb [arch=amd64] http://us.archive.ubuntu.com/ubuntu/ noble main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
120+
- run: echo "deb [arch=amd64] http://us.archive.ubuntu.com/ubuntu/ noble-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
121+
- run: echo "deb [arch=amd64] http://us.archive.ubuntu.com/ubuntu/ noble-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
122+
- run: echo "deb [arch=amd64] http://us.archive.ubuntu.com/ubuntu/ noble-security main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
118123
- run: sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 6B05F25D762E3157
119124
- run: sudo apt update -q
120-
- run: sudo apt install -f libgl1-mesa-dev:amd64 libxxf86vm-dev:armhf libc6-dev:armhf gcc-arm-linux-gnueabihf libopenal-dev:armhf libgl1-mesa-dev:armhf libxcursor-dev:armhf libxrandr-dev:armhf libxinerama-dev:armhf libxi-dev:armhf -y --allow-unauthenticated
121-
- run: export PKG_CONFIG_PATH=/usr/lib/arm-linux-gnueabihf/pkgconfig/
122-
- run: GOOS=linux GOARCH=arm GOARM=7 CGO_ENABLED=1 CC=arm-linux-gnueabihf-gcc go build -tags x11 -v
125+
- run: sudo apt install -f libxxf86vm-dev:armhf libc6-dev:armhf gcc-arm-linux-gnueabihf libopenal-dev:armhf libgl1-mesa-dev:armhf libxcursor-dev:armhf libxrandr-dev:armhf libxinerama-dev:armhf libxi-dev:armhf -y --allow-unauthenticated
126+
- run: PKG_CONFIG_PATH=/usr/lib/arm-linux-gnueabihf/pkgconfig/ GOOS=linux GOARCH=arm GOARM=7 CGO_ENABLED=1 CC=arm-linux-gnueabihf-gcc go build -tags x11 -v
123127
- run: OS=Linux ARCH=arm DISPDRIVER=x11 VERSION=$VERSION make tar
124128
- run: OS=Linux ARCH=arm DISPDRIVER=x11 VERSION=$VERSION make deb
125129
- run: sha256sum Ludo-Linux-x11-arm-${VERSION}.tar.gz > Ludo-Linux-x11-arm-${VERSION}.tar.gz.sha256
@@ -139,7 +143,7 @@ jobs:
139143
submodules: true
140144
- uses: actions/setup-go@v5
141145
with:
142-
go-version: '1.22.3'
146+
go-version: '1.23.4'
143147
- run: echo "VERSION=$(echo ${{ github.event.release.tag_name }} | cut -c 2-)" >> $GITHUB_ENV
144148
- run: echo "/Users/runner/go/bin" >> $GITHUB_PATH
145149
- run: go install honnef.co/go/tools/cmd/staticcheck@latest
@@ -173,7 +177,7 @@ jobs:
173177
submodules: true
174178
- uses: actions/setup-go@v5
175179
with:
176-
go-version: '1.22.3'
180+
go-version: '1.23.4'
177181
- run: echo "VERSION=$(echo ${{ github.event.release.tag_name }} | cut -c 2-)" >> $GITHUB_ENV
178182
- run: choco install wget make hashdeep --ignore-checksums
179183
- run: wget --no-check-certificate http://www.openal-soft.org/openal-binaries/openal-soft-1.21.0-bin.zip

‎.github/workflows/ci.yml

Lines changed: 30 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
submodules: true
2222
- uses: actions/setup-go@v5
2323
with:
24-
go-version: '1.22.3'
24+
go-version: '1.23.4'
2525
- run: echo "/home/runner/go/bin" >> $GITHUB_PATH
2626
- run: go install honnef.co/go/tools/cmd/staticcheck@latest
2727
- run: sudo apt-get update -q
@@ -33,29 +33,31 @@ jobs:
3333
- run: go build -tags wayland -v
3434

3535
build_linux_wayland_arm:
36-
runs-on: ubuntu-20.04
36+
runs-on: ubuntu-24.04
3737
steps:
3838
- uses: actions/checkout@v4
3939
with:
4040
submodules: true
4141
- uses: actions/setup-go@v5
4242
with:
43-
go-version: '1.22.3'
43+
go-version: '1.23.4'
4444
- run: sudo apt update -q
4545
- run: sudo apt install binutils-multiarch
4646
- run: sudo dpkg --add-architecture armhf
47+
- run: sudo rm -rf /etc/apt/sources.list.d/*
4748
- run: echo "" | sudo tee /etc/apt/sources.list
48-
- run: echo "deb [arch=amd64] http://us.archive.ubuntu.com/ubuntu/ jammy main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
49-
- run: echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports jammy main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
50-
- run: echo "deb [arch=amd64] http://us.archive.ubuntu.com/ubuntu/ jammy-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
51-
- run: echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports jammy-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
52-
- run: echo "deb [arch=amd64] http://us.archive.ubuntu.com/ubuntu/ jammy-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
53-
- run: echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports jammy-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
49+
- run: echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports noble main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
50+
- run: echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports noble-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
51+
- run: echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports noble-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
52+
- run: echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports noble-security main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
53+
- run: echo "deb [arch=amd64] http://us.archive.ubuntu.com/ubuntu/ noble main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
54+
- run: echo "deb [arch=amd64] http://us.archive.ubuntu.com/ubuntu/ noble-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
55+
- run: echo "deb [arch=amd64] http://us.archive.ubuntu.com/ubuntu/ noble-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
56+
- run: echo "deb [arch=amd64] http://us.archive.ubuntu.com/ubuntu/ noble-security main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
5457
- run: sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 6B05F25D762E3157
5558
- run: sudo apt update -q
56-
- run: sudo apt install -f libgl1-mesa-dev:amd64 libc6-dev:armhf gcc-arm-linux-gnueabihf libopenal-dev:armhf libgl1-mesa-dev:armhf libxcursor-dev:armhf libxrandr-dev:armhf libxinerama-dev:armhf libxi-dev:armhf libwayland-dev:armhf libxkbcommon-dev:armhf -y --allow-unauthenticated
57-
- run: export PKG_CONFIG_PATH=/usr/lib/arm-linux-gnueabihf/pkgconfig/
58-
- run: GOOS=linux GOARCH=arm GOARM=7 CGO_ENABLED=1 CC=arm-linux-gnueabihf-gcc go build -tags wayland -v
59+
- run: sudo apt install -f libc6-dev:armhf gcc-arm-linux-gnueabihf libopenal-dev:armhf libgl1-mesa-dev:armhf libxcursor-dev:armhf libxrandr-dev:armhf libxinerama-dev:armhf libxi-dev:armhf libwayland-dev:armhf libxkbcommon-dev:armhf -y --allow-unauthenticated
60+
- run: PKG_CONFIG_PATH=/usr/lib/arm-linux-gnueabihf/pkgconfig/ GOOS=linux GOARCH=arm GOARM=7 CGO_ENABLED=1 CC=arm-linux-gnueabihf-gcc go build -tags wayland -v
5961

6062
build_linux_x11_x86_64:
6163
runs-on: ubuntu-latest
@@ -65,7 +67,7 @@ jobs:
6567
submodules: true
6668
- uses: actions/setup-go@v5
6769
with:
68-
go-version: '1.22.3'
70+
go-version: '1.23.4'
6971
- run: echo "/home/runner/go/bin" >> $GITHUB_PATH
7072
- run: go install honnef.co/go/tools/cmd/staticcheck@latest
7173
- run: sudo apt-get update -q
@@ -77,29 +79,31 @@ jobs:
7779
- run: go build -tags x11 -v
7880

7981
build_linux_x11_arm:
80-
runs-on: ubuntu-22.04
82+
runs-on: ubuntu-24.04
8183
steps:
8284
- uses: actions/checkout@v4
8385
with:
8486
submodules: true
8587
- uses: actions/setup-go@v5
8688
with:
87-
go-version: '1.22.3'
89+
go-version: '1.23.4'
8890
- run: sudo apt update -q
8991
- run: sudo apt-get install binutils-multiarch
9092
- run: sudo dpkg --add-architecture armhf
93+
- run: sudo rm -rf /etc/apt/sources.list.d/*s
9194
- run: echo "" | sudo tee /etc/apt/sources.list
92-
- run: echo "deb [arch=amd64] http://us.archive.ubuntu.com/ubuntu/ jammy main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
93-
- run: echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports jammy main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
94-
- run: echo "deb [arch=amd64] http://us.archive.ubuntu.com/ubuntu/ jammy-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
95-
- run: echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports jammy-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
96-
- run: echo "deb [arch=amd64] http://us.archive.ubuntu.com/ubuntu/ jammy-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
97-
- run: echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports jammy-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
95+
- run: echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports noble main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
96+
- run: echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports noble-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
97+
- run: echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports noble-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
98+
- run: echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports noble-security main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
99+
- run: echo "deb [arch=amd64] http://us.archive.ubuntu.com/ubuntu/ noble main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
100+
- run: echo "deb [arch=amd64] http://us.archive.ubuntu.com/ubuntu/ noble-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
101+
- run: echo "deb [arch=amd64] http://us.archive.ubuntu.com/ubuntu/ noble-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
102+
- run: echo "deb [arch=amd64] http://us.archive.ubuntu.com/ubuntu/ noble-security main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
98103
- run: sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 6B05F25D762E3157
99104
- run: sudo apt update -q
100-
- run: sudo apt install -f libgl1-mesa-dev:amd64 libxxf86vm-dev:armhf libc6-dev:armhf gcc-arm-linux-gnueabihf libopenal-dev:armhf libgl1-mesa-dev:armhf libxcursor-dev:armhf libxrandr-dev:armhf libxinerama-dev:armhf libxi-dev:armhf -y --allow-unauthenticated
101-
- run: export PKG_CONFIG_PATH=/usr/lib/arm-linux-gnueabihf/pkgconfig/
102-
- run: GOOS=linux GOARCH=arm GOARM=7 CGO_ENABLED=1 CC=arm-linux-gnueabihf-gcc go build -tags x11 -v
105+
- run: sudo apt install -f libxxf86vm-dev:armhf libc6-dev:armhf gcc-arm-linux-gnueabihf libopenal-dev:armhf libgl1-mesa-dev:armhf libxcursor-dev:armhf libxrandr-dev:armhf libxinerama-dev:armhf libxi-dev:armhf -y --allow-unauthenticated
106+
- run: PKG_CONFIG_PATH=/usr/lib/arm-linux-gnueabihf/pkgconfig/ GOOS=linux GOARCH=arm GOARM=7 CGO_ENABLED=1 CC=arm-linux-gnueabihf-gcc go build -tags x11 -v
103107

104108
build_osx:
105109
runs-on: macos-13
@@ -109,7 +113,7 @@ jobs:
109113
submodules: true
110114
- uses: actions/setup-go@v5
111115
with:
112-
go-version: '1.22.3'
116+
go-version: '1.23.4'
113117
- run: echo "/Users/runner/go/bin" >> $GITHUB_PATH
114118
- run: go install honnef.co/go/tools/cmd/staticcheck@latest
115119
- run: brew install openal-soft
@@ -127,7 +131,7 @@ jobs:
127131
submodules: true
128132
- uses: actions/setup-go@v5
129133
with:
130-
go-version: '1.22.3'
134+
go-version: '1.23.4'
131135
- run: echo "/c/Users/runneradmin/go/bin" >> $GITHUB_PATH
132136
- run: go install honnef.co/go/tools/cmd/staticcheck@latest
133137
- run: choco install wget --ignore-checksums

‎Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,15 @@ CORES = atari800 bluemsx swanstation fbneo fceumm gambatte gearsystem genesis_pl
1313

1414
ifeq ($(ARCH), arm)
1515
CORES := $(filter-out swanstation,$(CORES))
16+
CORES := $(filter-out mupen64plus_next,$(CORES))
1617
CORES := $(filter-out mednafen_pcfx,$(CORES))
1718
CORES := $(filter-out mednafen_saturn,$(CORES))
1819
CORES := $(filter-out melonds,$(CORES))
1920
endif
2021

2122
ifeq ($(ARCH), arm64)
2223
CORES := $(filter-out swanstation,$(CORES))
24+
CORES := $(filter-out mupen64plus_next,$(CORES))
2325
CORES := $(filter-out mednafen_wswan,$(CORES))
2426
CORES := $(filter-out handy,$(CORES))
2527
CORES := $(filter-out np2kai,$(CORES))

‎core/core.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ package core
55

66
import (
77
"errors"
8-
"io/ioutil"
98
"log"
109
"os"
1110
"path/filepath"
@@ -155,7 +154,7 @@ func LoadGame(gamePath string) error {
155154
}
156155

157156
if !si.NeedFullpath {
158-
bytes, err := ioutil.ReadFile(gi.Path)
157+
bytes, err := os.ReadFile(gi.Path)
159158
if err != nil {
160159
return err
161160
}

0 commit comments

Comments
 (0)