|
Last change
on this file since 5727 was
5695,
checked in by rgrieder, 16 years ago
|
|
Merged resource2 branch back to trunk.
IMPORTANT NOTE:
Upon this merge you need to specifically call your data directory "data_extern" when checking it out (when you don't provide a name, it will be just called 'trunk').
The new CMake variable is EXTERNAL_DATA_DIRECTORY. DATA_DIRECTORY now points to the one the source part of the repository.
UPDATE YOUR DATA DIRECTORY AS WELL!!!
|
-
Property svn:eol-style set to
native
|
|
File size:
487 bytes
|
| Rev | Line | |
|---|
| [5695] | 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
TracBrowser
for help on using the repository browser.
