Skip to content

Commit cfbb6dd

Browse files
kivutarkivutar
committed
Merge remote-tracking branch 'origin/master' into kivutar/newdesign
2 parents 8a4c2b6 + 039faf0 commit cfbb6dd

File tree

14 files changed

+1684
-743
lines changed

14 files changed

+1684
-743
lines changed

‎.github/workflows/cd.yml

Lines changed: 92 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,82 @@ defaults:
99
shell: bash
1010

1111
jobs:
12-
build_linux:
12+
build_linux_wayland_x86_64:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- uses: actions/checkout@v2
1616
with:
1717
submodules: true
18-
- uses: actions/setup-go@v2
18+
- uses: actions/setup-go@v3
19+
with:
20+
go-version: '1.19.5'
21+
- run: echo "VERSION=$(echo ${{ github.event.release.tag_name }} | cut -c 2-)" >> $GITHUB_ENV
22+
- run: sudo apt-get update -q
23+
- run: sudo apt-get install libopenal-dev xorg-dev libgl1-mesa-dev libwayland-dev libxkbcommon-dev -y --allow-unauthenticated
24+
- run: go build -tags wayland -v
25+
- run: OS=Linux ARCH=x86_64 DISPDRIVER=wayland VERSION=$VERSION make tar
26+
- run: OS=Linux ARCH=x86_64 DISPDRIVER=wayland VERSION=$VERSION make deb
27+
- run: sha256sum Ludo-Linux-wayland-x86_64-${VERSION}.tar.gz > Ludo-Linux-wayland-x86_64-${VERSION}.tar.gz.sha256
28+
29+
- name: Upload Release Asset
30+
uses: alexellis/upload-assets@0.2.2
31+
env:
32+
GITHUB_TOKEN: ${{ github.token }}
33+
with:
34+
asset_paths: '["./Ludo-*.tar.gz*", "./*.deb"]'
35+
36+
build_linux_wayland_arm:
37+
runs-on: ubuntu-22.04
38+
steps:
39+
- uses: actions/checkout@v2
40+
with:
41+
submodules: true
42+
- uses: actions/setup-go@v3
43+
with:
44+
go-version: '1.19.5'
45+
- run: echo "VERSION=$(echo ${{ github.event.release.tag_name }} | cut -c 2-)" >> $GITHUB_ENV
46+
- run: sudo apt update -q
47+
- run: sudo apt install binutils-multiarch
48+
- run: sudo dpkg --add-architecture armhf
49+
- run: echo "" | sudo tee /etc/apt/sources.list
50+
- run: echo "deb [arch=amd64] http://us.archive.ubuntu.com/ubuntu/ jammy main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
51+
- run: echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports jammy main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
52+
- run: echo "deb [arch=amd64] http://us.archive.ubuntu.com/ubuntu/ jammy-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
53+
- run: echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports jammy-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
54+
- run: echo "deb [arch=amd64] http://us.archive.ubuntu.com/ubuntu/ jammy-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
55+
- run: echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports jammy-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
56+
- run: sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 6B05F25D762E3157
57+
- run: sudo apt update -q
58+
- 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
59+
- run: export PKG_CONFIG_PATH=/usr/lib/arm-linux-gnueabihf/pkgconfig/
60+
- run: GOOS=linux GOARCH=arm GOARM=7 CGO_ENABLED=1 CC=arm-linux-gnueabihf-gcc go build -tags wayland -v
61+
- run: OS=Linux ARCH=arm DISPDRIVER=wayland VERSION=$VERSION make tar
62+
- run: OS=Linux ARCH=arm DISPDRIVER=wayland VERSION=$VERSION make deb
63+
- run: sha256sum Ludo-Linux-wayland-arm-${VERSION}.tar.gz > Ludo-Linux-wayland-arm-${VERSION}.tar.gz.sha256
64+
65+
- name: Upload Release Asset
66+
uses: alexellis/upload-assets@0.2.2
67+
env:
68+
GITHUB_TOKEN: ${{ github.token }}
69+
with:
70+
asset_paths: '["./Ludo-*.tar.gz*", "./*.deb"]'
71+
72+
build_linux_x11_x86_64:
73+
runs-on: ubuntu-latest
74+
steps:
75+
- uses: actions/checkout@v2
76+
with:
77+
submodules: true
78+
- uses: actions/setup-go@v3
79+
with:
80+
go-version: '1.19.5'
1981
- run: echo "VERSION=$(echo ${{ github.event.release.tag_name }} | cut -c 2-)" >> $GITHUB_ENV
2082
- run: sudo apt-get update -q
2183
- run: sudo apt-get install libopenal-dev xorg-dev libgl1-mesa-dev -y --allow-unauthenticated
22-
- run: OS=Linux ARCH=x86_64 VERSION=$VERSION make tar
23-
- run: OS=Linux ARCH=x86_64 VERSION=$VERSION make deb
24-
- run: sha256sum Ludo-Linux-x86_64-${VERSION}.tar.gz > Ludo-Linux-x86_64-${VERSION}.tar.gz.sha256
84+
- run: go build -tags x11 -v
85+
- run: OS=Linux ARCH=x86_64 DISPDRIVER=x11 VERSION=$VERSION make tar
86+
- run: OS=Linux ARCH=x86_64 DISPDRIVER=x11 VERSION=$VERSION make deb
87+
- run: sha256sum Ludo-Linux-x11-x86_64-${VERSION}.tar.gz > Ludo-Linux-x11-x86_64-${VERSION}.tar.gz.sha256
2588

2689
- name: Upload Release Asset
2790
uses: alexellis/upload-assets@0.2.2
@@ -30,31 +93,34 @@ jobs:
3093
with:
3194
asset_paths: '["./Ludo-*.tar.gz*", "./*.deb"]'
3295

33-
build_linux_arm:
34-
runs-on: ubuntu-18.04
96+
build_linux_x11_arm:
97+
runs-on: ubuntu-20.04
3598
steps:
3699
- uses: actions/checkout@v2
37100
with:
38101
submodules: true
39-
- uses: actions/setup-go@v2
102+
- uses: actions/setup-go@v3
103+
with:
104+
go-version: '1.19.5'
40105
- run: echo "VERSION=$(echo ${{ github.event.release.tag_name }} | cut -c 2-)" >> $GITHUB_ENV
106+
- run: sudo apt update -q
41107
- run: sudo apt install binutils-multiarch
42108
- run: sudo dpkg --add-architecture armhf
43109
- run: echo "" | sudo tee /etc/apt/sources.list
44-
- run: echo "deb [arch=amd64] http://us.archive.ubuntu.com/ubuntu/ bionic main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
45-
- run: echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports bionic main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
46-
- run: echo "deb [arch=amd64] http://us.archive.ubuntu.com/ubuntu/ bionic-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
47-
- run: echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports bionic-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
48-
- run: echo "deb [arch=amd64] http://us.archive.ubuntu.com/ubuntu/ bionic-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
49-
- run: echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports bionic-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
110+
- run: echo "deb [arch=amd64] http://us.archive.ubuntu.com/ubuntu/ jammy main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
111+
- run: echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports jammy main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
112+
- run: echo "deb [arch=amd64] http://us.archive.ubuntu.com/ubuntu/ jammy-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
113+
- run: echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports jammy-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
114+
- run: echo "deb [arch=amd64] http://us.archive.ubuntu.com/ubuntu/ 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 jammy-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
50116
- run: sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 6B05F25D762E3157
51117
- run: sudo apt update -q
52-
- 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 -y --allow-unauthenticated
118+
- 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
53119
- run: export PKG_CONFIG_PATH=/usr/lib/arm-linux-gnueabihf/pkgconfig/
54-
- run: GOOS=linux GOARCH=arm GOARM=7 CGO_ENABLED=1 CC=arm-linux-gnueabihf-gcc go build -v
55-
- run: OS=Linux ARCH=arm VERSION=$VERSION make tar
56-
- run: OS=Linux ARCH=arm VERSION=$VERSION make deb
57-
- run: sha256sum Ludo-Linux-arm-${VERSION}.tar.gz > Ludo-Linux-arm-${VERSION}.tar.gz.sha256
120+
- run: GOOS=linux GOARCH=arm GOARM=7 CGO_ENABLED=1 CC=arm-linux-gnueabihf-gcc go build -tags x11 -v
121+
- run: OS=Linux ARCH=arm DISPDRIVER=x11 VERSION=$VERSION make tar
122+
- run: OS=Linux ARCH=arm DISPDRIVER=x11 VERSION=$VERSION make deb
123+
- run: sha256sum Ludo-Linux-x11-arm-${VERSION}.tar.gz > Ludo-Linux-x11-arm-${VERSION}.tar.gz.sha256
58124

59125
- name: Upload Release Asset
60126
uses: alexellis/upload-assets@0.2.2
@@ -69,11 +135,12 @@ jobs:
69135
- uses: actions/checkout@v2
70136
with:
71137
submodules: true
72-
- uses: actions/setup-go@v2
138+
- uses: actions/setup-go@v3
139+
with:
140+
go-version: '1.19.5'
73141
- run: echo "VERSION=$(echo ${{ github.event.release.tag_name }} | cut -c 2-)" >> $GITHUB_ENV
74142
- run: echo "/Users/runner/go/bin" >> $GITHUB_PATH
75-
- run: go get golang.org/x/lint/golint
76-
- run: go get honnef.co/go/tools/cmd/staticcheck
143+
- run: go install honnef.co/go/tools/cmd/staticcheck@latest
77144
- run: brew install openal-soft
78145
- run: echo ${{ secrets.OSXCERT }} | base64 --decode > dev.p12
79146
- run: security create-keychain -p github build.keychain
@@ -102,7 +169,9 @@ jobs:
102169
- uses: actions/checkout@v2
103170
with:
104171
submodules: true
105-
- uses: actions/setup-go@v2
172+
- uses: actions/setup-go@v3
173+
with:
174+
go-version: '1.19.5'
106175
- run: echo "VERSION=$(echo ${{ github.event.release.tag_name }} | cut -c 2-)" >> $GITHUB_ENV
107176
- run: choco install wget make hashdeep --ignore-checksums
108177
- 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: 73 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -11,63 +11,110 @@ defaults:
1111
shell: bash
1212

1313
jobs:
14-
build_linux:
14+
build_linux_wayland_x86_64:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- uses: actions/checkout@v2
1818
with:
1919
submodules: true
20-
- uses: actions/setup-go@v2
20+
- uses: actions/setup-go@v3
21+
with:
22+
go-version: '1.19.5'
2123
- run: echo "/home/runner/go/bin" >> $GITHUB_PATH
22-
- run: go get golang.org/x/lint/golint
23-
- run: go get honnef.co/go/tools/cmd/staticcheck
24+
- run: go install honnef.co/go/tools/cmd/staticcheck@latest
2425
- run: sudo apt-get update -q
25-
- run: sudo apt-get install libopenal-dev xorg-dev libgl1-mesa-dev -y --allow-unauthenticated
26+
- run: sudo apt-get install libopenal-dev xorg-dev libgl1-mesa-dev libwayland-dev libxkbcommon-dev -y --allow-unauthenticated
2627
- run: go get .
2728
- run: xvfb-run -a go test -v -race ./...
2829
- run: go vet ./...
2930
- run: staticcheck ./...
30-
- run: golint -set_exit_status ./...
31-
- run: go build -v
31+
- run: go build -tags wayland -v
32+
33+
build_linux_wayland_arm:
34+
runs-on: ubuntu-20.04
35+
steps:
36+
- uses: actions/checkout@v2
37+
with:
38+
submodules: true
39+
- uses: actions/setup-go@v3
40+
with:
41+
go-version: '1.19.5'
42+
- run: sudo apt update -q
43+
- run: sudo apt install binutils-multiarch
44+
- run: sudo dpkg --add-architecture armhf
45+
- run: echo "" | sudo tee /etc/apt/sources.list
46+
- run: echo "deb [arch=amd64] http://us.archive.ubuntu.com/ubuntu/ jammy main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
47+
- run: echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports jammy main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
48+
- run: echo "deb [arch=amd64] http://us.archive.ubuntu.com/ubuntu/ jammy-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
49+
- run: echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports jammy-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
50+
- run: echo "deb [arch=amd64] http://us.archive.ubuntu.com/ubuntu/ jammy-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
51+
- run: echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports jammy-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
52+
- run: sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 6B05F25D762E3157
53+
- run: sudo apt update -q
54+
- 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
55+
- run: export PKG_CONFIG_PATH=/usr/lib/arm-linux-gnueabihf/pkgconfig/
56+
- run: GOOS=linux GOARCH=arm GOARM=7 CGO_ENABLED=1 CC=arm-linux-gnueabihf-gcc go build -tags wayland -v
3257

33-
build_linux_arm:
34-
runs-on: ubuntu-18.04
58+
build_linux_x11_x86_64:
59+
runs-on: ubuntu-latest
3560
steps:
3661
- uses: actions/checkout@v2
3762
with:
3863
submodules: true
39-
- uses: actions/setup-go@v2
64+
- uses: actions/setup-go@v3
65+
with:
66+
go-version: '1.19.5'
67+
- run: echo "/home/runner/go/bin" >> $GITHUB_PATH
68+
- run: go install honnef.co/go/tools/cmd/staticcheck@latest
69+
- run: sudo apt-get update -q
70+
- run: sudo apt-get install libopenal-dev xorg-dev libgl1-mesa-dev libxkbcommon-dev -y --allow-unauthenticated
71+
- run: go get .
72+
- run: xvfb-run -a go test -v -race ./...
73+
- run: go vet ./...
74+
- run: staticcheck ./...
75+
- run: go build -tags x11 -v
76+
77+
build_linux_x11_arm:
78+
runs-on: ubuntu-22.04
79+
steps:
80+
- uses: actions/checkout@v2
81+
with:
82+
submodules: true
83+
- uses: actions/setup-go@v3
84+
with:
85+
go-version: '1.19.5'
86+
- run: sudo apt update -q
4087
- run: sudo apt-get install binutils-multiarch
4188
- run: sudo dpkg --add-architecture armhf
4289
- run: echo "" | sudo tee /etc/apt/sources.list
43-
- run: echo "deb [arch=amd64] http://us.archive.ubuntu.com/ubuntu/ bionic main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
44-
- run: echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports bionic main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
45-
- run: echo "deb [arch=amd64] http://us.archive.ubuntu.com/ubuntu/ bionic-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
46-
- run: echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports bionic-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
47-
- run: echo "deb [arch=amd64] http://us.archive.ubuntu.com/ubuntu/ bionic-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
48-
- run: echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports bionic-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
90+
- run: echo "deb [arch=amd64] http://us.archive.ubuntu.com/ubuntu/ jammy main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
91+
- run: echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports jammy main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
92+
- run: echo "deb [arch=amd64] http://us.archive.ubuntu.com/ubuntu/ jammy-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
93+
- run: echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports jammy-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
94+
- run: echo "deb [arch=amd64] http://us.archive.ubuntu.com/ubuntu/ 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 jammy-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
4996
- run: sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 6B05F25D762E3157
5097
- run: sudo apt update -q
51-
- 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 -y --allow-unauthenticated
98+
- 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
5299
- run: export PKG_CONFIG_PATH=/usr/lib/arm-linux-gnueabihf/pkgconfig/
53-
- run: GOOS=linux GOARCH=arm GOARM=7 CGO_ENABLED=1 CC=arm-linux-gnueabihf-gcc go build -v
100+
- run: GOOS=linux GOARCH=arm GOARM=7 CGO_ENABLED=1 CC=arm-linux-gnueabihf-gcc go build -tags x11 -v
54101

55102
build_osx:
56103
runs-on: macos-latest
57104
steps:
58105
- uses: actions/checkout@v2
59106
with:
60107
submodules: true
61-
- uses: actions/setup-go@v2
108+
- uses: actions/setup-go@v3
109+
with:
110+
go-version: '1.19.5'
62111
- run: echo "/Users/runner/go/bin" >> $GITHUB_PATH
63-
- run: go get golang.org/x/lint/golint
64-
- run: go get honnef.co/go/tools/cmd/staticcheck
112+
- run: go install honnef.co/go/tools/cmd/staticcheck@latest
65113
- run: brew install openal-soft
66114
- run: go get .
67115
- run: go test -v -race ./...
68116
- run: go vet ./...
69117
- run: staticcheck ./...
70-
- run: golint -set_exit_status ./...
71118
- run: go build -v
72119

73120
build_windows:
@@ -76,10 +123,11 @@ jobs:
76123
- uses: actions/checkout@v2
77124
with:
78125
submodules: true
79-
- uses: actions/setup-go@v2
126+
- uses: actions/setup-go@v3
127+
with:
128+
go-version: '1.19.5'
80129
- run: echo "/c/Users/runneradmin/go/bin" >> $GITHUB_PATH
81-
- run: go get golang.org/x/lint/golint
82-
- run: go get honnef.co/go/tools/cmd/staticcheck
130+
- run: go install honnef.co/go/tools/cmd/staticcheck@latest
83131
- run: choco install wget --ignore-checksums
84132
- run: wget --no-check-certificate http://www.openal-soft.org/openal-binaries/openal-soft-1.21.0-bin.zip
85133
- run: 7z x openal-soft-1.21.0-bin.zip -o/c/
@@ -89,5 +137,4 @@ jobs:
89137
#- run: go test -v -race ./...
90138
#- run: go vet ./...
91139
- run: staticcheck ./...
92-
- run: golint -set_exit_status ./...
93140
- run: go build -v -ldflags '-H=windowsgui'

‎Makefile

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@ APP ?= Ludo
22
ARCH ?= x86_64
33
VERSION ?= dev
44
BUNDLENAME = $(APP)-$(OS)-$(ARCH)-$(VERSION)
5+
DISPDRIVER ?= x11
6+
7+
ifeq ($(OS), Linux)
8+
TAGS = -tags=$(DISPDRIVER)
9+
BUNDLENAME = $(APP)-$(OS)-$(DISPDRIVER)-$(ARCH)-$(VERSION)
10+
endif
511

612
CORES = atari800 bluemsx swanstation fbneo fceumm gambatte gearsystem genesis_plus_gx handy lutro mednafen_ngp mednafen_pce mednafen_pce_fast mednafen_pcfx mednafen_psx mednafen_saturn mednafen_supergrafx mednafen_vb mednafen_wswan mgba melonds np2kai o2em pcsx_rearmed picodrive pokemini prosystem snes9x stella2014 vecx virtualjaguar
713

@@ -12,6 +18,13 @@ ifeq ($(ARCH), arm)
1218
CORES := $(filter-out melonds,$(CORES))
1319
endif
1420

21+
ifeq ($(ARCH), arm64)
22+
CORES := $(filter-out swanstation,$(CORES))
23+
CORES := $(filter-out mednafen_wswan,$(CORES))
24+
CORES := $(filter-out handy,$(CORES))
25+
CORES := $(filter-out np2kai,$(CORES))
26+
endif
27+
1528
ifeq ($(OS), Windows)
1629
CORES += mupen64plus_next
1730
endif
@@ -35,7 +48,7 @@ ifeq ($(OS), Windows)
3548
endif
3649

3750
ludo:
38-
go build
51+
go build $(TAGS)
3952

4053
ludo.exe:
4154
go build -ldflags '-H=windowsgui'
@@ -120,7 +133,7 @@ DEB_ARCH = amd64
120133
ifeq ($(ARCH), arm)
121134
DEB_ARCH = armhf
122135
endif
123-
DEB_ROOT = ludo_$(VERSION)-1_$(DEB_ARCH)
136+
DEB_ROOT = ludo-$(DISPDRIVER)_$(VERSION)-1_$(DEB_ARCH)
124137

125138
deb: ludo $(SOBJS)
126139
mkdir -p $(DEB_ROOT)/DEBIAN

0 commit comments

Comments
 (0)