preserve-emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-07-11 01:25:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12787 from webgeek1234/libretro

Browse Source 
libretro: Fix Android builds
This commit is contained in:
Unknown W. Brackets
2020-04-03 12:12:15 -04:00
committed by GitHub
parent 9cd8d216d8 a7f2415469
commit 66471feeb2
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ext/native/gfx_es2/draw_text.cpp
+3 -1
View File
@@ -81,7 +81,9 @@ void TextDrawer::DrawStringBitmapRect(std::vector<uint8_t> &bitmapData, TextStri
TextDrawer *TextDrawer::Create(Draw::DrawContext *draw) {
TextDrawer *drawer = nullptr;
#if defined(_WIN32) && !PPSSPP_PLATFORM(UWP)
#if defined(__LIBRETRO__)
// No text drawer
#elif defined(_WIN32) && !PPSSPP_PLATFORM(UWP)
drawer = new TextDrawerWin32(draw);
#elif PPSSPP_PLATFORM(UWP)
drawer = new TextDrawerUWP(draw);
ext/native/gfx_es2/draw_text_android.cpp
+1 -1
View File
@@ -11,7 +11,7 @@
#include "android/jni/app-android.h"
#include <assert.h>
#if PPSSPP_PLATFORM(ANDROID)
#if PPSSPP_PLATFORM(ANDROID) && !defined(__LIBRETRO__)
#include <jni.h>
libretro/libretro.cpp
+4
View File
@@ -809,4 +809,8 @@ bool System_InputBoxGetWString(const wchar_t *title, const std::wstring &default
#if PPSSPP_PLATFORM(ANDROID) || PPSSPP_PLATFORM(IOS)
std::vector<std::string> __cameraGetDeviceList() { return std::vector<std::string>(); }
void System_InputBoxGetString(const std::string &title, const std::string &defaultValue, std::function<void(bool, const std::string &)> cb) {
cb(false, "");
}
#endif