teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Mainly making compilable under OpenBSD.

Browse source 
Renaming one resource file as the space led to issue for qt/moc.
This commit is contained in:
David Carlier 2016-08-06 19:00:27 +01:00
parent 60535b77e8
commit 83bab29e4b
7 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/openmw/crashcatcher.cpp
View file

@ -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

2
apps/wizard/CMakeLists.txt
View file

@ -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()

2
components/files/fixedpath.hpp
View file

@ -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; }

4
components/files/linuxpath.cpp
View file

@ -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__) */

4
components/files/linuxpath.hpp
View file

@ -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 */

0
files/opencs/flying eye.png → files/opencs/flying-eye.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.9 KiB

After

Width:  |  Height:  |  Size: 7.9 KiB

2
files/opencs/resources.qrc
View file

@ -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>