From 955cae18677bf1d02902eced99830e6eef551161 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= Date: Wed, 21 Jun 2017 10:30:59 +0200 Subject: Build fix: stdint.h diff --git a/thirdparty/libbacktrace/CMakeLists.txt b/thirdparty/libbacktrace/CMakeLists.txt index 0241572..64a8bd8 100644 --- a/thirdparty/libbacktrace/CMakeLists.txt +++ b/thirdparty/libbacktrace/CMakeLists.txt @@ -123,6 +123,8 @@ if (NOT HAVE_DWARF_H AND NOT HAVE_LIBDWARF_DWARF_H) message (STATUS "libdwarf not found. Disabling Backtrace support.") endif () +check_include_file (stdint.h HAVE_STDINT_H) + configure_file (backtrace-supported.h.in backtrace-supported.h) configure_file (config.h.in.cmake config.h) diff --git a/thirdparty/libbacktrace/config.h.in.cmake b/thirdparty/libbacktrace/config.h.in.cmake index 4ac1326..36e25d4 100644 --- a/thirdparty/libbacktrace/config.h.in.cmake +++ b/thirdparty/libbacktrace/config.h.in.cmake @@ -22,3 +22,6 @@ /* Define to 1 if dwarf.h is in the libdwarf folder */ #cmakedefine HAVE_LIBDWARF_DWARF_H 1 + +/* Define to 1 if stdint.h available */ +#cmakedefine HAVE_STDINT_H 1 -- 2.12.2 From bfefb456f7b24ffbfb5fee604d3ae28b800792bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= Date: Wed, 21 Jun 2017 10:32:08 +0200 Subject: Apitrace: platform support diff --git a/thirdparty/khronos/EGL/eglplatform.h b/thirdparty/khronos/EGL/eglplatform.h index 203f08c..8fffd45 100644 --- a/thirdparty/khronos/EGL/eglplatform.h +++ b/thirdparty/khronos/EGL/eglplatform.h @@ -103,7 +103,7 @@ typedef struct ANativeWindow* EGLNativeWindowType; typedef struct egl_native_pixmap_t* EGLNativePixmapType; typedef void* EGLNativeDisplayType; -#elif defined(__APPLE__) || defined(__QNXNTO__) +#elif defined(__APPLE__) || defined(__QNXNTO__) || defined(__HAIKU__) typedef void *EGLNativeDisplayType; typedef void *EGLNativePixmapType; -- 2.12.2 From 5e8c29fbb566a67d9a9c72755977f52a2244d6cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= Date: Sun, 9 Jul 2017 22:38:37 +0200 Subject: stdint.h patch, part 2. diff --git a/thirdparty/libbacktrace/backtrace.h b/thirdparty/libbacktrace/backtrace.h index da16e3d..92fd35a 100644 --- a/thirdparty/libbacktrace/backtrace.h +++ b/thirdparty/libbacktrace/backtrace.h @@ -33,6 +33,8 @@ POSSIBILITY OF SUCH DAMAGE. */ #ifndef BACKTRACE_H #define BACKTRACE_H +#include "config.h" + #include #include -- 2.12.2