* 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

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

src/CMakeLists.unix.txt

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

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