VCMI: get it to build.

Fix boost to not try using XSI shared memory as we don't support that.
Fix VCMI to link to libnetwork where it uses it.

Now failing at install because there is no 'make install'. Will write a
manual copy of relevant files to the package later.
This commit is contained in:
Adrien Destugues
2014-01-07 23:14:20 +01:00
parent 7a5b5cac58
commit e035f6fc18
6 changed files with 28 additions and 423 deletions

View File

@@ -1,31 +0,0 @@
From fc69e8dc4e2287cef93857a29d80b8930b90baa9 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sun, 5 Jan 2014 23:14:13 +0100
Subject: Support thread renaming.
diff --git a/lib/CThreadHelper.cpp b/lib/CThreadHelper.cpp
index 3774c4b..b0aca56 100644
--- a/lib/CThreadHelper.cpp
+++ b/lib/CThreadHelper.cpp
@@ -3,6 +3,8 @@
#ifdef _WIN32
#include <windows.h>
+#elif defined(__HAIKU__)
+ #include <OS.h>
#elif !defined(__APPLE__)
#include <sys/prctl.h>
#endif
@@ -80,6 +82,8 @@ void setThreadName(const std::string &name)
//not supported
#endif
+#elif defined(__HAIKU__)
+ rename_thread(find_thread(NULL), name.c_str());
#elif defined(__linux__)
prctl(PR_SET_NAME, name.c_str(), 0, 0, 0);
#endif
--
1.8.3.4

View File

@@ -18,7 +18,7 @@ if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
fi
SECONDARY_ARCHITECTURES="x86"
PATCHES="vcmi-0.94.patchset"
#PATCHES="vcmi-0.94.patchset"
PROVIDES="
vcmi$secondaryArchSuffix = $portVersion
"