ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DragonFlyBSD support, mainly FreeBSD codepath.

Browse Source
This commit is contained in:
David Carlier 2020-10-10 14:14:49 +01:00
parent 23e4960fef
commit eace0982a2
5 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -176,7 +176,7 @@ endif()
add_subdirectory("${PROJECT_SOURCE_DIR}/lib/bullet") add_subdirectory("${PROJECT_SOURCE_DIR}/lib/bullet")
include_directories(BEFORE "${PROJECT_SOURCE_DIR}/lib/bullet/src") 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) set(LIBRESOLV_LIBRARY)
elseif (HAIKU) elseif (HAIKU)
find_library(LIBRESOLV_LIBRARY NAMES network socket) find_library(LIBRESOLV_LIBRARY NAMES network socket)

2
lib/angelscript/source/as_memory.cpp
View File

@ -38,7 +38,7 @@
#include <stdlib.h> #include <stdlib.h>
#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 <malloc.h> #include <malloc.h>
#endif #endif

4
src/utils/crash_reporting.cpp
View File

@ -346,7 +346,7 @@
#include <mach-o/dyld.h> #include <mach-o/dyld.h>
#endif #endif
#if defined(__FreeBSD__) #if defined(__FreeBSD__) || defined(__DragonFly__)
#include <sys/sysctl.h> #include <sys/sysctl.h>
#endif #endif
@ -432,7 +432,7 @@
return; return;
} }
path[len] = 0; path[len] = 0;
#elif defined(__FreeBSD__) #elif defined(__FreeBSD__) || defined(__DragonFly__)
int mib[4] = {CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1}; int mib[4] = {CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1};
size_t len = PATH_MAX; size_t len = PATH_MAX;
path = (char*)malloc(PATH_MAX+1); path = (char*)malloc(PATH_MAX+1);

2
src/utils/string_utils.cpp
View File

@ -1390,6 +1390,8 @@ namespace StringUtils
uagent += (std::string)" (Macintosh)"; uagent += (std::string)" (Macintosh)";
#elif defined(__FreeBSD__) #elif defined(__FreeBSD__)
uagent += (std::string)" (FreeBSD)"; uagent += (std::string)" (FreeBSD)";
#elif defined(__DragonFly__)
uagent += (std::string)" (DragonFlyBSD)";
#elif defined(__HAIKU__) #elif defined(__HAIKU__)
uagent += (std::string)" (Haiku)"; uagent += (std::string)" (Haiku)";
#elif defined(ANDROID) #elif defined(ANDROID)

4
src/utils/vs.hpp
View File

@ -44,7 +44,7 @@
# include <pthread.h> # include <pthread.h>
#endif #endif
#if defined(__FreeBSD__) #if defined(__FreeBSD__) || defined(__DragonFly__)
# include <pthread.h> # include <pthread.h>
# include <pthread_np.h> # include <pthread_np.h>
#endif #endif
@ -98,7 +98,7 @@ namespace VS
#if __GLIBC__ > 2 || __GLIBC_MINOR__ > 11 #if __GLIBC__ > 2 || __GLIBC_MINOR__ > 11
pthread_setname_np(pthread_self(), name); pthread_setname_np(pthread_self(), name);
#endif #endif
#elif defined(__FreeBSD__) #elif defined(__FreeBSD__) || defined(__DragonFly__)
pthread_set_name_np(pthread_self(), name); pthread_set_name_np(pthread_self(), name);
#elif defined(__NetBSD__) #elif defined(__NetBSD__)
pthread_setname_np(pthread_self(), "%s", const_cast<char *>(name)); pthread_setname_np(pthread_self(), "%s", const_cast<char *>(name));