zaki
/
irrlicht
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make compilable without joysticks. 

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1688 dfc29bdd-3216-0410-991c-e03cc46cb475
master
hybrid 2008-11-05 12:22:33 +00:00
parent ab5d88da77
commit 0335d71c1e
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/Irrlicht/CIrrDeviceLinux.cpp
View File

@ -157,6 +157,7 @@ CIrrDeviceLinux::~CIrrDeviceLinux()
#endif // #ifdef _IRR_COMPILE_WITH_X11_ #endif // #ifdef _IRR_COMPILE_WITH_X11_
#if defined(_IRR_COMPILE_WITH_JOYSTICK_EVENTS_)
for(u32 joystick = 0; joystick < ActiveJoysticks.size(); ++joystick) for(u32 joystick = 0; joystick < ActiveJoysticks.size(); ++joystick)
{ {
if(ActiveJoysticks[joystick].fd >= 0) if(ActiveJoysticks[joystick].fd >= 0)
@ -164,6 +165,7 @@ CIrrDeviceLinux::~CIrrDeviceLinux()
close(ActiveJoysticks[joystick].fd); close(ActiveJoysticks[joystick].fd);
} }
} }
#endif
} }
@ -1387,6 +1389,7 @@ void CIrrDeviceLinux::initialiseJoysticks()
#endif // _IRR_COMPILE_WITH_JOYSTICK_EVENTS_ #endif // _IRR_COMPILE_WITH_JOYSTICK_EVENTS_
} }
void CIrrDeviceLinux::pollJoysticks() void CIrrDeviceLinux::pollJoysticks()
{ {
#if defined _IRR_COMPILE_WITH_JOYSTICK_EVENTS_ #if defined _IRR_COMPILE_WITH_JOYSTICK_EVENTS_
@ -1419,7 +1422,7 @@ void CIrrDeviceLinux::pollJoysticks()
} }
} }
// Send an irrlict joystick event once per ::run() even if no new data were received. // Send an irrlicht joystick event once per ::run() even if no new data were received.
(void)postEventFromUser(info.persistentData); (void)postEventFromUser(info.persistentData);
} }
#endif // _IRR_COMPILE_WITH_JOYSTICK_EVENTS_ #endif // _IRR_COMPILE_WITH_JOYSTICK_EVENTS_

2
source/Irrlicht/CIrrDeviceLinux.h
View File

@ -343,6 +343,7 @@ namespace irr
core::array<SKeyMap> KeyMap; core::array<SKeyMap> KeyMap;
#if defined(_IRR_COMPILE_WITH_JOYSTICK_EVENTS_)
struct JoystickInfo struct JoystickInfo
{ {
int fd; int fd;
@ -354,6 +355,7 @@ namespace irr
JoystickInfo() : fd(-1), axes(0), buttons(0) { } JoystickInfo() : fd(-1), axes(0), buttons(0) { }
}; };
core::array<JoystickInfo> ActiveJoysticks; core::array<JoystickInfo> ActiveJoysticks;
#endif
}; };