Changeset 5669 for code/branches

Timestamp:

Aug 23, 2009, 12:45:46 AM (15 years ago)

Author:

rgrieder

Message:

OIS build fix for linux.

Location:

code/branches/resource2/src/ois

Files:

• changes_orxonox.diff (modified) (1 diff)
• linux/EventHelpers.cpp (modified) (1 diff)

code/branches/resource2/src/ois/changes_orxonox.diff

@@ +1 @@
+--- 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;
+ 
+

code/branches/resource2/src/ois/linux/EventHelpers.cpp

@@ -34 +34 @@
 #ifdef OIS_LINUX_JOY_DEBUG
 # 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