Diamond75/Panda3DS
1
0
Fork 0
mirror of https://github.com/wheremyfoodat/Panda3DS.git synced 2025-04-06 22:25:41 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #314 from hydra-emu/wrage-4

Browse source 
Fix android app data path
This commit is contained in:
Paris 2023-10-18 01:10:35 +03:00 • committed by GitHub
commit afa2bbf02b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/emulator.cpp
View file

@ -449,13 +449,20 @@ bool Emulator::loadROM(const std::filesystem::path& path) {
memory.loadedCXI = std::nullopt; memory.loadedCXI = std::nullopt;
memory.loaded3DSX = std::nullopt; memory.loaded3DSX = std::nullopt;
// Get path for saving files (AppData on Windows, /home/user/.local/share/ApplcationName on Linux, etc) // Get path for saving files (AppData on Windows, /home/user/.local/share/ApplicationName on Linux, etc)
// Inside that path, we be use a game-specific folder as well. Eg if we were loading a ROM called PenguinDemo.3ds, the savedata would be in // Inside that path, we be use a game-specific folder as well. Eg if we were loading a ROM called PenguinDemo.3ds, the savedata would be in
// %APPDATA%/Alber/PenguinDemo/SaveData on Windows, and so on. We do this because games save data in their own filesystem on the cart. // %APPDATA%/Alber/PenguinDemo/SaveData on Windows, and so on. We do this because games save data in their own filesystem on the cart.
// If the portable build setting is enabled, then those saves go in the executable directory instead // If the portable build setting is enabled, then those saves go in the executable directory instead
char* appData;
std::filesystem::path appDataPath; std::filesystem::path appDataPath;
#ifdef __ANDROID__
// SDL_GetPrefPath fails to get the path due to no JNI environment
std::ifstream cmdline("/proc/self/cmdline");
std::string applicationName;
std::getline(cmdline, applicationName, '\0');
appDataPath = std::filesystem::path("/data") / "data" / applicationName / "files";
#else
char* appData;
if (!config.usePortableBuild) { if (!config.usePortableBuild) {
appData = SDL_GetPrefPath(nullptr, "Alber"); appData = SDL_GetPrefPath(nullptr, "Alber");
appDataPath = std::filesystem::path(appData); appDataPath = std::filesystem::path(appData);
@ -463,11 +470,12 @@ bool Emulator::loadROM(const std::filesystem::path& path) {
appData = SDL_GetBasePath(); appData = SDL_GetBasePath();
appDataPath = std::filesystem::path(appData) / "Emulator Files"; appDataPath = std::filesystem::path(appData) / "Emulator Files";
} }
SDL_free(appData);
#endif
const std::filesystem::path dataPath = appDataPath / path.filename().stem(); const std::filesystem::path dataPath = appDataPath / path.filename().stem();
const std::filesystem::path aesKeysPath = appDataPath / "sysdata" / "aes_keys.txt"; const std::filesystem::path aesKeysPath = appDataPath / "sysdata" / "aes_keys.txt";
IOFile::setAppDataDir(dataPath); IOFile::setAppDataDir(dataPath);
SDL_free(appData);
// Open the text file containing our AES keys if it exists. We use the std::filesystem::exists overload that takes an error code param to // Open the text file containing our AES keys if it exists. We use the std::filesystem::exists overload that takes an error code param to
// avoid the call throwing exceptions // avoid the call throwing exceptions

5
third_party/cryptopp/CMakeLists.txt vendored
View file

@ -443,7 +443,8 @@ find_package(Threads)
target_link_libraries(cryptopp PRIVATE ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries(cryptopp PRIVATE ${CMAKE_THREAD_LIBS_INIT})
if(ANDROID) if(ANDROID)
include(AndroidNdkModules) include_directories(${ANDROID_NDK}/sources/android/cpufeatures)
android_ndk_import_module_cpufeatures() add_library(cpufeatures ${ANDROID_NDK}/sources/android/cpufeatures/cpu-features.c)
target_link_libraries(cpufeatures dl)
target_link_libraries(cryptopp PRIVATE cpufeatures) target_link_libraries(cryptopp PRIVATE cpufeatures)
endif() endif()