diff options
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | intern/guardedalloc/intern/mallocn_intern.h | 2 | ||||
| -rw-r--r-- | source/blender/blenlib/BLI_sys_types.h | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2962b58824d..738518235d5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -915,6 +915,9 @@ if(UNIX AND NOT APPLE) endif() set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -pthread") + if(CMAKE_DL_LIBS) + list(APPEND PLATFORM_LINKLIBS ${CMAKE_DL_LIBS}) + endif() # lfs on glibc, all compilers should use add_definitions(-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE) diff --git a/intern/guardedalloc/intern/mallocn_intern.h b/intern/guardedalloc/intern/mallocn_intern.h index a9d559e48f9..7c8922dd407 100644 --- a/intern/guardedalloc/intern/mallocn_intern.h +++ b/intern/guardedalloc/intern/mallocn_intern.h @@ -51,7 +51,7 @@ #undef HAVE_MALLOC_STATS -#if defined(__linux__) || (defined(__FreeBSD_kernel__) && !defined(__FreeBSD__)) +#if defined(__linux__) || (defined(__FreeBSD_kernel__) && !defined(__FreeBSD__)) || defined(__GLIBC__) # include <malloc.h> # define HAVE_MALLOC_STATS #elif defined(__FreeBSD__) diff --git a/source/blender/blenlib/BLI_sys_types.h b/source/blender/blenlib/BLI_sys_types.h index b0a8adeef22..fcbed1daf66 100644 --- a/source/blender/blenlib/BLI_sys_types.h +++ b/source/blender/blenlib/BLI_sys_types.h @@ -167,7 +167,7 @@ typedef unsigned long uintptr_t; #define _UINTPTR_T_DEFINED #endif -#elif defined(__linux__) || defined(__NetBSD__) || defined(__OpenBSD__) +#elif defined(__linux__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__) || defined(__GNU__) /* Linux-i386, Linux-Alpha, Linux-ppc */ #include <stdint.h> |