Skip to content
Permalink
Browse files

Merge pull request #12617 from webgeek1234/master

libretro: Fix Android Builds
  • Loading branch information
hrydgard committed Feb 5, 2020
2 parents dcc2682 + 3f7c646 commit b34ce3990c141723ceeefbbf3e76544a71e3f231
Showing with 9 additions and 2 deletions.
  1. +5 −2 CMakeLists.txt
  2. +4 −0 libretro/libretro.cpp
@@ -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
@@ -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<std::string> __cameraGetDeviceList() { return std::vector<std::string>(); }
#endif

0 comments on commit b34ce39

Please sign in to comment.
You can’t perform that action at this time.