Changeset 5695 for code/trunk/src/ois/changes_orxonox.diff
- Timestamp:
- Aug 30, 2009, 2:22:00 AM (15 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/resource2 (added) merged: 3373-3374,5594,5597,5610-5611,5614,5624,5641,5644-5646,5650-5664,5667-5672,5682-5684,5688-5691,5694
- Property svn:mergeinfo changed
-
code/trunk/src/ois/changes_orxonox.diff
r2710 r5695 1 --- linux/EventHelpers.cpp (revision 5668) 2 +++ linux/EventHelpers.cpp (working copy) 3 @@ -35,6 +35,20 @@ 4 # include <iostream> 5 #endif 6 7 +// Fixes for missing macros in input.h 8 +#ifndef FF_EFFECT_MIN 9 +#define FF_EFFECT_MIN FF_RUMBLE 10 +#endif 11 +#ifndef FF_EFFECT_MAX 12 +#define FF_EFFECT_MAX FF_RAMP 13 +#endif 14 +#ifndef FF_WAVEFORM_MIN 15 +#define FF_WAVEFORM_MIN FF_SQUARE 16 +#endif 17 +#ifndef FF_WAVEFORM_MAX 18 +#define FF_WAVEFORM_MAX FF_CUSTOM 19 +#endif 20 + 21 using namespace std; 22 using namespace OIS; 23 24
Note: See TracChangeset
for help on using the changeset viewer.