Add basic joystick support on Windows and Linux, with an option to compile it...

Add basic joystick support on Windows and Linux, with an option to compile it out.  winmm added to all .dsp/.vcproj/.dev projects.  Example 04.Movement updated to demonstrate the functionality.  Tested with 1 USB joypad on WinXP and Ubuntu 8.04 (via VmWare).

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1687 dfc29bdd-3216-0410-991c-e03cc46cb475

examples/04.Movement/main.cpp

@@ -2,20 +2,23 @@
 
 This Tutorial shows how to move and animate SceneNodes. The
 basic concept of SceneNodeAnimators is shown as well as manual
-movement of nodes using the keyboard.
+movement of nodes using the keyboard and (optionally) the first
+connected joystick/joypad.
 
 As always, I include the header files, use the irr namespace,
 and tell the linker to link with the .lib file.
 */
+#ifdef _MSC_VER
+// We'll also define this to stop MSVC complaining about sprintf().
+#define _CRT_SECURE_NO_WARNINGS
+#pragma comment(lib, "Irrlicht.lib")
+#endif
+
 #include <irrlicht.h>
 #include <iostream>
 
 using namespace irr;
 
-#ifdef _MSC_VER
-#pragma comment(lib, "Irrlicht.lib")
-#endif
-
 /*
 To receive events like mouse and keyboard input, or GUI events like "the OK
 button has been clicked", we need an object which is derived from the
@@ -23,6 +26,8 @@ irr::IEventReceiver object. There is only one method to override:
 irr::IEventReceiver::OnEvent(). This method will be called by the engine once
 when an event happens. What we really want to know is whether a key is being
 held down, and so we will remember the current state of each key.
+If we receive a joystick event for the first joystick (joystick 0) we will
+remember both the data, and the fact that we received it.
 */
 class MyEventReceiver : public IEventReceiver
 {
@@ -34,6 +39,17 @@ public:
 		if (event.EventType == irr::EET_KEY_INPUT_EVENT)
 			KeyIsDown[event.KeyInput.Key] = event.KeyInput.PressedDown;
 
+		// The state of each connected joystick is sent to us
+		// once every run() of the Irrlicht device.  Store the
+		// state of the first joystick, ignoring other joysticks.
+		// This is currently only supported on Windows and Linux.
+		if (event.EventType == irr::EET_JOYSTICK_INPUT_EVENT
+			&& event.JoystickEvent.Joystick == 0)
+		{
+			NewJoystickDataAvailable = true;
+			JoystickData = event.JoystickEvent;
+		}
+
 		return false;
 	}
 
@@ -43,15 +59,31 @@ public:
 		return KeyIsDown[keyCode];
 	}
 	
+	bool IsNewJoystickDataAvailable(void) const
+	{
+		return NewJoystickDataAvailable;
+	}
+
+	const SEvent::SJoystickEvent & GetJoystickData(void) const
+	{
+		NewJoystickDataAvailable = false;
+		return JoystickData;
+	}
+
 	MyEventReceiver()
 	{
 		for (u32 i=0; i<KEY_KEY_CODES_COUNT; ++i)
 			KeyIsDown[i] = false;
+
+		NewJoystickDataAvailable = false;
 	}
 
 private:
 	// We use this array to store the current state of each key
 	bool KeyIsDown[KEY_KEY_CODES_COUNT];
+
+	SEvent::SJoystickEvent JoystickData;
+	mutable bool NewJoystickDataAvailable;
 };
 
 
@@ -192,7 +224,11 @@ int main()
 	*/
 	device->getGUIEnvironment()->addImage(
 		driver->getTexture("../../media/irrlichtlogoalpha2.tga"),
-		core::position2d<s32>(10,10));
+		core::position2d<s32>(10,20));
+
+	gui::IGUIStaticText* diagnostics = device->getGUIEnvironment()->addStaticText(
+		L"", core::rect<s32>(10, 10, 400, 20));
+	diagnostics->setOverrideColor(video::SColor(255, 255, 255, 0));
 
 	/*
 	We have done everything, so lets draw it. We also write the current
@@ -203,21 +239,85 @@ int main()
 
 	while(device->run())
 	{
-		/* Check if key W or key S is being held down, and move the
-		sphere node up or down respectively.
-		*/
-		if(receiver.IsKeyDown(irr::KEY_KEY_W))
+		f32 moveHorizontal = 0.f; // Range is -1.f for full left to +1.f for full right
+		f32 moveVertical = 0.f; // -1.f for full down to +1.f for full up.
+
+		if(receiver.IsNewJoystickDataAvailable())
 		{
-			core::vector3df v = node->getPosition();
-			v.Y += 0.02f;
-			node->setPosition(v);
+			const SEvent::SJoystickEvent & joystickData 
+				= receiver.GetJoystickData();
+
+			// Use the analog range of the axes, and a 5% dead zone
+			moveHorizontal = 
+				(f32)joystickData.Axis[SEvent::SJoystickEvent::AXIS_X] / 32767.f;
+			if(fabs(moveHorizontal) < 0.05f)
+				moveHorizontal = 0.f;
+
+			// The Y axis has its origin at the top and goes +ve downwards,
+			// but we want to reverse those directions for our movement.
+			moveVertical = 
+				(f32)joystickData.Axis[SEvent::SJoystickEvent::AXIS_Y] / -32767.f;
+			if(fabs(moveVertical) < 0.05f)
+				moveVertical = 0.f;
+
+			// The explicit POV hat info is only currently supported on Windows; 
+			// on Linux the POV hat info is sent as two axes instead.
+			const u16 povDegrees = joystickData.POV / 100;
+			if(povDegrees < 360)
+			{
+				if(povDegrees > 0 && povDegrees < 180)
+					moveHorizontal = 1.f;
+				else if(povDegrees > 180)
+					moveHorizontal = -1.f;
+
+				if(povDegrees > 90 && povDegrees < 270)
+					moveVertical = -1.f;
+				else if(povDegrees > 270 || povDegrees < 90)
+					moveVertical = +1.f;
 			}
-		else if(receiver.IsKeyDown(irr::KEY_KEY_S))
+
+			char diagnosticsText[256];
+
+			sprintf(diagnosticsText, "X=%d Y=%d Z=%d R=%d U=%d V=%d POV=%d Buttons: ",
+					joystickData.Axis[SEvent::SJoystickEvent::AXIS_X],
+					joystickData.Axis[SEvent::SJoystickEvent::AXIS_Y],
+					joystickData.Axis[SEvent::SJoystickEvent::AXIS_Z],
+					joystickData.Axis[SEvent::SJoystickEvent::AXIS_R],
+					joystickData.Axis[SEvent::SJoystickEvent::AXIS_U],
+					joystickData.Axis[SEvent::SJoystickEvent::AXIS_V],
+					joystickData.POV);
+
+			for(u32 button = 0;
+				button < SEvent::SJoystickEvent::NUMBER_OF_BUTTONS;
+				++button)
+				if(joystickData.IsButtonPressed(button))
 				{
+					char buttonText[4];
+					sprintf(buttonText, "%d ", button);
+					strcat(diagnosticsText, buttonText);
+				}
+
+			diagnostics->setText(core::stringw(diagnosticsText).c_str());
+		}
+
+		/* Check if keys W,S,A or S are being held down, and move the
+		sphere node accordingly.
+		*/
+		if(receiver.IsKeyDown(irr::KEY_KEY_A))
+			moveHorizontal = -1.f;
+		else if(receiver.IsKeyDown(irr::KEY_KEY_D))
+			moveHorizontal = +1.f;
+
+		if(receiver.IsKeyDown(irr::KEY_KEY_W))
+			moveVertical = +1.f;
+		else if(receiver.IsKeyDown(irr::KEY_KEY_S))
+			moveVertical = -1.f;
+
+		// Now do the actual movement
 		core::vector3df v = node->getPosition();
-			v.Y -= 0.02f;
+		v.X += moveHorizontal * 0.02f;
+		v.Y += moveVertical * 0.02f;
 		node->setPosition(v);
-		}
 
 		driver->beginScene(true, true, video::SColor(255,113,113,133));
 

include/IEventReceiver.h

@@ -34,6 +34,16 @@ namespace irr
 		IrrlichtDevice::postEventFromUser. They take the same path as mouse events. */
 		EET_KEY_INPUT_EVENT,
 
+		//! A joystick (joypad, gamepad) input event.
+		/** Joystick events are created by polling all connected joysticks once per
+		device run() and then passing the events to IrrlichtDevice::postEventFromUser.
+		They take the same path as mouse events.
+		Windows: Implemented.
+		Linux: Implemented, with POV hat issues.
+		MacOS / Other: Not yet implemented.
+		*/
+		EET_JOYSTICK_INPUT_EVENT, 
+
 		//! A log event
 		/** Log events are only passed to the user receiver if there is one. If they are absorbed by the
 		user receiver then no text will be sent to the console. */
@@ -229,6 +239,64 @@ struct SEvent
 		bool Control;
 	};
 
+	//! A joystick event.
+	/** Unlike other events, joystick events represent the result of polling 
+	 * each connected joystick once per run() of the device. If 
+	 * _IRR_COMPILE_WITH_JOYSTICK_EVENTS_ is defined, an event of this type 
+	 * will be generated once per joystick per device run() regardless of 
+	 * whether the state of the joystick has actually changed. */
+	struct SJoystickEvent
+	{
+		enum
+		{
+			NUMBER_OF_BUTTONS = 32,
+
+			AXIS_X = 0, // e.g. analog stick 1 left to right
+			AXIS_Y,		// e.g. analog stick 1 top to bottom
+			AXIS_Z,		// e.g. throttle, or analog 2 stick 2 left to right
+			AXIS_R,		// e.g. rudder, or analog 2 stick 2 top to bottom
+			AXIS_U,
+			AXIS_V,
+			NUMBER_OF_AXES
+		};
+
+		/** A bitmap of button states.  You can use IsButtonPressed() to
+		 ( check the state of each button from 0 to (NUMBER_OF_BUTTONS - 1) */
+		u32 ButtonStates;
+
+		/** For AXIS_X, AXIS_Y, AXIS_Z, AXIS_R, AXIS_U and AXIS_V
+		 * Values are in the range -32768 to 32767, with 0 representing
+		 * the center position. You will usually want to add a dead 
+		 * zone around this center range. Axes not supported by this
+		 * joystick will always have a value of 0.
+		 * On Linux, POV hats are represented as axes, usually the 
+		 * last two active axis.
+		 */
+		s16 Axis[NUMBER_OF_AXES];
+
+		/** The POV represents the angle of the POV hat in degrees * 100, 
+		 * from 0 to 35,900.  A value of 65535 indicates that the POV hat 
+		 * is centered (or not present).
+		 * This value is only supported on Windows.  On Linux, the POV hat
+		 * will be sent as 2 axes instead. */
+		u16 POV;
+
+		//! The ID of the joystick which generated this event.
+		/** This is an internal Irrlicht index; it does not map directly
+		 * to any particular hardware joystick. */
+		u8 Joystick;
+
+		//! A helper function to check if a button is pressed.
+		bool IsButtonPressed(u32 button) const
+		{
+			if(button >= (u32)NUMBER_OF_BUTTONS)
+				return false;
+
+			return (ButtonStates & (1 << button)) ? true : false;
+		}
+	};
+ 
+
 	//! Any kind of log event.
 	struct SLogEvent
 	{
@@ -255,6 +323,7 @@ struct SEvent
 		struct SGUIEvent GUIEvent;
 		struct SMouseInput MouseInput;
 		struct SKeyInput KeyInput;
+		struct SJoystickEvent JoystickEvent;
 		struct SLogEvent LogEvent;
 		struct SUserEvent UserEvent;
 	};

include/IrrCompileConfig.h

@@ -352,6 +352,9 @@ precision will be lower but speed higher. currently X86 only
 	#define BURNINGVIDEO_RENDERER_CE
 #endif
 
+//! Define _IRR_COMPILE_WITH_JOYSTICK_SUPPORT_ if you want joystick events.
+#define _IRR_COMPILE_WITH_JOYSTICK_EVENTS_
+
 #endif // __IRR_COMPILE_CONFIG_H_INCLUDED__
 
 

source/Irrlicht/CGUIListBox.cpp

@@ -405,6 +405,7 @@ bool CGUIListBox::OnEvent(const SEvent& event)
 			break;
 		case EET_LOG_TEXT_EVENT:
 		case EET_USER_EVENT:
+		case EET_JOYSTICK_INPUT_EVENT:
 		case EGUIET_FORCE_32_BIT:
 			break;
 		}

source/Irrlicht/CIrrDeviceLinux.cpp

@@ -20,6 +20,13 @@
 #include "SIrrCreationParameters.h"
 #include <X11/XKBlib.h>
 
+#if defined _IRR_COMPILE_WITH_JOYSTICK_EVENTS_
+#include <fcntl.h>
+#include <linux/joystick.h>
+#include <unistd.h>
+#endif // _IRR_COMPILE_WITH_JOYSTICK_EVENTS_
+
+
 namespace irr
 {
 	namespace video
@@ -92,6 +99,8 @@ CIrrDeviceLinux::CIrrDeviceLinux(const SIrrlichtCreationParameters& param)
 		return;
 
 	createGUIAndScene();
+
+	initialiseJoysticks(); 
 }
 
 
@@ -147,6 +156,14 @@ CIrrDeviceLinux::~CIrrDeviceLinux()
 		XFree(visual);
 
 #endif // #ifdef _IRR_COMPILE_WITH_X11_
+
+	for(u32 joystick = 0; joystick < ActiveJoysticks.size(); ++joystick)
+	{
+		if(ActiveJoysticks[joystick].fd >= 0)
+		{
+			close(ActiveJoysticks[joystick].fd);
+		}
+	}
 }
 
 
@@ -867,6 +884,9 @@ bool CIrrDeviceLinux::run()
 	}
 #endif //_IRR_COMPILE_WITH_X11_
 
+	if(!Close)
+		pollJoysticks();
+
 	return !Close;
 }
 
@@ -1316,6 +1336,96 @@ void CIrrDeviceLinux::createKeyMap()
 }
 
 
+void CIrrDeviceLinux::initialiseJoysticks()
+{
+#if defined _IRR_COMPILE_WITH_JOYSTICK_EVENTS_
+	u32 joystick;
+	for(joystick = 0; joystick < 32; ++joystick)
+	{
+		// The joystick device could be here...
+		core::stringc devName = "/dev/js";
+		devName += joystick;
+
+		JoystickInfo info;
+
+		info.fd = open(devName.c_str(), O_RDONLY);
+		if(-1 == info.fd)
+		{
+			// ...but Ubuntu and possibly other distros 
+			// create the devices in /dev/input
+			devName = "/dev/input/js";
+			devName += joystick;
+			info.fd = open(devName.c_str(), O_RDONLY);
+		}
+
+		if(-1 == info.fd)
+			continue;
+
+		ioctl( info.fd, JSIOCGAXES, &(info.axes) );
+		ioctl( info.fd, JSIOCGBUTTONS, &(info.buttons) );
+
+		char logString[256];
+		(void)sprintf(logString, "Found joystick %d, %d axes, %d buttons, '",
+			joystick, info.axes, info.buttons);
+
+		ioctl( info.fd, JSIOCGNAME(80), logString + strlen(logString));
+		(void)strcat(logString, "'");
+		os::Printer::log(logString, ELL_INFORMATION);
+
+		fcntl( info.fd, F_SETFL, O_NONBLOCK );
+
+		(void)memset(&info.persistentData, 0, sizeof(info.persistentData));
+		info.persistentData.EventType = irr::EET_JOYSTICK_INPUT_EVENT;
+		info.persistentData.JoystickEvent.Joystick = ActiveJoysticks.size();
+
+		// There's no obvious way to determine which (if any) axes represent a POV
+		// hat, so we'll just set it to "not used" and forget about it.
+		info.persistentData.JoystickEvent.POV = 65535;
+
+		ActiveJoysticks.push_back(info);
+	}
+#endif // _IRR_COMPILE_WITH_JOYSTICK_EVENTS_
+}
+
+void CIrrDeviceLinux::pollJoysticks()
+{
+#if defined _IRR_COMPILE_WITH_JOYSTICK_EVENTS_
+	if(0 == ActiveJoysticks.size())
+		return;
+
+	u32 joystick;
+	for(joystick = 0; joystick < ActiveJoysticks.size(); ++joystick)
+	{
+		JoystickInfo & info =  ActiveJoysticks[joystick];
+
+		struct js_event event;
+		while(sizeof(event) == read(info.fd, &event, sizeof(event)))
+		{
+			switch(event.type & ~JS_EVENT_INIT)
+			{
+			case JS_EVENT_BUTTON:
+				if (event.value)
+	        			info.persistentData.JoystickEvent.ButtonStates |= (1 << event.number);
+	   			else
+	      				info.persistentData.JoystickEvent.ButtonStates &= ~(1 << event.number);
+				break;
+
+			case JS_EVENT_AXIS:
+				info.persistentData.JoystickEvent.Axis[event.number] = event.value;
+				break;
+
+			default:
+				break;
+			}
+		}
+
+		// Send an irrlict joystick event once per ::run() even if no new data were received.
+		(void)postEventFromUser(info.persistentData);
+	}
+#endif // _IRR_COMPILE_WITH_JOYSTICK_EVENTS_
+} 
+
+
 IRRLICHT_API IrrlichtDevice* IRRCALLCONV createDeviceEx(const SIrrlichtCreationParameters& param)
 {
 	CIrrDeviceLinux* dev = new CIrrDeviceLinux(param);

source/Irrlicht/CIrrDeviceLinux.h

@@ -99,6 +99,9 @@ namespace irr
 
 		void createKeyMap();
 
+		void initialiseJoysticks();
+		void pollJoysticks(); 
+
 		//! Implementation of the linux cursor control
 		class CCursorControl : public gui::ICursorControl
 		{
@@ -339,6 +342,18 @@ namespace irr
 		};
 
 		core::array<SKeyMap> KeyMap;
+
+		struct JoystickInfo
+		{
+			int	fd;
+			int	axes;
+			int	buttons;
+
+			SEvent persistentData;
+
+			JoystickInfo() : fd(-1), axes(0), buttons(0) { }
+		};
+		core::array<JoystickInfo> ActiveJoysticks;
 	};
 
 

source/Irrlicht/CIrrDeviceWin32.cpp

@@ -18,7 +18,6 @@
 #include <winuser.h>
 #include "irrlicht.h"
 
-
 namespace irr
 {
 	namespace video
@@ -406,6 +405,8 @@ CIrrDeviceWin32::CIrrDeviceWin32(const SIrrlichtCreationParameters& params)
 	// set this as active window
 	SetActiveWindow(HWnd);
 	SetForegroundWindow(HWnd);
+
+	initialiseJoysticks(); 
 }
 
 
@@ -550,6 +551,9 @@ bool CIrrDeviceWin32::run()
 	if (!quit)
 		resizeIfNecessary();
 
+	if(!quit)
+		pollJoysticks();
+
 	_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
 	return !quit;
 }
@@ -965,6 +969,101 @@ void CIrrDeviceWin32::setResizeAble(bool resize)
 }
 
 
+void CIrrDeviceWin32::initialiseJoysticks()
+{
+#if defined _IRR_COMPILE_WITH_JOYSTICK_EVENTS_
+	const u32 numberOfJoysticks = ::joyGetNumDevs();
+	JOYINFOEX info;
+	info.dwSize = sizeof(info);
+	info.dwFlags = JOY_RETURNALL;
+
+	JoystickInfo activeJoystick;
+
+	for(u32 joystick = 0; joystick < numberOfJoysticks; ++joystick)
+	{
+		if(JOYERR_NOERROR == joyGetPosEx(joystick, &info)
+			&&
+			JOYERR_NOERROR == joyGetDevCaps(joystick, 
+											&activeJoystick.Caps,
+											sizeof(activeJoystick.Caps)))
+		{
+			activeJoystick.Index = joystick;
+			ActiveJoysticks.push_back(activeJoystick);
+
+			char logString[256];
+			(void)sprintf(logString, "Found joystick %d, %d axes, %d buttons '%s'",
+				joystick, activeJoystick.Caps.wNumAxes, activeJoystick.Caps.wNumButtons,
+				activeJoystick.Caps.szPname);
+			os::Printer::log(logString, ELL_INFORMATION);
+		}
+	}
+#endif // _IRR_COMPILE_WITH_JOYSTICK_EVENTS_
+}
+
+void CIrrDeviceWin32::pollJoysticks()
+{
+#if defined _IRR_COMPILE_WITH_JOYSTICK_EVENTS_
+	if(0 == ActiveJoysticks.size())
+		return;
+
+	u32 joystick;
+	JOYINFOEX info;
+	info.dwSize = sizeof(info);
+	info.dwFlags = JOY_RETURNALL;
+
+	for(joystick = 0; joystick < ActiveJoysticks.size(); ++joystick)
+	{
+		if(JOYERR_NOERROR == joyGetPosEx(ActiveJoysticks[joystick].Index, &info))
+		{
+			SEvent event;
+			const JOYCAPS & caps = ActiveJoysticks[joystick].Caps;
+
+			event.EventType = irr::EET_JOYSTICK_INPUT_EVENT;
+			event.JoystickEvent.Joystick = joystick;
+
+			event.JoystickEvent.POV = (u16)info.dwPOV;
+			if(event.JoystickEvent.POV > 35900)
+				event.JoystickEvent.POV = 65535;
+
+			for(int axis = 0; axis < SEvent::SJoystickEvent::NUMBER_OF_AXES; ++axis)
+				event.JoystickEvent.Axis[axis] = 0;
+
+			switch(caps.wNumAxes)
+			{
+			default:
+			case 6:
+				event.JoystickEvent.Axis[SEvent::SJoystickEvent::AXIS_V] = 
+					(s16)((65535 * (info.dwVpos - caps.wVmin)) / (caps.wVmax - caps.wVmin) - 32768);
+
+			case 5:
+				event.JoystickEvent.Axis[SEvent::SJoystickEvent::AXIS_U] = 
+					(s16)((65535 * (info.dwUpos - caps.wUmin)) / (caps.wUmax - caps.wUmin) - 32768);
+
+			case 4:
+				event.JoystickEvent.Axis[SEvent::SJoystickEvent::AXIS_R] =
+					(s16)((65535 * (info.dwRpos - caps.wRmin)) / (caps.wRmax - caps.wRmin) - 32768);
+
+			case 3:
+				event.JoystickEvent.Axis[SEvent::SJoystickEvent::AXIS_Z] = 
+					(s16)((65535 * (info.dwZpos - caps.wZmin)) / (caps.wZmax - caps.wZmin) - 32768);
+			
+			case 2:
+				event.JoystickEvent.Axis[SEvent::SJoystickEvent::AXIS_Y] =
+					(s16)((65535 * (info.dwYpos - caps.wYmin)) / (caps.wYmax - caps.wYmin) - 32768);
+
+			case 1:
+				event.JoystickEvent.Axis[SEvent::SJoystickEvent::AXIS_X] = 
+					(s16)((65535 * (info.dwXpos - caps.wXmin)) / (caps.wXmax - caps.wXmin) - 32768);
+			}
+			
+			event.JoystickEvent.ButtonStates = info.dwButtons;
+
+			(void)postEventFromUser(event);
+		}
+	}
+#endif // _IRR_COMPILE_WITH_JOYSTICK_EVENTS_
+} 
+
 IRRLICHT_API IrrlichtDevice* IRRCALLCONV createDeviceEx(
 	const SIrrlichtCreationParameters& parameters)
 {

source/Irrlicht/CIrrDeviceWin32.h

@@ -15,6 +15,9 @@
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
+#include <mmsystem.h> // For JOYCAPS
+
+
 namespace irr
 {
 	class CIrrDeviceWin32 : public CIrrDeviceStub, video::IImagePresenter
@@ -242,6 +245,9 @@ namespace irr
 
 		void resizeIfNecessary();
 
+		void initialiseJoysticks();
+		void pollJoysticks(); 
+
 		HWND HWnd;
 
 		bool ChangedToFullScreen;
@@ -249,6 +255,13 @@ namespace irr
 		bool Resized;
 		bool ExternalWindow;
 		CCursorControl* Win32CursorControl;
+
+		struct JoystickInfo
+		{
+			u32		Index;
+			JOYCAPS Caps;
+		};
+		core::array<JoystickInfo> ActiveJoysticks;
 	};
 
 } // end namespace irr

source/Irrlicht/Irrlicht.dev

@@ -7,7 +7,7 @@ Type=3
 Compiler=-D__GNUWIN32__ -W -DWIN32 -DNDEBUG -D_WINDOWS -D_MBCS -D_USRDLL -DIRRLICHT_EXPORTS_@@_
 CppCompiler=-D__GNUWIN32__ -W -DWIN32 -DNDEBUG -D_WINDOWS -D_MBCS -D_USRDLL -DIRRLICHT_EXPORTS_@@_
 Includes=..\..\include;zlib
-Linker=-lkernel32 -luser32 -lgdi32 -lwinspool -lcomdlg32 -ladvapi32 -lshell32 -lole32 -loleaut32 -luuid -lopengl32_@@_
+Linker=-lkernel32 -luser32 -lgdi32 -lwinspool -lcomdlg32 -ladvapi32 -lshell32 -lole32 -loleaut32 -luuid -lwinmm -lopengl32_@@_
 Libs=
 UnitCount=605
 Folders=doc,gui_impl,include,include/core,include/gui,include/io,include/scene,include/video,io_impl,other_impl,other_impl/extern,other_impl/extern/jpeglib,other_impl/extern/libpng,other_impl/extern/zlib,scene_impl,scene_impl/animators,scene_impl/collision,scene_impl/mesh,scene_impl/mesh/loaders,scene_impl/mesh/writers,scene_impl/nodes,scene_impl/nodes/particles,video_impl,"video_impl/Burning Video",video_impl/DirectX8,video_impl/DirectX9,video_impl/Null,video_impl/OpenGL,video_impl/Software

source/Irrlicht/Irrlicht.dsp

@@ -53,8 +53,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /dll /machine:I386
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib winmm.lib w/nologo /dll /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib winmm.lib /nologo /dll /machine:I386
 
 !ELSEIF  "$(CFG)" == "Irrlicht - Win32 Debug"
 
@@ -80,8 +80,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
 
 !ENDIF 
 

source/Irrlicht/Irrlicht7.1.vcproj

@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib opengl32.lib"
+				AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib opengl32.lib winmm.lib"
 				OutputFile="..\..\bin\Win32-visualstudio\Irrlicht.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
@@ -111,7 +111,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib opengl32.lib"
+				AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib opengl32.lib winmm.lib"
 				OutputFile="..\..\bin\Win32-visualstudio\Irrlicht.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -185,7 +185,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib opengl32.lib"
+				AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib opengl32.lib winmm.lib"
 				OutputFile="..\..\bin\Win32-visualstudio\Irrlicht.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"

source/Irrlicht/Irrlicht8.0.vcproj

@@ -78,7 +78,7 @@
 				Name="VCLinkerTool"
 				UseLibraryDependencyInputs="true"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib opengl32.lib"
+				AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib opengl32.lib winmm.lib"
 				OutputFile="..\..\bin\Win32-visualstudio\Irrlicht.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
@@ -179,7 +179,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib opengl32.lib"
+				AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib opengl32.lib winmm.lib"
 				OutputFile="..\..\bin\Win32-visualstudio\Irrlicht.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
@@ -284,7 +284,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib opengl32.lib"
+				AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib opengl32.lib winmm.lib"
 				OutputFile="..\..\bin\Win32-visualstudio\Irrlicht.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"

source/Irrlicht/Irrlicht9.0.vcproj

@@ -79,7 +79,7 @@
 				Name="VCLinkerTool"
 				UseLibraryDependencyInputs="true"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib opengl32.lib"
+				AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib opengl32.lib winmm.lib"
 				OutputFile="..\..\bin\Win32-visualstudio\Irrlicht.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
@@ -179,7 +179,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib opengl32.lib"
+				AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib opengl32.lib winmm.lib"
 				OutputFile="..\..\bin\Win32-visualstudio\Irrlicht.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
@@ -285,7 +285,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib opengl32.lib"
+				AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib opengl32.lib winmm.lib"
 				OutputFile="..\..\bin\Win32-visualstudio\Irrlicht.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"

source/Irrlicht/Irrlicht_mobile6.vcproj

@@ -284,7 +284,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib opengl32.lib"
+				AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib opengl32.lib winmm.lib"
 				OutputFile="..\..\bin\Win32-visualstudio\Irrlicht.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"