gesche
/
tibia-client
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Disable crash handler in Mac OS

This commit is contained in:
Eduardo Bart 2013-02-05 19:09:20 -02:00
parent d4fb6127fc
commit f0ac63eb5c
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/framework/CMakeLists.txt
View File

@ -132,11 +132,12 @@ set_source_files_properties(${CMAKE_CURRENT_LIST_DIR}/luafunctions.cpp
PROPERTIES LANGUAGE CXX COMPILE_FLAGS "-g0 -Os") PROPERTIES LANGUAGE CXX COMPILE_FLAGS "-g0 -Os")
# some build options # some build options
option(CRASH_HANDLER "Generate crash reports" ON)
option(LUAJIT "Use lua jit" OFF) option(LUAJIT "Use lua jit" OFF)
if(NOT APPLE) if(NOT APPLE)
option(CRASH_HANDLER "Generate crash reports" ON)
option(USE_STATIC_LIBS "Don't use shared libraries (dlls)" ON) option(USE_STATIC_LIBS "Don't use shared libraries (dlls)" ON)
else() else()
set(CRASH_HANDLER OFF)
set(USE_STATIC_LIBS OFF) set(USE_STATIC_LIBS OFF)
endif() endif()
set(BUILD_COMMIT "devel" CACHE "Git commit string (intended for releases)" STRING) set(BUILD_COMMIT "devel" CACHE "Git commit string (intended for releases)" STRING)
@ -241,7 +242,6 @@ else()
message(STATUS "Crash handler: OFF") message(STATUS "Crash handler: OFF")
endif() endif()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
if(WIN32) if(WIN32)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mthreads") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mthreads")
set(framework_DEFINITIONS ${framework_DEFINITIONS} -D_WIN32_WINNT=0x0501) set(framework_DEFINITIONS ${framework_DEFINITIONS} -D_WIN32_WINNT=0x0501)

2
src/framework/platform/crashhandler.h
View File

@ -23,6 +23,8 @@
#ifndef CRASHHANDLER_H #ifndef CRASHHANDLER_H
#define CRASHHANDLER_H #define CRASHHANDLER_H
#ifdef CRASH_HANDLER
void installCrashHandler(); void installCrashHandler();
#endif
#endif #endif

2
src/framework/platform/unixcrashhandler.cpp
View File

@ -20,7 +20,7 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#ifndef WIN32 #if !defined(WIN32) && defined(CRASH_HANDLER)
#include "crashhandler.h" #include "crashhandler.h"
#include <framework/global.h> #include <framework/global.h>

2
src/framework/platform/win32crashhandler.cpp
View File

@ -20,7 +20,7 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#ifdef WIN32 #if defined(WIN32) && defined(CRASH_HANDLER)
#include "crashhandler.h" #include "crashhandler.h"
#include <framework/global.h> #include <framework/global.h>