Skip to content

Commit 548f717

Browse files
committed
Merge branch 'dev'
2 parents 3c01c79 + e43d89c commit 548f717

File tree

713 files changed

+129010
-94828
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

713 files changed

+129010
-94828
lines changed

.github/workflows/linux-dev.yml

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
name: linux-dev
2+
3+
on:
4+
push:
5+
branches: [ dev ]
6+
workflow_dispatch:
7+
8+
jobs:
9+
10+
build-linux-dev:
11+
runs-on: ubuntu-latest
12+
13+
steps:
14+
- uses: actions/checkout@v2
15+
with:
16+
submodules: recursive
17+
18+
- name: Install build dependencies
19+
run: |
20+
sudo apt -yq update
21+
sudo apt -yq install \
22+
git zip build-essential cmake xxd \
23+
liblzma-dev libsdl2-dev libconfig-dev libcurl4-openssl-dev libtinyxml2-dev \
24+
libconfig-dev libglm-dev libfreetype6-dev libpng-dev libminizip-dev zlib1g-dev \
25+
libvdpau-dev libva-dev libavcodec-dev libavfilter-dev libavformat-dev libavutil-dev \
26+
libpostproc-dev libswresample-dev libswscale-dev libmpv-dev libass-dev libbz2-dev \
27+
libfribidi-dev libzip-dev libfuse-dev
28+
29+
- name: Build pfbneo
30+
run: |
31+
cd $GITHUB_WORKSPACE
32+
mkdir cmake-build-pfbneo && cd cmake-build-pfbneo
33+
cmake -G "Unix Makefiles" -DPLATFORM_LINUX=ON -DOPTION_EMU=pfbneo -DCMAKE_BUILD_TYPE=Debug ..
34+
make pfbneo.deps
35+
make -j $(getconf _NPROCESSORS_ONLN) pfbneo
36+
37+
- name: Build pgen
38+
run: |
39+
cd $GITHUB_WORKSPACE
40+
mkdir cmake-build-pgen && cd cmake-build-pgen
41+
cmake -G "Unix Makefiles" -DPLATFORM_LINUX=ON -DOPTION_EMU=pgen -DCMAKE_BUILD_TYPE=Debug ..
42+
make -j $(getconf _NPROCESSORS_ONLN) pgen
43+
44+
- name: Build pnes
45+
run: |
46+
cd $GITHUB_WORKSPACE
47+
mkdir cmake-build-pnes && cd cmake-build-pnes
48+
cmake -G "Unix Makefiles" -DPLATFORM_LINUX=ON -DOPTION_EMU=pnes -DCMAKE_BUILD_TYPE=Debug ..
49+
make -j $(getconf _NPROCESSORS_ONLN) pnes
50+
51+
- name: Build psnes
52+
run: |
53+
cd $GITHUB_WORKSPACE
54+
mkdir cmake-build-psnes && cd cmake-build-psnes
55+
cmake -G "Unix Makefiles" -DPLATFORM_LINUX=ON -DOPTION_EMU=psnes -DCMAKE_BUILD_TYPE=Debug ..
56+
make -j $(getconf _NPROCESSORS_ONLN) psnes
Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
name: linux-release
2+
3+
on:
4+
push:
5+
tags:
6+
- "v*.*"
7+
8+
jobs:
9+
10+
build-linux-release:
11+
runs-on: ubuntu-latest
12+
13+
steps:
14+
- uses: actions/checkout@v2
15+
with:
16+
submodules: recursive
17+
18+
- name: Install build dependencies
19+
run: |
20+
sudo apt -yq update
21+
sudo apt -yq install \
22+
git zip build-essential cmake xxd \
23+
liblzma-dev libsdl2-dev libconfig-dev libcurl4-openssl-dev libtinyxml2-dev \
24+
libconfig-dev libglm-dev libfreetype6-dev libpng-dev libminizip-dev zlib1g-dev \
25+
libvdpau-dev libva-dev libavcodec-dev libavfilter-dev libavformat-dev libavutil-dev \
26+
libpostproc-dev libswresample-dev libswscale-dev libmpv-dev libass-dev libbz2-dev \
27+
libfribidi-dev libzip-dev libfuse-dev
28+
29+
- name: Build pfbneo
30+
run: |
31+
mkdir cmake-build-pfbneo && cd cmake-build-pfbneo
32+
cmake -G "Unix Makefiles" -DPLATFORM_LINUX=ON -DOPTION_EMU=pfbneo -DCMAKE_BUILD_TYPE=Release ..
33+
make pfbneo.deps
34+
make -j $(getconf _NPROCESSORS_ONLN) pfbneo
35+
mv pfbneo/pfbneo $GITHUB_WORKSPACE/pfbneo-linux
36+
37+
- name: Build pgen
38+
run: |
39+
mkdir cmake-build-pgen && cd cmake-build-pgen
40+
cmake -G "Unix Makefiles" -DPLATFORM_LINUX=ON -DOPTION_EMU=pgen -DCMAKE_BUILD_TYPE=Release ..
41+
make -j $(getconf _NPROCESSORS_ONLN) pgen
42+
mv pgen/pgen $GITHUB_WORKSPACE/pgen-linux
43+
44+
- name: Build pnes
45+
run: |
46+
mkdir cmake-build-pnes && cd cmake-build-pnes
47+
cmake -G "Unix Makefiles" -DPLATFORM_LINUX=ON -DOPTION_EMU=pnes -DCMAKE_BUILD_TYPE=Release ..
48+
make -j $(getconf _NPROCESSORS_ONLN) pnes
49+
mv pnes/pnes $GITHUB_WORKSPACE/pnes-linux
50+
51+
- name: Build psnes
52+
run: |
53+
mkdir cmake-build-psnes && cd cmake-build-psnes
54+
cmake -G "Unix Makefiles" -DPLATFORM_LINUX=ON -DOPTION_EMU=psnes -DCMAKE_BUILD_TYPE=Release ..
55+
make -j $(getconf _NPROCESSORS_ONLN) psnes
56+
mv psnes/psnes $GITHUB_WORKSPACE/psnes-linux
57+
58+
- name: Release
59+
uses: softprops/action-gh-release@v1
60+
if: startsWith(github.ref, 'refs/tags/')
61+
with:
62+
files: '*-linux'
63+
token: ${{ secrets.RELEASE_TOKEN }}

.github/workflows/pfbneo-linux-dev.yml

Lines changed: 0 additions & 47 deletions
This file was deleted.

.github/workflows/pfbneo-linux-release.yml

Lines changed: 0 additions & 47 deletions
This file was deleted.

.github/workflows/pfbneo-ps4-dev.yml

Lines changed: 0 additions & 49 deletions
This file was deleted.

.github/workflows/pfbneo-ps4-release.yml

Lines changed: 0 additions & 49 deletions
This file was deleted.

.github/workflows/pfbneo-switch-dev.yml

Lines changed: 0 additions & 46 deletions
This file was deleted.

0 commit comments

Comments
 (0)