From 098e9a9e565de9a4228469619e880e73f5925455 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Andr=C3=A9=20Santoni?= <jean.andre.santoni@gmail.com>
Date: Mon, 8 Aug 2022 13:00:56 +0200
Subject: [PATCH] Add support for M1 (#481)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add support for M1

* Fix staticcheck

* Use setup-go@v3x

* Some cores are now available

Co-authored-by: Jean-André Santoni <kivutar@m1.home>
---
 .github/workflows/ci.yml | 8 ++++----
 Makefile                 | 7 +++++++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f5593b47..6343a791 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,7 +17,7 @@ jobs:
       - uses: actions/checkout@v2
         with:
           submodules: true
-      - uses: actions/setup-go@v2
+      - uses: actions/setup-go@v3
       - run: echo "/home/runner/go/bin" >> $GITHUB_PATH
       - run: go get golang.org/x/lint/golint
       - run: go get honnef.co/go/tools/cmd/staticcheck
@@ -36,7 +36,7 @@ jobs:
       - uses: actions/checkout@v2
         with:
           submodules: true
-      - uses: actions/setup-go@v2
+      - uses: actions/setup-go@v3
       - run: sudo apt-get install binutils-multiarch
       - run: sudo dpkg --add-architecture armhf
       - run: echo "" | sudo tee /etc/apt/sources.list
@@ -58,7 +58,7 @@ jobs:
       - uses: actions/checkout@v2
         with:
           submodules: true
-      - uses: actions/setup-go@v2
+      - uses: actions/setup-go@v3
       - run: echo "/Users/runner/go/bin" >> $GITHUB_PATH
       - run: go get golang.org/x/lint/golint
       - run: go get honnef.co/go/tools/cmd/staticcheck
@@ -76,7 +76,7 @@ jobs:
       - uses: actions/checkout@v2
         with:
           submodules: true
-      - uses: actions/setup-go@v2
+      - uses: actions/setup-go@v3
       - run: echo "/c/Users/runneradmin/go/bin" >> $GITHUB_PATH
       - run: go get golang.org/x/lint/golint
       - run: go get honnef.co/go/tools/cmd/staticcheck
diff --git a/Makefile b/Makefile
index b815b138..740b23c8 100644
--- a/Makefile
+++ b/Makefile
@@ -12,6 +12,13 @@ ifeq ($(ARCH), arm)
 	CORES := $(filter-out melonds,$(CORES))
 endif
 
+ifeq ($(ARCH), arm64)
+	CORES := $(filter-out swanstation,$(CORES))
+	CORES := $(filter-out mednafen_wswan,$(CORES))
+	CORES := $(filter-out handy,$(CORES))
+	CORES := $(filter-out np2kai,$(CORES))
+endif
+
 ifeq ($(OS), Windows)
 	CORES += mupen64plus_next
 endif