[Orxonox-commit 946] r5669 - in code/branches/resource2/src/ois: . linux

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2009-08-23 00:45:46 +0200 (Sun, 23 Aug 2009)
New Revision: 5669

Modified:
   code/branches/resource2/src/ois/changes_orxonox.diff
   code/branches/resource2/src/ois/linux/EventHelpers.cpp
Log:
OIS build fix for linux.

Modified: code/branches/resource2/src/ois/changes_orxonox.diff
===================================================================
--- code/branches/resource2/src/ois/changes_orxonox.diff	2009-08-22 21:16:34 UTC (rev 5668)
+++ code/branches/resource2/src/ois/changes_orxonox.diff	2009-08-22 22:45:46 UTC (rev 5669)
@@ -0,0 +1,24 @@
+--- linux/EventHelpers.cpp	(revision 5668)
++++ linux/EventHelpers.cpp	(working copy)
+@@ -35,6 +35,20 @@
+ # include <iostream>
+ #endif
+ 
++// Fixes for missing macros in input.h
++#ifndef FF_EFFECT_MIN
++#define FF_EFFECT_MIN FF_RUMBLE
++#endif
++#ifndef FF_EFFECT_MAX
++#define FF_EFFECT_MAX FF_RAMP
++#endif
++#ifndef FF_WAVEFORM_MIN
++#define FF_WAVEFORM_MIN FF_SQUARE
++#endif
++#ifndef FF_WAVEFORM_MAX
++#define FF_WAVEFORM_MAX FF_CUSTOM
++#endif
++
+ using namespace std;
+ using namespace OIS;
+ 
+

Modified: code/branches/resource2/src/ois/linux/EventHelpers.cpp
===================================================================
--- code/branches/resource2/src/ois/linux/EventHelpers.cpp	2009-08-22 21:16:34 UTC (rev 5668)
+++ code/branches/resource2/src/ois/linux/EventHelpers.cpp	2009-08-22 22:45:46 UTC (rev 5669)
@@ -35,6 +35,20 @@
 # include <iostream>
 #endif
 
+// Fixes for missing macros in input.h
+#ifndef FF_EFFECT_MIN
+#define FF_EFFECT_MIN FF_RUMBLE
+#endif
+#ifndef FF_EFFECT_MAX
+#define FF_EFFECT_MAX FF_RAMP
+#endif
+#ifndef FF_WAVEFORM_MIN
+#define FF_WAVEFORM_MIN FF_SQUARE
+#endif
+#ifndef FF_WAVEFORM_MAX
+#define FF_WAVEFORM_MAX FF_CUSTOM
+#endif
+
 using namespace std;
 using namespace OIS;