diff options
| author | Leonid Bobrov <mazocomp@disroot.org> | 2019-02-03 10:53:54 +0200 |
|---|---|---|
| committer | Loïc Blot <nerzhul@users.noreply.github.com> | 2019-02-03 09:53:54 +0100 |
| commit | 339341ba4e270cc86e82db008e6325f03d1046f7 (patch) | |
| tree | e129e568fb172c567dc3c852a5bf5e9aa557fb25 | |
| parent | 70672e1cb7634afc8f884c3ff8a6dca1448abff7 (diff) | |
| download | minetest-339341ba4e270cc86e82db008e6325f03d1046f7.tar.gz minetest-339341ba4e270cc86e82db008e6325f03d1046f7.tar.bz2 minetest-339341ba4e270cc86e82db008e6325f03d1046f7.zip | |
DragonFly BSD is somewhat identical to FreeBSD (#8159)
| -rw-r--r-- | cmake/Modules/FindGettextLib.cmake | 2 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/gui/intlGUIEditBox.cpp | 2 | ||||
| -rw-r--r-- | src/irrlicht_changes/irrUString.h | 2 | ||||
| -rw-r--r-- | src/threading/thread.cpp | 6 | ||||
| -rw-r--r-- | src/util/serialize.h | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/cmake/Modules/FindGettextLib.cmake b/cmake/Modules/FindGettextLib.cmake index cb1ce7b91..11de12177 100644 --- a/cmake/Modules/FindGettextLib.cmake +++ b/cmake/Modules/FindGettextLib.cmake @@ -60,7 +60,7 @@ find_package_handle_standard_args(GetText DEFAULT_MSG ${GETTEXT_REQUIRED_VARS}) if(GETTEXT_FOUND) # BSD variants require special linkage as they don't use glibc - if(${CMAKE_SYSTEM_NAME} MATCHES "BSD") + if(${CMAKE_SYSTEM_NAME} MATCHES "BSD|DragonFly") set(GETTEXT_LIBRARY "intl") endif() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8218d586c..ee67a83e2 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -719,11 +719,11 @@ else() endif() set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${RELEASE_WARNING_FLAGS} ${WARNING_FLAGS} ${OTHER_FLAGS} -Wall -pipe -funroll-loops") - if(CMAKE_SYSTEM_NAME MATCHES "(Darwin|FreeBSD)") + if(CMAKE_SYSTEM_NAME MATCHES "(Darwin|BSD|DragonFly)") set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Os") else() set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -ffast-math -fomit-frame-pointer") - endif(CMAKE_SYSTEM_NAME MATCHES "(Darwin|FreeBSD)") + endif(CMAKE_SYSTEM_NAME MATCHES "(Darwin|BSD|DragonFly)") set(CMAKE_CXX_FLAGS_SEMIDEBUG "-g -O1 -Wall -Wabi ${WARNING_FLAGS} ${OTHER_FLAGS}") set(CMAKE_CXX_FLAGS_DEBUG "-g -O0 -Wall -Wabi ${WARNING_FLAGS} ${OTHER_FLAGS}") diff --git a/src/gui/intlGUIEditBox.cpp b/src/gui/intlGUIEditBox.cpp index 6bbf74a7f..fd3caa0f7 100644 --- a/src/gui/intlGUIEditBox.cpp +++ b/src/gui/intlGUIEditBox.cpp @@ -270,7 +270,7 @@ bool intlGUIEditBox::OnEvent(const SEvent& event) break; case EET_KEY_INPUT_EVENT: { -#if (defined(__linux__) || defined(__FreeBSD__)) +#if (defined(__linux__) || defined(__FreeBSD__)) || defined(__DragonFly__) // ################################################################ // ValkaTR: // This part is the difference from the original intlGUIEditBox diff --git a/src/irrlicht_changes/irrUString.h b/src/irrlicht_changes/irrUString.h index aead68bab..fce49e717 100644 --- a/src/irrlicht_changes/irrUString.h +++ b/src/irrlicht_changes/irrUString.h @@ -48,7 +48,7 @@ #define __BIG_ENDIAN 1 #elif defined(__MACH__) && defined(__APPLE__) #include <machine/endian.h> -#elif defined(__FreeBSD__) +#elif defined(__FreeBSD__) || defined(__DragonFly__) #include <sys/endian.h> #else #include <endian.h> diff --git a/src/threading/thread.cpp b/src/threading/thread.cpp index 3b6851389..e0f808c4d 100644 --- a/src/threading/thread.cpp +++ b/src/threading/thread.cpp @@ -31,7 +31,7 @@ DEALINGS IN THE SOFTWARE. // for setName #if defined(__linux__) #include <sys/prctl.h> -#elif defined(__FreeBSD__) || defined(__OpenBSD__) +#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) #include <pthread_np.h> #elif defined(_MSC_VER) struct THREADNAME_INFO { @@ -213,7 +213,7 @@ void Thread::setName(const std::string &name) // distributions are still runing 2.11 and previous versions. prctl(PR_SET_NAME, name.c_str()); -#elif defined(__FreeBSD__) || defined(__OpenBSD__) +#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) pthread_set_name_np(pthread_self(), name.c_str()); @@ -273,7 +273,7 @@ bool Thread::bindToProcessor(unsigned int proc_number) return SetThreadAffinityMask(pthread_gethandle(getThreadHandle()), 1 << proc_number); -#elif __FreeBSD_version >= 702106 || defined(__linux__) +#elif __FreeBSD_version >= 702106 || defined(__linux__) || defined(__DragonFly__) cpu_set_t cpuset; diff --git a/src/util/serialize.h b/src/util/serialize.h index 5eb2b5f2e..8ef0ad1c2 100644 --- a/src/util/serialize.h +++ b/src/util/serialize.h @@ -32,7 +32,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #define __BIG_ENDIAN 1 #elif defined(__MACH__) && defined(__APPLE__) #include <machine/endian.h> - #elif defined(__FreeBSD__) + #elif defined(__FreeBSD__) || defined(__DragonFly__) #include <sys/endian.h> #else #include <endian.h> |