From f865246955ebc932b2e318d34122fbaa897e90f7 Mon Sep 17 00:00:00 2001 From: David Cernat Date: Sun, 20 Nov 2016 18:34:22 +0200 Subject: [PATCH] Fix Breakpad using changes provided by Stanislav in a gist --- apps/openmw-mp/CMakeLists.txt | 2 +- apps/openmw-mp/main.cpp | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/apps/openmw-mp/CMakeLists.txt b/apps/openmw-mp/CMakeLists.txt index 727316dc8..984218550 100644 --- a/apps/openmw-mp/CMakeLists.txt +++ b/apps/openmw-mp/CMakeLists.txt @@ -10,7 +10,7 @@ if(ENABLE_BREAKPAD) set(Breakpad_Library "${CMAKE_SOURCE_DIR}/extern/breakpad/src/client/linux/libbreakpad_client.a") elseif(WIN32) 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) include_directories(${CMAKE_SOURCE_DIR}/extern/breakpad/src ${Breakpad_Headers}) endif(ENABLE_BREAKPAD) diff --git a/apps/openmw-mp/main.cpp b/apps/openmw-mp/main.cpp index aae96338b..ab2fd0fe2 100644 --- a/apps/openmw-mp/main.cpp +++ b/apps/openmw-mp/main.cpp @@ -54,7 +54,7 @@ void printVersion(string version, int protocol) #ifdef ENABLE_BREAKPAD google_breakpad::ExceptionHandler *pHandler = 0; #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) bool DumpCallback(const google_breakpad::MinidumpDescriptor &md, void *context, bool success) #endif @@ -67,13 +67,11 @@ void breakpad(std::string pathToDump) { #ifdef _WIN32 pHandler = new google_breakpad::ExceptionHandler( - pathToDump, + L"dumps\\", /*FilterCallback*/ 0, DumpCallback, - /*context*/ - google_breakpad::ExceptionHandler::HANDLER_ALL, - true - ); + 0, + google_breakpad::ExceptionHandler::HANDLER_ALL); #else google_breakpad::MinidumpDescriptor md(pathToDump); pHandler = new google_breakpad::ExceptionHandler(