Skip to content

merge dev #349

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Cpasjuste merged 5 commits into from
Aug 17, 2026
Merged

merge dev #349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6f6e653
switch: fix build
Cpasjuste Feb 15, 2026
65a2999
pemu: bump to 7.2
Cpasjuste Apr 18, 2026
287cf0d
vita: fix cmake build (unix > ninja)
Cpasjuste Apr 18, 2026
5118831
vita: fix cmake build (try 2)
Cpasjuste Apr 18, 2026
3164bdc
vita: fix cmake build (try 3)
Cpasjuste Apr 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/vita-dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ jobs:
export VITASDK=/usr/local/vitasdk
mkdir cmake-build && cd cmake-build
cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Debug .. \
-DPLATFORM_VITA=ON -DOPTION_MPV_PLAYER=OFF
-DPLATFORM_VITA=ON -DOPTION_MPV_PLAYER=OFF \
-DOPTION_BUILTIN_LIBCONFIG=ON

- name: Build pfbneo
run: |
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/vita-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ jobs:
export VITASDK=/usr/local/vitasdk
mkdir cmake-build && cd cmake-build
cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release .. \
-DPLATFORM_VITA=ON -DOPTION_MPV_PLAYER=OFF
-DPLATFORM_VITA=ON -DOPTION_MPV_PLAYER=OFF \
-DOPTION_BUILTIN_LIBCONFIG=ON

- name: Build pfbneo
run: |
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ add_subdirectory(external/sscrap)
project(pemu)
set(PROJECT_AUTHOR cpasjuste)
set(VERSION_MAJOR 7)
set(VERSION_MINOR 1)
set(VERSION_MINOR 2)

# pemu (ui)
add_subdirectory(src/skeleton)
Expand Down
1 change: 1 addition & 0 deletions src/cores/pgba/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ elseif (PLATFORM_PS4)
set(PS4_PKG_TITLE_ID "PGBA00001")
set(PS4_PKG_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}")
list(APPEND GBA_CFLAGS -DHAVE_SYS_PARAM_H)
list(APPEND PGBA_CFLAGS -DNDEBUG) # fix log.h:66:18: error: expected ')' (printf redefine in c2d.h)
elseif (PLATFORM_SWITCH)
#####################
# SWITCH PLATFORM
Expand Down
2 changes: 1 addition & 1 deletion src/skeleton/ui_main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include "ui_main.h"

#ifdef __SWITCH__
UiMain::UiMain(c2d::Io *io, const Vector2f &size) : C2DRenderer({1280, 720}) {
UiMain::UiMain(const Vector2f &size) : C2DRenderer({1280, 720}) {
#else
UiMain::UiMain(const Vector2f &size) : C2DRenderer(size) {
#endif
Expand Down
Loading