mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-01-17 22:38:33 +01:00
Code Issues Releases Wiki Activity

* Added breakpad support for OS X.

Browse Source
This commit is contained in:
Christian Muehlhaeuser 2011-09-15 10:05:53 +02:00
parent b1a135fff9
commit b741d163a1
8 changed files with 45 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/CMakeLists.linux.txt
View File

@ -1,11 +1,6 @@
SET( OS_SPECIFIC_LINK_LIBRARIES
${OS_SPECIFIC_LINK_LIBRARIES}
tomahawklib
tomahawk_breakpad
)
SET( tomahawkSources ${tomahawkSources}
breakpad/BreakPad.cpp
)
FILE( GLOB _icons "${CMAKE_SOURCE_DIR}/data/icons/tomahawk-icon-*.png" )

3
src/CMakeLists.osx.txt
View File

@ -1,10 +1,11 @@
SET( TOMAHAWK_LIBRARIES tomahawklib )
SET( TOMAHAWK_LIBRARIES tomahawklib )
SET( OS_SPECIFIC_LINK_LIBRARIES
${OS_SPECIFIC_LINK_LIBRARIES}
${COREAUDIO_LIBRARY}
${COREFOUNDATION_LIBRARY}
crypto
SPMediaKeyTap
/System/Library/Frameworks/AppKit.framework

11
src/CMakeLists.unix.txt
View File

@ -4,7 +4,16 @@ ADD_DEFINITIONS( -g )
ADD_DEFINITIONS( -fno-operator-names )
ADD_DEFINITIONS( -fPIC )
SET( QXTWEB_LIBRARIES qxtweb-standalone )
SET( QXTWEB_LIBRARIES qxtweb-standalone )
SET( OS_SPECIFIC_LINK_LIBRARIES
${OS_SPECIFIC_LINK_LIBRARIES}
tomahawk_breakpad
)
SET( tomahawkSources ${tomahawkSources}
breakpad/BreakPad.cpp
)
IF( APPLE )
INCLUDE( "CMakeLists.osx.txt" )

2
src/breakpad/BreakPad.cpp
View File

@ -60,7 +60,7 @@ LaunchUploader( const char* dump_dir, const char* minidump_id, void* that, bool
BreakPad::BreakPad( const QString& path )
: google_breakpad::ExceptionHandler( path.toStdString(), 0, LaunchUploader, this, true )
: google_breakpad::ExceptionHandler( path.toStdString(), 0, LaunchUploader, this, true, 0 )
{
}

5
src/breakpad/CrashReporter/CMakeLists.txt
View File

@ -18,3 +18,8 @@ ADD_DEFINITIONS( ${QT_DEFINITIONS} )
ADD_EXECUTABLE( CrashReporter ${crashreporter_SOURCES} ${crashreporter_HEADERS_MOC} ${crashreporter_UI_HEADERS} ${crashreporter_RC_RCC} )
TARGET_LINK_LIBRARIES( CrashReporter ${QT_LIBRARIES} )
IF(APPLE)
FILE(COPY ${CMAKE_BINARY_DIR}/CrashReporter
DESTINATION "${CMAKE_BINARY_DIR}/tomahawk.app/Contents/MacOS")
ENDIF(APPLE)

4
src/main.cpp
View File

@ -21,7 +21,7 @@
#include "thirdparty/kdsingleapplicationguard/kdsingleapplicationguard.h"
#include <QTranslator>
#ifdef Q_OS_LINUX
#ifndef Q_WS_WIN
#include "breakpad/BreakPad.h"
#endif
@ -35,7 +35,7 @@
int
main( int argc, char *argv[] )
{
#ifdef Q_OS_LINUX
#ifndef Q_WS_WIN
new BreakPad( "/tmp" );
#endif

2
thirdparty/CMakeLists.txt vendored
View File

@ -3,6 +3,6 @@ ADD_SUBDIRECTORY( liblastfm2 )
IF( APPLE )
ADD_SUBDIRECTORY( SPMediaKeyTap )
ENDIF()
IF( UNIX AND NOT APPLE )
IF( UNIX )
ADD_SUBDIRECTORY( breakpad )
ENDIF()

25
thirdparty/breakpad/CMakeLists.txt vendored
View File

@ -15,13 +15,36 @@ endif(${CMAKE_BUILD_TYPE} MATCHES "Release")
IF(UNIX)
IF(APPLE)
SET( breakpadSources
client/mac/crash_generation/crash_generation_client.cc
client/mac/crash_generation/crash_generation_server.cc
client/mac/handler/breakpad_nlist_64.cc
client/mac/handler/dynamic_images.cc
client/mac/handler/exception_handler.cc
client/mac/handler/minidump_generator.cc
client/mac/handler/protected_memory_allocator.cc
# client/mac/Framework/Breakpad.mm
# client/mac/Framework/OnDemandServer.mm
common/mac/file_id.cc
common/mac/macho_id.cc
common/mac/macho_reader.cc
common/mac/macho_utilities.cc
common/mac/macho_walker.cc
common/mac/string_utilities.cc
common/string_conversion.cc
common/convert_UTF.c
common/md5.c
common/mac/dump_syms.mm
common/mac/MachIPC.mm
common/mac/SimpleStringDictionary.mm
client/minidump_file_writer.cc
)
ELSE(APPLE)
SET( breakpadSources
client/linux/crash_generation/crash_generation_client.cc
client/linux/crash_generation/crash_generation_server.cc
# client/linux/sender/google_crash_report_sender.cc
client/linux/minidump_writer/minidump_writer.cc
client/linux/minidump_writer/linux_dumper.cc
client/linux/handler/exception_handler.cc