diff --git a/.github/workflows/vita-dev.yml b/.github/workflows/vita-dev.yml index fb452dc7..405601f7 100644 --- a/.github/workflows/vita-dev.yml +++ b/.github/workflows/vita-dev.yml @@ -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: | diff --git a/.github/workflows/vita-release.yml b/.github/workflows/vita-release.yml index db7c0e49..58d9594b 100644 --- a/.github/workflows/vita-release.yml +++ b/.github/workflows/vita-release.yml @@ -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: | diff --git a/CMakeLists.txt b/CMakeLists.txt index 9cc41a7e..7ec2040c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/src/cores/pgba/CMakeLists.txt b/src/cores/pgba/CMakeLists.txt index d613d977..39ff091b 100644 --- a/src/cores/pgba/CMakeLists.txt +++ b/src/cores/pgba/CMakeLists.txt @@ -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 diff --git a/src/skeleton/ui_main.cpp b/src/skeleton/ui_main.cpp index f0828e59..621d12ab 100644 --- a/src/skeleton/ui_main.cpp +++ b/src/skeleton/ui_main.cpp @@ -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