mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-21 20:11:34 +00:00
Code Issues Releases Wiki Activity

Merge branch 'crash_catcher_android' into 'master'

Browse source 
Make crashCatcherInstall no-op for Android

See merge request OpenMW/openmw!3854
This commit is contained in:
psi29a 2024-02-12 14:10:18 +00:00
commit 2f15bdc192
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
components/crashcatcher/crashcatcher.cpp
View file

@ -583,8 +583,6 @@ static bool isDebuggerPresent()
void crashCatcherInstall(int argc, char** argv, const std::filesystem::path& crashLogPath) void crashCatcherInstall(int argc, char** argv, const std::filesystem::path& crashLogPath)
{ {
#if (defined(__APPLE__) || (defined(__linux) && !defined(ANDROID)) || (defined(__unix) && !defined(ANDROID)) \
|| defined(__posix))
if (argc == 2 && strcmp(argv[1], crash_switch) == 0) if (argc == 2 && strcmp(argv[1], crash_switch) == 0)
handleCrash(Files::pathToUnicodeString(crashLogPath).c_str()); handleCrash(Files::pathToUnicodeString(crashLogPath).c_str());
@ -595,5 +593,4 @@ void crashCatcherInstall(int argc, char** argv, const std::filesystem::path& cra
Log(Debug::Info) << "Crash handler installed"; Log(Debug::Info) << "Crash handler installed";
else else
Log(Debug::Warning) << "Installing crash handler failed"; Log(Debug::Warning) << "Installing crash handler failed";
#endif
} }

5
components/crashcatcher/crashcatcher.hpp
View file

@ -3,6 +3,11 @@
#include <filesystem> #include <filesystem>
#if (defined(__APPLE__) || (defined(__linux) && !defined(ANDROID)) || (defined(__unix) && !defined(ANDROID)) \
|| defined(__posix))
void crashCatcherInstall(int argc, char** argv, const std::filesystem::path& crashLogPath); void crashCatcherInstall(int argc, char** argv, const std::filesystem::path& crashLogPath);
#else
inline void crashCatcherInstall(int /*argc*/, char** /*argv*/, const std::filesystem::path& /*crashLogPath*/) {}
#endif
#endif #endif