From 427e40f46e4059d78a83f004743074495702b5af Mon Sep 17 00:00:00 2001 From: Aaron Kling Date: Wed, 5 Feb 2020 11:00:08 -0600 Subject: [PATCH 1/2] libretro: android: Do not build in the standalone UI --- CMakeLists.txt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b92314f113..3a979a0499 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -718,7 +718,7 @@ if(ANDROID) Common/GL/GLInterfaceBase.h ) - set(nativeExtra ${nativeExtra} + set(NativeAppSource ${NativeAppSource} ext/native/base/NativeApp.h android/jni/app-android.cpp android/jni/AndroidEGLContext.cpp @@ -885,7 +885,10 @@ if(ANDROID) elseif(ARM64) set(NativeAppSource ${NativeAppSource} android/jni/Arm64EmitterTest.cpp) endif() - set(nativeExtra ${nativeExtra} ${NativeAppSource}) + + if (NOT LIBRETRO) + set(nativeExtra ${nativeExtra} ${NativeAppSource}) + endif() endif() set(THIN3D_PLATFORMS ext/native/thin3d/thin3d_gl.cpp From 3f7c6467e8fc42b2630e87f43c1bbca044a1f105 Mon Sep 17 00:00:00 2001 From: Aaron Kling Date: Wed, 5 Feb 2020 11:51:47 -0600 Subject: [PATCH 2/2] libretro: android: ios: Add stub camera functionality --- libretro/libretro.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libretro/libretro.cpp b/libretro/libretro.cpp index 11ddce7d24..45185748ca 100644 --- a/libretro/libretro.cpp +++ b/libretro/libretro.cpp @@ -806,3 +806,7 @@ void NativeUpdate() {} void NativeRender(GraphicsContext *graphicsContext) {} void NativeResized() {} bool System_InputBoxGetWString(const wchar_t *title, const std::wstring &defaultvalue, std::wstring &outvalue) { return false; } + +#if PPSSPP_PLATFORM(ANDROID) || PPSSPP_PLATFORM(IOS) +std::vector __cameraGetDeviceList() { return std::vector(); } +#endif