From 41dfe05de286ef87ba53eaa0d0e674e83cd81c7b Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sun, 5 Apr 2020 15:23:13 -0700 Subject: [PATCH] Headless: Fix compile on Android. --- Core/Util/PPGeDraw.cpp | 3 ++- headless/Headless.cpp | 13 +++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/Core/Util/PPGeDraw.cpp b/Core/Util/PPGeDraw.cpp index f20938d3f4..895a1b7425 100644 --- a/Core/Util/PPGeDraw.cpp +++ b/Core/Util/PPGeDraw.cpp @@ -266,7 +266,8 @@ void __PPGeInit() { free(imageData[0]); // We can't create it here, because Android needs it on the right thread. - textDrawerInited = false; + // Avoid creating ever on headless just to be safe. + textDrawerInited = PSP_CoreParameter().headLess; textDrawer = nullptr; textDrawerImages.clear(); diff --git a/headless/Headless.cpp b/headless/Headless.cpp index 52b0e20900..e4bf04fa66 100644 --- a/headless/Headless.cpp +++ b/headless/Headless.cpp @@ -5,6 +5,9 @@ #include #include #include +#if defined(ANDROID) +#include +#endif #include "file/zip_read.h" #include "profiler/profiler.h" @@ -38,6 +41,16 @@ #include "android/android-ndk-profiler/prof.h" #endif +#if defined(ANDROID) +JNIEnv *getEnv() { + return nullptr; +} + +jclass findClass(const char *name) { + return nullptr; +} +#endif + class PrintfLogger : public LogListener { public: void Log(const LogMessage &message) {