Skip to content

Commit

Permalink
Add support for M1 (#481)
Browse files Browse the repository at this point in the history
* Add support for M1

* Fix staticcheck

* Use setup-go@v3x

* Some cores are now available

Co-authored-by: Jean-André Santoni <[email protected]>
  • Loading branch information
kivutar and Jean-André Santoni authored Aug 8, 2022
1 parent 374c9d4 commit 098e9a9
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 4 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
7 changes: 7 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 098e9a9

Please sign in to comment.