games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-27 22:49:25 +02:00
Code Issues Releases Activity

Haiku patch

Browse Source
This commit is contained in:
Jerome Duval
2023-03-26 18:42:08 +02:00
committed by Jérôme Duval
parent 9287d1b837
commit 518f8d69e5
4 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@@ -341,6 +341,9 @@ if(NOT WIN32 AND NOT APPLE_IOS)
if(HAVE_RT_LIB) if(HAVE_RT_LIB)
set(SYSTEM_LIBS ${SYSTEM_LIBS} rt) set(SYSTEM_LIBS ${SYSTEM_LIBS} rt)
endif() endif()
if(HAIKU)
set(SYSTEM_LIBS ${SYSTEM_LIBS} network)
endif()
endif() endif()
if(ENABLE_LUA) if(ENABLE_LUA)

4
Global.h
View File

@@ -41,6 +41,10 @@ static_assert(sizeof(bool) == 1, "Bool needs to be 1 byte in size.");
# define VCMI_UNIX # define VCMI_UNIX
# define VCMI_XDG # define VCMI_XDG
# define VCMI_FREEBSD # define VCMI_FREEBSD
#elif defined(__HAIKU__)
# define VCMI_UNIX
# define VCMI_XDG
# define VCMI_HAIKU
#elif defined(__GNU__) || defined(__gnu_hurd__) || (defined(__MACH__) && !defined(__APPLE__)) #elif defined(__GNU__) || defined(__gnu_hurd__) || (defined(__MACH__) && !defined(__APPLE__))
# define VCMI_UNIX # define VCMI_UNIX
# define VCMI_XDG # define VCMI_XDG

4
lib/CThreadHelper.cpp
View File

@@ -12,6 +12,8 @@
#ifdef VCMI_WINDOWS #ifdef VCMI_WINDOWS
#include <windows.h> #include <windows.h>
#elif defined(VCMI_HAIKU)
#include <OS.h>
#elif !defined(VCMI_APPLE) && !defined(VCMI_FREEBSD) && !defined(VCMI_HURD) #elif !defined(VCMI_APPLE) && !defined(VCMI_FREEBSD) && !defined(VCMI_HURD)
#include <sys/prctl.h> #include <sys/prctl.h>
#endif #endif
@@ -89,6 +91,8 @@ void setThreadName(const std::string &name)
prctl(PR_SET_NAME, name.c_str(), 0, 0, 0); prctl(PR_SET_NAME, name.c_str(), 0, 0, 0);
#elif defined(VCMI_APPLE) #elif defined(VCMI_APPLE)
pthread_setname_np(name.c_str()); pthread_setname_np(name.c_str());
#elif defined(VCMI_HAIKU)
rename_thread(find_thread(NULL), name.c_str());
#endif #endif
} }

2
server/CMakeLists.txt
View File

@@ -33,7 +33,7 @@ else()
set(server_LIBS vcmi) set(server_LIBS vcmi)
endif() endif()
if(CMAKE_SYSTEM_NAME MATCHES FreeBSD) if(CMAKE_SYSTEM_NAME MATCHES FreeBSD OR HAIKU)
set(server_LIBS execinfo ${server_LIBS}) set(server_LIBS execinfo ${server_LIBS})
endif() endif()
target_link_libraries(vcmiserver PRIVATE ${server_LIBS} minizip::minizip) target_link_libraries(vcmiserver PRIVATE ${server_LIBS} minizip::minizip)