summarylogtreecommitdiffstats
path: root/funguloids-ois-1.4.patch
diff options
context:
space:
mode:
authorNicolas Iooss2018-06-02 18:32:57 +0200
committerNicolas Iooss2018-06-02 18:32:57 +0200
commit04cf8334533d1f8d492e7cbf6d6fbb0a3bb3ee5e (patch)
tree972e51f2964fca1aaafac94ca63dbc723a976adb /funguloids-ois-1.4.patch
parentc31dcb1865656b03a0e6bf83e0950b7c34352aa7 (diff)
downloadaur-04cf8334533d1f8d492e7cbf6d6fbb0a3bb3ee5e.tar.gz
funguloids 1.06.4-11 update: OGRE 1.11.0 and OIS 1.4 compatibility
Diffstat (limited to 'funguloids-ois-1.4.patch')
-rw-r--r--funguloids-ois-1.4.patch33
1 files changed, 33 insertions, 0 deletions
diff --git a/funguloids-ois-1.4.patch b/funguloids-ois-1.4.patch
new file mode 100644
index 000000000000..232500ed1ec0
--- /dev/null
+++ b/funguloids-ois-1.4.patch
@@ -0,0 +1,33 @@
+From: Nicolas Iooss
+Date: Sat, 2 Jun 2018 15:51:40 +0200
+Subject: Fix compilation issues with OIS 1.4
+
+On Arch Linux, ois 1.4 moved the header files from /usr/include/OIS to
+/usr/include/ois. As pkg-config gives the right directory, use it
+implicitely instead of hard-coding it:
+
+ $ pkg-config --cflags OIS
+ -I/usr/include/oisdiff --git a/include/input.h b/include/input.h
+
+diff --git a/include/input.h b/include/input.h
+index 9ad27de740e3..1c9a7dbbeea8 100644
+--- a/include/input.h
++++ b/include/input.h
+@@ -29,12 +29,12 @@
+ //Use this define to signify OIS will be used as a DLL
+ //(so that dll import/export macros are in effect)
+ #define OIS_DYNAMIC_LIB
+-#include <OIS/OIS.h>
++#include <OIS.h>
+
+-#include <OIS/OISEvents.h>
+-#include <OIS/OISInputManager.h>
+-#include <OIS/OISMouse.h>
+-#include <OIS/OISKeyboard.h>
++#include <OISEvents.h>
++#include <OISInputManager.h>
++#include <OISMouse.h>
++#include <OISKeyboard.h>
+
+
+ class OgreAppFrameListener;