diff --git a/readme.md b/readme.md index 9bc971c05..3798a8caf 100644 --- a/readme.md +++ b/readme.md @@ -82,13 +82,13 @@ Install appropriate libs as required. For ubuntu these are: libx11-dev, libgl1-m #### FreeBSD -```gcc *.c -o ClassiCube -I /usr/local/include -L /usr/Xlocal/lib -lm -lpthread -lX11 -lGL -lcurl -lopenal -lexecinfo``` +```gcc *.c -o ClassiCube -I /usr/local/include -L /usr/local/lib -lm -lpthread -lX11 -lGL -lcurl -lopenal -lexecinfo``` #### OpenBSD Install libexecinfo package if needed. -```gcc *.c -o ClassiCube -isystem /usr/X11R6/include -isystem /usr/local/include -L /usr/X11R6/lib -L /usr/local/lib -lX11 -lGL -lcurl -lopenal -lexecinfo``` +```gcc *.c -o ClassiCube -I /usr/X11R6/include -I /usr/local/include -L /usr/X11R6/lib -L /usr/local/lib -lX11 -lGL -lcurl -lopenal -lexecinfo``` #### NetBSD diff --git a/src/Logger.c b/src/Logger.c index b4fd735e7..057354047 100644 --- a/src/Logger.c +++ b/src/Logger.c @@ -448,6 +448,7 @@ static void Logger_DumpRegisters(void* ctx) { /* OSX: See /usr/include/mach/i386/_structs.h */ /* Solaris: See /usr/include/sys/regset.h */ /* NetBSD: See /usr/include/i386/mcontext.h */ + /* OpenBSD: See /usr/include/machine/signal.h */ #if defined __i386__ #if defined CC_BUILD_LINUX @@ -639,9 +640,14 @@ void Logger_Hook(void) { } void Logger_Abort2(ReturnCode result, const char* raw_msg) { +#ifdef CC_BUILD_OPENBSD + /* getcontext is absent on OpenBSD */ + Logger_AbortCommon(result, raw_msg, NULL); +#else ucontext_t ctx; getcontext(&ctx); Logger_AbortCommon(result, raw_msg, &ctx); +#endif } #endif