AnarchistGamers/TES3MP
1
0
Fork 0
mirror of https://github.com/TES3MP/TES3MP.git synced 2025-09-28 07:32:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix Breakpad using changes provided by Stanislav in a gist

Browse Source
This commit is contained in:
David Cernat 2016-11-20 18:34:22 +02:00
parent 456aee65d9
commit f865246955
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/openmw-mp/CMakeLists.txt
View File

@ -10,7 +10,7 @@ if(ENABLE_BREAKPAD)
set(Breakpad_Library "${CMAKE_SOURCE_DIR}/extern/breakpad/src/client/linux/libbreakpad_client.a") set(Breakpad_Library "${CMAKE_SOURCE_DIR}/extern/breakpad/src/client/linux/libbreakpad_client.a")
elseif(WIN32) elseif(WIN32)
set(Breakpad_Headers "${CMAKE_SOURCE_DIR}/extern/breakpad/src/client/windows") set(Breakpad_Headers "${CMAKE_SOURCE_DIR}/extern/breakpad/src/client/windows")
set(Breakpad_Library "${CMAKE_SOURCE_DIR}/extern/breakpad/src/client/windows/libbreakpad_client.a") set(Breakpad_Library "-lbreakpad_client")
endif (UNIX) endif (UNIX)
include_directories(${CMAKE_SOURCE_DIR}/extern/breakpad/src ${Breakpad_Headers}) include_directories(${CMAKE_SOURCE_DIR}/extern/breakpad/src ${Breakpad_Headers})
endif(ENABLE_BREAKPAD) endif(ENABLE_BREAKPAD)

10
apps/openmw-mp/main.cpp
View File

@ -54,7 +54,7 @@ void printVersion(string version, int protocol)
#ifdef ENABLE_BREAKPAD #ifdef ENABLE_BREAKPAD
google_breakpad::ExceptionHandler *pHandler = 0; google_breakpad::ExceptionHandler *pHandler = 0;
#if defined(_WIN32) #if defined(_WIN32)
bool DumpCallback(const char* _dump_dir, const char* _minidump_id, void* context, EXCEPTION_POINTERS* exinfo, MDRawAssertionInfo* assertion, bool success) bool DumpCallback(const wchar_t* _dump_dir,const wchar_t* _minidump_id,void* context,EXCEPTION_POINTERS* exinfo,MDRawAssertionInfo* assertion,bool success)
#elif defined(__linux) #elif defined(__linux)
bool DumpCallback(const google_breakpad::MinidumpDescriptor &md, void *context, bool success) bool DumpCallback(const google_breakpad::MinidumpDescriptor &md, void *context, bool success)
#endif #endif
@ -67,13 +67,11 @@ void breakpad(std::string pathToDump)
{ {
#ifdef _WIN32 #ifdef _WIN32
pHandler = new google_breakpad::ExceptionHandler( pHandler = new google_breakpad::ExceptionHandler(
pathToDump, L"dumps\\",
/*FilterCallback*/ 0, /*FilterCallback*/ 0,
DumpCallback, DumpCallback,
/*context*/ 0,
google_breakpad::ExceptionHandler::HANDLER_ALL, google_breakpad::ExceptionHandler::HANDLER_ALL);
true
);
#else #else
google_breakpad::MinidumpDescriptor md(pathToDump); google_breakpad::MinidumpDescriptor md(pathToDump);
pHandler = new google_breakpad::ExceptionHandler( pHandler = new google_breakpad::ExceptionHandler(