* Added breakpad support for OS X.

src/CMakeLists.linux.txt

@@ -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" )

src/CMakeLists.osx.txt

@@ -5,6 +5,7 @@ SET( OS_SPECIFIC_LINK_LIBRARIES
     ${COREAUDIO_LIBRARY}
     ${COREFOUNDATION_LIBRARY}
 
+    crypto
     SPMediaKeyTap
 
     /System/Library/Frameworks/AppKit.framework

src/CMakeLists.unix.txt

@@ -6,6 +6,15 @@ ADD_DEFINITIONS( -fPIC )
 
 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" )
 ENDIF( APPLE )

src/breakpad/BreakPad.cpp

@@ -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 )
 {
 }
 

src/breakpad/CrashReporter/CMakeLists.txt

@@ -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)

src/main.cpp

@@ -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
 

thirdparty/CMakeLists.txt

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

thirdparty/breakpad/CMakeLists.txt

@@ -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