From 83bab29e4b5abb1cc349ff5bc3a88958923c6e17 Mon Sep 17 00:00:00 2001
From: David Carlier <devnexen@gmail.com>
Date: Sat, 6 Aug 2016 19:00:27 +0100
Subject: [PATCH] Mainly making compilable under OpenBSD. Renaming one resource
 file as the space led to issue for qt/moc.

---
 apps/openmw/crashcatcher.cpp                    |   4 ++--
 apps/wizard/CMakeLists.txt                      |   2 +-
 components/files/fixedpath.hpp                  |   2 +-
 components/files/linuxpath.cpp                  |   4 ++--
 components/files/linuxpath.hpp                  |   4 ++--
 files/opencs/{flying eye.png => flying-eye.png} | Bin
 files/opencs/resources.qrc                      |   2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)
 rename files/opencs/{flying eye.png => flying-eye.png} (100%)

diff --git a/apps/openmw/crashcatcher.cpp b/apps/openmw/crashcatcher.cpp
index 4f0356259..a38d301ea 100644
--- a/apps/openmw/crashcatcher.cpp
+++ b/apps/openmw/crashcatcher.cpp
@@ -5,7 +5,6 @@
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <sys/param.h>
-#include <sys/ucontext.h>
 #include <sys/utsname.h>
 #include <string.h>
 #include <errno.h>
@@ -21,10 +20,11 @@
 
 #ifdef __linux__
 #include <sys/prctl.h>
+#include <sys/ucontext.h>
 #ifndef PR_SET_PTRACER
 #define PR_SET_PTRACER 0x59616d61
 #endif
-#elif defined (__APPLE__) || defined (__FreeBSD__)
+#elif defined (__APPLE__) || defined (__FreeBSD__) || defined(__OpenBSD__)
 #include <signal.h>
 #endif
 
diff --git a/apps/wizard/CMakeLists.txt b/apps/wizard/CMakeLists.txt
index dcd944490..dd2e1a748 100644
--- a/apps/wizard/CMakeLists.txt
+++ b/apps/wizard/CMakeLists.txt
@@ -136,7 +136,7 @@ if (BUILD_WITH_CODE_COVERAGE)
 endif()
 
 # Workaround for binutil => 2.23 problem when linking, should be fixed eventually upstream
-if (UNIX AND NOT APPLE)
+if (CMAKE_SYSTEM_NAME MATCHES "Linux")
 target_link_libraries(openmw-wizard dl Xt)
 endif()
 
diff --git a/components/files/fixedpath.hpp b/components/files/fixedpath.hpp
index 5e0ea6c86..2e72b8154 100644
--- a/components/files/fixedpath.hpp
+++ b/components/files/fixedpath.hpp
@@ -4,7 +4,7 @@
 #include <string>
 #include <boost/filesystem.hpp>
 
-#if defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#if defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
 #ifndef ANDROID
     #include <components/files/linuxpath.hpp>
     namespace Files { typedef LinuxPath TargetPathType; }
diff --git a/components/files/linuxpath.cpp b/components/files/linuxpath.cpp
index 212db562c..89b4bf45a 100644
--- a/components/files/linuxpath.cpp
+++ b/components/files/linuxpath.cpp
@@ -1,6 +1,6 @@
 #include "linuxpath.hpp"
 
-#if defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#if defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
 
 #include <cstdlib>
 #include <cstring>
@@ -159,4 +159,4 @@ boost::filesystem::path LinuxPath::getInstallPath() const
 
 } /* namespace Files */
 
-#endif /* defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) */
+#endif /* defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) */
diff --git a/components/files/linuxpath.hpp b/components/files/linuxpath.hpp
index ba9756fc0..7950157bb 100644
--- a/components/files/linuxpath.hpp
+++ b/components/files/linuxpath.hpp
@@ -1,7 +1,7 @@
 #ifndef COMPONENTS_FILES_LINUXPATH_H
 #define COMPONENTS_FILES_LINUXPATH_H
 
-#if defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#if defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
 
 #include <boost/filesystem.hpp>
 
@@ -56,6 +56,6 @@ struct LinuxPath
 
 } /* namespace Files */
 
-#endif /* defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) */
+#endif /* defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) */
 
 #endif /* COMPONENTS_FILES_LINUXPATH_H */
diff --git a/files/opencs/flying eye.png b/files/opencs/flying-eye.png
similarity index 100%
rename from files/opencs/flying eye.png
rename to files/opencs/flying-eye.png
diff --git a/files/opencs/resources.qrc b/files/opencs/resources.qrc
index e9fb12cbe..7e798527c 100644
--- a/files/opencs/resources.qrc
+++ b/files/opencs/resources.qrc
@@ -77,7 +77,7 @@
         <file alias="day">Sun-48.png</file>
         <file alias="bright">Lightbulb-48.png</file>
         <file alias="1st-person">eyeballdude.png</file>
-        <file alias="free-camera">flying eye.png</file>
+        <file alias="free-camera">flying-eye.png</file>
         <file alias="orbiting-camera">orbit2.png</file>
         <file alias="play">scene-play.png</file>
         <file alias="scene-view-1">scene-view-references.png</file>