From 4cf82c9e10e1301ddfc47e5ac23e22b96ffb0bf3 Mon Sep 17 00:00:00 2001 From: Marcus Eggenberger Date: Sun, 17 Aug 2008 22:39:12 +0200 Subject: [PATCH] make quassel compile in deploy mode again (mac os x only) --- CMakeLists.txt | 1 + src/common/main.cpp | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c93fa633..288f7abc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -61,6 +61,7 @@ if(APPLE AND DEPLOY) set(CMAKE_OSX_ARCHITECTURES "i386;ppc") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.4") set(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.4u.sdk/") + add_definitions(-DMAC_10_4_SDK) endif(APPLE AND DEPLOY) # Enable mostly b0rked stuff (new ChatView), do not enable this unless you know what you do... diff --git a/src/common/main.cpp b/src/common/main.cpp index 8c62ac0a..5ce1ac9c 100644 --- a/src/common/main.cpp +++ b/src/common/main.cpp @@ -54,7 +54,7 @@ #include -#ifndef Q_OS_WIN32 +#if not defined(Q_OS_WIN32) && not defined(MAC_10_4_SDK) #include #include #include @@ -66,7 +66,7 @@ void handle_signal(int sig) { QCoreApplication::quit(); } -#ifndef Q_OS_WIN32 +#if not defined(Q_OS_WIN32) && not defined(MAC_10_4_SDK) void handle_crash(int sig) { void* callstack[128]; int i, frames = backtrace(callstack, 128); @@ -136,7 +136,7 @@ int main(int argc, char **argv) { signal(SIGTERM, handle_signal); signal(SIGINT, handle_signal); -#ifndef Q_OS_WIN32 +#if not defined(Q_OS_WIN32) && not defined(MAC_10_4_SDK) signal(SIGABRT, handle_crash); signal(SIGBUS, handle_crash); signal(SIGSEGV, handle_crash); -- 2.20.1