mirror of
https://github.com/wheremyfoodat/Panda3DS.git
synced 2025-08-25 19:55:40 +00:00
Try fix libretro android again
This commit is contained in:
parent
613aeabd02
commit
d7e343d03b
3 changed files with 8 additions and 10 deletions
|
@ -201,9 +201,7 @@ target_include_directories(boost SYSTEM INTERFACE ${Boost_INCLUDE_DIR})
|
||||||
|
|
||||||
if(ANDROID)
|
if(ANDROID)
|
||||||
set(CRYPTOPP_OPT_DISABLE_ASM ON CACHE BOOL "" FORCE)
|
set(CRYPTOPP_OPT_DISABLE_ASM ON CACHE BOOL "" FORCE)
|
||||||
if(NOT BUILD_LIBRETRO_CORE)
|
target_sources(AlberCore PRIVATE src/jni_driver.cpp)
|
||||||
target_sources(AlberCore PRIVATE src/jni_driver.cpp)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
target_link_libraries(AlberCore PRIVATE EGL log)
|
target_link_libraries(AlberCore PRIVATE EGL log)
|
||||||
endif()
|
endif()
|
||||||
|
|
|
@ -10,11 +10,11 @@
|
||||||
#include "android_utils.hpp"
|
#include "android_utils.hpp"
|
||||||
#include "sdl_sensors.hpp"
|
#include "sdl_sensors.hpp"
|
||||||
|
|
||||||
std::unique_ptr<Emulator> emulator = nullptr;
|
static std::unique_ptr<Emulator> emulator = nullptr;
|
||||||
HIDService* hidService = nullptr;
|
static HIDService* hidService = nullptr;
|
||||||
RendererGL* renderer = nullptr;
|
static RendererGL* renderer = nullptr;
|
||||||
bool romLoaded = false;
|
static bool romLoaded = false;
|
||||||
JavaVM* jvm = nullptr;
|
static JavaVM* jvm = nullptr;
|
||||||
|
|
||||||
jclass alberClass;
|
jclass alberClass;
|
||||||
jmethodID alberClassOpenDocument;
|
jmethodID alberClassOpenDocument;
|
||||||
|
|
|
@ -19,8 +19,8 @@ static std::filesystem::path savePath;
|
||||||
static bool screenTouched = false;
|
static bool screenTouched = false;
|
||||||
static bool usingGLES = false;
|
static bool usingGLES = false;
|
||||||
|
|
||||||
std::unique_ptr<Emulator> emulator;
|
static std::unique_ptr<Emulator> emulator;
|
||||||
RendererGL* renderer;
|
static RendererGL* renderer;
|
||||||
|
|
||||||
std::filesystem::path Emulator::getConfigPath() { return std::filesystem::path(savePath / "config.toml"); }
|
std::filesystem::path Emulator::getConfigPath() { return std::filesystem::path(savePath / "config.toml"); }
|
||||||
std::filesystem::path Emulator::getAppDataRoot() { return std::filesystem::path(savePath / "Emulator Files"); }
|
std::filesystem::path Emulator::getAppDataRoot() { return std::filesystem::path(savePath / "Emulator Files"); }
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue