From eace0982a2c8e326b2e11607b2308a96be7e013f Mon Sep 17 00:00:00 2001 From: David Carlier Date: Sat, 10 Oct 2020 14:14:49 +0100 Subject: [PATCH] DragonFlyBSD support, mainly FreeBSD codepath. --- CMakeLists.txt | 4 ++-- lib/angelscript/source/as_memory.cpp | 2 +- src/utils/crash_reporting.cpp | 4 ++-- src/utils/string_utils.cpp | 2 ++ src/utils/vs.hpp | 4 ++-- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a5553de20..93d75eb57 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -176,12 +176,12 @@ endif() add_subdirectory("${PROJECT_SOURCE_DIR}/lib/bullet") include_directories(BEFORE "${PROJECT_SOURCE_DIR}/lib/bullet/src") -if(WIN32 OR CMAKE_SYSTEM_NAME MATCHES "BSD") +if(WIN32 OR CMAKE_SYSTEM_NAME MATCHES "BSD" OR CMAKE_SYSTEM_NAME MATCHES "DragonFly") set(LIBRESOLV_LIBRARY) elseif (HAIKU) find_library(LIBRESOLV_LIBRARY NAMES network socket) else() - find_library(LIBRESOLV_LIBRARY NAMES resolv libresolv) + find_library(LIBRESOLV_LIBRARY NAMES resolv libresolv) endif() # Find system ENet library or build it if missing diff --git a/lib/angelscript/source/as_memory.cpp b/lib/angelscript/source/as_memory.cpp index db3b06f94..fbc06feb6 100644 --- a/lib/angelscript/source/as_memory.cpp +++ b/lib/angelscript/source/as_memory.cpp @@ -38,7 +38,7 @@ #include -#if !defined(__APPLE__) && !defined(__SNC__) && !defined(__ghs__) && !defined(__FreeBSD__) && !defined(__OpenBSD__) +#if !defined(__APPLE__) && !defined(__SNC__) && !defined(__ghs__) && !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__DragonFly__) #include #endif diff --git a/src/utils/crash_reporting.cpp b/src/utils/crash_reporting.cpp index fc2a21119..ec07864da 100644 --- a/src/utils/crash_reporting.cpp +++ b/src/utils/crash_reporting.cpp @@ -346,7 +346,7 @@ #include #endif - #if defined(__FreeBSD__) + #if defined(__FreeBSD__) || defined(__DragonFly__) #include #endif @@ -432,7 +432,7 @@ return; } path[len] = 0; -#elif defined(__FreeBSD__) +#elif defined(__FreeBSD__) || defined(__DragonFly__) int mib[4] = {CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1}; size_t len = PATH_MAX; path = (char*)malloc(PATH_MAX+1); diff --git a/src/utils/string_utils.cpp b/src/utils/string_utils.cpp index 3e346ca48..eb7b66eb2 100644 --- a/src/utils/string_utils.cpp +++ b/src/utils/string_utils.cpp @@ -1390,6 +1390,8 @@ namespace StringUtils uagent += (std::string)" (Macintosh)"; #elif defined(__FreeBSD__) uagent += (std::string)" (FreeBSD)"; +#elif defined(__DragonFly__) + uagent += (std::string)" (DragonFlyBSD)"; #elif defined(__HAIKU__) uagent += (std::string)" (Haiku)"; #elif defined(ANDROID) diff --git a/src/utils/vs.hpp b/src/utils/vs.hpp index a71bbc19d..52aa08c26 100644 --- a/src/utils/vs.hpp +++ b/src/utils/vs.hpp @@ -44,7 +44,7 @@ # include #endif -#if defined(__FreeBSD__) +#if defined(__FreeBSD__) || defined(__DragonFly__) # include # include #endif @@ -98,7 +98,7 @@ namespace VS #if __GLIBC__ > 2 || __GLIBC_MINOR__ > 11 pthread_setname_np(pthread_self(), name); #endif -#elif defined(__FreeBSD__) +#elif defined(__FreeBSD__) || defined(__DragonFly__) pthread_set_name_np(pthread_self(), name); #elif defined(__NetBSD__) pthread_setname_np(pthread_self(), "%s", const_cast(name));