mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-06 14:16:32 +02:00
Code Issues Releases Wiki Activity

Enable building breakpad on windows

Browse Source
This commit is contained in:
Dominik Schmidt
2011-09-24 01:33:46 +02:00
parent 18d9360ad3
commit e4e9f1bec8
7 changed files with 73 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
thirdparty/CMakeLists.txt vendored
View File

@@ -1,8 +1,6 @@
ADD_SUBDIRECTORY( qxt ) ADD_SUBDIRECTORY( qxt )
ADD_SUBDIRECTORY( liblastfm2 ) ADD_SUBDIRECTORY( liblastfm2 )
ADD_SUBDIRECTORY( breakpad )
IF( APPLE ) IF( APPLE )
ADD_SUBDIRECTORY( SPMediaKeyTap ) ADD_SUBDIRECTORY( SPMediaKeyTap )
ENDIF() ENDIF()
IF( UNIX )
ADD_SUBDIRECTORY( breakpad )
ENDIF()

31
thirdparty/breakpad/CMakeLists.txt vendored
View File

@@ -16,7 +16,6 @@ endif(${CMAKE_BUILD_TYPE} MATCHES "Release")
IF(UNIX) IF(UNIX)
IF(APPLE) IF(APPLE)
SET( breakpadSources SET( breakpadSources
client/mac/crash_generation/crash_generation_client.cc client/mac/crash_generation/crash_generation_client.cc
client/mac/crash_generation/crash_generation_server.cc client/mac/crash_generation/crash_generation_server.cc
@@ -33,17 +32,12 @@ IF(UNIX)
common/mac/macho_utilities.cc common/mac/macho_utilities.cc
common/mac/macho_walker.cc common/mac/macho_walker.cc
common/mac/string_utilities.cc common/mac/string_utilities.cc
common/string_conversion.cc
common/convert_UTF.c
common/md5.c common/md5.c
common/mac/dump_syms.mm common/mac/dump_syms.mm
common/mac/MachIPC.mm common/mac/MachIPC.mm
common/mac/SimpleStringDictionary.mm common/mac/SimpleStringDictionary.mm
client/minidump_file_writer.cc
) )
ELSE(APPLE) ELSE(APPLE)
SET( breakpadSources SET( breakpadSources
client/linux/crash_generation/crash_generation_client.cc client/linux/crash_generation/crash_generation_client.cc
client/linux/crash_generation/crash_generation_server.cc client/linux/crash_generation/crash_generation_server.cc
@@ -62,11 +56,26 @@ IF(UNIX)
common/convert_UTF.c common/convert_UTF.c
client/minidump_file_writer.cc client/minidump_file_writer.cc
) )
ENDIF(APPLE) ENDIF(APPLE)
LIST(APPEND breakpadSources
client/minidump_file_writer.cc
common/convert_UTF.c
common/string_conversion.cc
)
ENDIF(UNIX) ENDIF(UNIX)
include_directories(.) IF(WIN32)
add_definitions(-fPIC) ADD_DEFINITIONS( -DUNICODE )
add_library(tomahawk_breakpad STATIC ${breakpadSources}) SET( breakpadSources
target_link_libraries(tomahawk_breakpad) client/windows/handler/exception_handler.cc
client/windows/crash_generation/crash_generation_client.cc
common/windows/guid_string.cc
)
ENDIF(WIN32)
INCLUDE_DIRECTORIES(.)
ADD_DEFINITIONS( -fPIC )
ADD_LIBRARY( tomahawk_breakpad STATIC ${breakpadSources} )
TARGET_LINK_LIBRARIES( tomahawk_breakpad )

4
thirdparty/breakpad/client/windows/common/ipc_protocol.h vendored
View File

@@ -30,8 +30,8 @@
#ifndef CLIENT_WINDOWS_COMMON_IPC_PROTOCOL_H__ #ifndef CLIENT_WINDOWS_COMMON_IPC_PROTOCOL_H__
#define CLIENT_WINDOWS_COMMON_IPC_PROTOCOL_H__ #define CLIENT_WINDOWS_COMMON_IPC_PROTOCOL_H__
#include <Windows.h> #include <windows.h>
#include <DbgHelp.h> #include <dbghelp.h>
#include <string> #include <string>
#include <utility> #include <utility>
#include "common/windows/string_utils-inl.h" #include "common/windows/string_utils-inl.h"

11
thirdparty/breakpad/client/windows/handler/exception_handler.cc vendored
View File

@@ -27,7 +27,7 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <ObjBase.h> #include <objbase.h>
#include <algorithm> #include <algorithm>
#include <cassert> #include <cassert>
@@ -866,10 +866,11 @@ BOOL CALLBACK ExceptionHandler::MinidumpWriteDumpCallback(
return TRUE; return TRUE;
// Stop receiving cancel callbacks. // Stop receiving cancel callbacks.
case CancelCallback: //FIXME: CancelCallback is missing in our mingw headers currently, but it's present in trunk, so we need to comment this in as soon as mingw is updated in opensuse (domme)
callback_output->CheckCancel = FALSE; // case CancelCallback:
callback_output->Cancel = FALSE; // callback_output->CheckCancel = FALSE;
return TRUE; // callback_output->Cancel = FALSE;
// return TRUE;
} }
// Ignore other callback types. // Ignore other callback types.
return FALSE; return FALSE;

4
thirdparty/breakpad/client/windows/handler/exception_handler.h vendored
View File

@@ -57,8 +57,8 @@
#define CLIENT_WINDOWS_HANDLER_EXCEPTION_HANDLER_H__ #define CLIENT_WINDOWS_HANDLER_EXCEPTION_HANDLER_H__
#include <stdlib.h> #include <stdlib.h>
#include <Windows.h> #include <windows.h>
#include <DbgHelp.h> #include <dbghelp.h>
#include <rpc.h> #include <rpc.h>
#pragma warning( push ) #pragma warning( push )

2
thirdparty/breakpad/common/windows/guid_string.h vendored
View File

@@ -32,7 +32,7 @@
#ifndef COMMON_WINDOWS_GUID_STRING_H__ #ifndef COMMON_WINDOWS_GUID_STRING_H__
#define COMMON_WINDOWS_GUID_STRING_H__ #define COMMON_WINDOWS_GUID_STRING_H__
#include <Guiddef.h> #include <guiddef.h>
#include <string> #include <string>

2
thirdparty/breakpad/google_breakpad/common/breakpad_types.h vendored
View File

@@ -57,7 +57,7 @@ typedef uint64_t u_int64_t;
#else /* !_WIN32 */ #else /* !_WIN32 */
#include <WTypes.h> #include <wtypes.h>
typedef unsigned __int8 u_int8_t; typedef unsigned __int8 u_int8_t;
typedef unsigned __int16 u_int16_t; typedef unsigned __int16 u_int16_t;