Commit c416a800 authored by engineer_apple's avatar engineer_apple

enable joystick only on _IRR_COMPILE_WITH_JOYSTICK_EVENTS_

reason: compile error on win71+vs2013

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@5041 dfc29bdd-3216-0410-991c-e03cc46cb475
parent af48d4e0
...@@ -380,6 +380,8 @@ void SJoystickWin32Control::pollJoysticks() ...@@ -380,6 +380,8 @@ void SJoystickWin32Control::pollJoysticks()
* Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org> */ * Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org> */
irr::core::stringc SJoystickWin32Control::findJoystickName(int index, const JOYCAPS &caps) const irr::core::stringc SJoystickWin32Control::findJoystickName(int index, const JOYCAPS &caps) const
{ {
#if defined _IRR_COMPILE_WITH_JOYSTICK_EVENTS_
// As a default use the name given in the joystick structure. // As a default use the name given in the joystick structure.
// It is always the same name, independent of joystick. // It is always the same name, independent of joystick.
irr::core::stringc result(caps.szPname); irr::core::stringc result(caps.szPname);
...@@ -432,6 +434,8 @@ irr::core::stringc SJoystickWin32Control::findJoystickName(int index, const JOYC ...@@ -432,6 +434,8 @@ irr::core::stringc SJoystickWin32Control::findJoystickName(int index, const JOYC
RegCloseKey(hKey); RegCloseKey(hKey);
return result; return result;
#endif
return "";
} }
bool SJoystickWin32Control::activateJoysticks(core::array<SJoystickInfo> & joystickInfo) bool SJoystickWin32Control::activateJoysticks(core::array<SJoystickInfo> & joystickInfo)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment