- fixed: INPUT_XInput must also be available when compiling without XInput support so that the corresponding JoyDevice can be accessed.

src/win32/i_input.h

@@ -47,6 +47,15 @@ FString I_GetFromClipboard (bool windows_has_no_selection_clipboard);
 
 void I_GetEvent();
 
+enum
+{
+	INPUT_DIJoy,
+	INPUT_XInput,
+	INPUT_RawPS2,
+	NUM_JOYDEVICES
+};
+
+
 #ifdef USE_WINDOWS_DWORD
 #include "m_joy.h"
 
@@ -121,14 +130,6 @@ public:
 	virtual IJoystickConfig *Rescan() = 0;
 };
 
-enum
-{
-	INPUT_DIJoy,
-	INPUT_XInput,
-	INPUT_RawPS2,
-	NUM_JOYDEVICES
-};
-
 extern FJoystickCollection *JoyDevices[NUM_JOYDEVICES];
 
 void I_StartupMouse();

src/win32/i_xinput.cpp

@@ -789,6 +789,8 @@ void I_StartupXInput()
 
 #else	// NO_XINPUT
 
+#include "i_input.h"
+
 void I_StartupXInput()
 {
 	JoyDevices[INPUT_XInput] = NULL;