Skip to content

Commit 878b902

Browse files
CpasjusteCpasjuste
committed
Merge branch 'dev'
2 parents 9dd1662 + ca15739 commit 878b902

File tree

210 files changed

+45092
-230465
lines changed

Some content is hidden

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

210 files changed

+45092
-230465
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@ jobs:
3333
libconfig-dev libglm-dev libfreetype6-dev libpng-dev libminizip-dev zlib1g-dev \
3434
libvdpau-dev libva-dev libavcodec-dev libavfilter-dev libavformat-dev libavutil-dev \
3535
libpostproc-dev libswresample-dev libswscale-dev libmpv-dev libass-dev libbz2-dev \
36-
libfribidi-dev libphysfs-dev
36+
libfribidi-dev libzip-dev libfuse-dev
3737
3838
# Build pfbneo
3939
- name: Build pfbneo
4040
run: |
4141
cd $GITHUB_WORKSPACE
4242
mkdir cmake-build && cd cmake-build
43-
cmake -G "Unix Makefiles" -DPLATFORM_LINUX=ON -DOPTION_BUILTIN_LIBCONFIG=ON \
43+
cmake -G "Unix Makefiles" -DPLATFORM_LINUX=ON \
4444
-DOPTION_EMU=pfbneo -DCMAKE_BUILD_TYPE=Debug ..
4545
make pfbneo.deps
4646
make -j $(getconf _NPROCESSORS_ONLN) pfbneo

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@ jobs:
3333
libconfig-dev libglm-dev libfreetype6-dev libpng-dev libminizip-dev zlib1g-dev \
3434
libvdpau-dev libva-dev libavcodec-dev libavfilter-dev libavformat-dev libavutil-dev \
3535
libpostproc-dev libswresample-dev libswscale-dev libmpv-dev libass-dev libbz2-dev \
36-
libfribidi-dev libphysfs-dev
36+
libfribidi-dev libzip-dev libfuse-dev
3737
3838
# Build pfbneo
3939
- name: Build pfbneo
4040
run: |
4141
cd $GITHUB_WORKSPACE
4242
mkdir cmake-build && cd cmake-build
43-
cmake -G "Unix Makefiles" -DPLATFORM_LINUX=ON -DOPTION_BUILTIN_LIBCONFIG=ON \
43+
cmake -G "Unix Makefiles" -DPLATFORM_LINUX=ON \
4444
-DOPTION_EMU=pfbneo -DCMAKE_BUILD_TYPE=Release ..
4545
make pfbneo.deps
4646
make -j $(getconf _NPROCESSORS_ONLN) pfbneo_linux_release

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
cd $GITHUB_WORKSPACE
5454
mkdir cmake-build && cd cmake-build
5555
export OPENORBIS=/opt/pacbrew/ps4/openorbis
56-
cmake -G "Unix Makefiles" -DPLATFORM_PS4=ON -DOPTION_MPV_PLAYER=OFF \
56+
cmake -G "Unix Makefiles" -DPLATFORM_PS4=ON \
5757
-DOPTION_EMU=pfbneo -DCMAKE_BUILD_TYPE=Debug ..
5858
make pfbneo.deps
5959
make -j $(getconf _NPROCESSORS_ONLN) pfbneo_pkg

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
cd $GITHUB_WORKSPACE
5454
mkdir cmake-build && cd cmake-build
5555
export OPENORBIS=/opt/pacbrew/ps4/openorbis
56-
cmake -G "Unix Makefiles" -DPLATFORM_PS4=ON -DOPTION_MPV_PLAYER=OFF \
56+
cmake -G "Unix Makefiles" -DPLATFORM_PS4=ON \
5757
-DOPTION_EMU=pfbneo -DCMAKE_BUILD_TYPE=Release ..
5858
make pfbneo.deps
5959
make -j $(getconf _NPROCESSORS_ONLN) pfbneo_ps4_release

‎.github/workflows/pnes-linux-dev.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@ jobs:
3333
libconfig-dev libglm-dev libfreetype6-dev libpng-dev libminizip-dev zlib1g-dev \
3434
libvdpau-dev libva-dev libavcodec-dev libavfilter-dev libavformat-dev libavutil-dev \
3535
libpostproc-dev libswresample-dev libswscale-dev libmpv-dev libass-dev libbz2-dev \
36-
libfribidi-dev libphysfs-dev
36+
libfribidi-dev libzip-dev libfuse-dev
3737
3838
# Build pnes
3939
- name: Build pnes
4040
run: |
4141
cd $GITHUB_WORKSPACE
4242
mkdir cmake-build && cd cmake-build
43-
cmake -G "Unix Makefiles" -DPLATFORM_LINUX=ON -DOPTION_BUILTIN_LIBCONFIG=ON \
43+
cmake -G "Unix Makefiles" -DPLATFORM_LINUX=ON \
4444
-DOPTION_EMU=pnes -DCMAKE_BUILD_TYPE=Debug ..
4545
make -j $(getconf _NPROCESSORS_ONLN) pnes
4646

‎.github/workflows/pnes-linux-release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@ jobs:
3333
libconfig-dev libglm-dev libfreetype6-dev libpng-dev libminizip-dev zlib1g-dev \
3434
libvdpau-dev libva-dev libavcodec-dev libavfilter-dev libavformat-dev libavutil-dev \
3535
libpostproc-dev libswresample-dev libswscale-dev libmpv-dev libass-dev libbz2-dev \
36-
libfribidi-dev libphysfs-dev
36+
libfribidi-dev libzip-dev libfuse-dev
3737
3838
# Build pnes
3939
- name: Build pnes
4040
run: |
4141
cd $GITHUB_WORKSPACE
4242
mkdir cmake-build && cd cmake-build
43-
cmake -G "Unix Makefiles" -DPLATFORM_LINUX=ON -DOPTION_BUILTIN_LIBCONFIG=ON \
43+
cmake -G "Unix Makefiles" -DPLATFORM_LINUX=ON \
4444
-DOPTION_EMU=pnes -DCMAKE_BUILD_TYPE=Release ..
4545
make -j $(getconf _NPROCESSORS_ONLN) pnes_linux_release
4646

‎.github/workflows/pnes-ps4-dev.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,6 @@ jobs:
5353
cd $GITHUB_WORKSPACE
5454
mkdir cmake-build && cd cmake-build
5555
export OPENORBIS=/opt/pacbrew/ps4/openorbis
56-
cmake -G "Unix Makefiles" -DPLATFORM_PS4=ON -DOPTION_MPV_PLAYER=OFF \
56+
cmake -G "Unix Makefiles" -DPLATFORM_PS4=ON \
5757
-DOPTION_EMU=pnes -DCMAKE_BUILD_TYPE=Debug ..
5858
make -j $(getconf _NPROCESSORS_ONLN) pnes_pkg

‎.github/workflows/pnes-ps4-release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,6 @@ jobs:
5353
cd $GITHUB_WORKSPACE
5454
mkdir cmake-build && cd cmake-build
5555
export OPENORBIS=/opt/pacbrew/ps4/openorbis
56-
cmake -G "Unix Makefiles" -DPLATFORM_PS4=ON -DOPTION_MPV_PLAYER=OFF \
56+
cmake -G "Unix Makefiles" -DPLATFORM_PS4=ON \
5757
-DOPTION_EMU=pnes -DCMAKE_BUILD_TYPE=Release ..
5858
make -j $(getconf _NPROCESSORS_ONLN) pnes_ps4_release

‎.github/workflows/psnes-linux-dev.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@ jobs:
3333
libconfig-dev libglm-dev libfreetype6-dev libpng-dev libminizip-dev zlib1g-dev \
3434
libvdpau-dev libva-dev libavcodec-dev libavfilter-dev libavformat-dev libavutil-dev \
3535
libpostproc-dev libswresample-dev libswscale-dev libmpv-dev libass-dev libbz2-dev \
36-
libfribidi-dev libphysfs-dev
36+
libfribidi-dev libzip-dev libfuse-dev
3737
3838
# Build psnes
3939
- name: Build psnes
4040
run: |
4141
cd $GITHUB_WORKSPACE
4242
mkdir cmake-build && cd cmake-build
43-
cmake -G "Unix Makefiles" -DPLATFORM_LINUX=ON -DOPTION_BUILTIN_LIBCONFIG=ON \
43+
cmake -G "Unix Makefiles" -DPLATFORM_LINUX=ON \
4444
-DOPTION_EMU=psnes -DCMAKE_BUILD_TYPE=Debug ..
4545
make -j $(getconf _NPROCESSORS_ONLN) psnes
4646

‎.github/workflows/psnes-linux-release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@ jobs:
3333
libconfig-dev libglm-dev libfreetype6-dev libpng-dev libminizip-dev zlib1g-dev \
3434
libvdpau-dev libva-dev libavcodec-dev libavfilter-dev libavformat-dev libavutil-dev \
3535
libpostproc-dev libswresample-dev libswscale-dev libmpv-dev libass-dev libbz2-dev \
36-
libfribidi-dev libphysfs-dev
36+
libfribidi-dev libzip-dev libfuse-dev
3737
3838
# Build psnes
3939
- name: Build psnes
4040
run: |
4141
cd $GITHUB_WORKSPACE
4242
mkdir cmake-build && cd cmake-build
43-
cmake -G "Unix Makefiles" -DPLATFORM_LINUX=ON -DOPTION_BUILTIN_LIBCONFIG=ON \
43+
cmake -G "Unix Makefiles" -DPLATFORM_LINUX=ON \
4444
-DOPTION_EMU=psnes -DCMAKE_BUILD_TYPE=Release ..
4545
make -j $(getconf _NPROCESSORS_ONLN) psnes_linux_release
4646

0 commit comments

Comments
 (0)