From e481697ea6e156e456f3d51ba7c816ad4a908792 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Sun, 15 Sep 2013 16:00:25 +0200
Subject: Fix mingw-w64 cross-compile from Linux

Case-sensitivity and MSVC-isms bite again.
---
 ftnoir_protocol_vjoy/ftnoir_protocol_vjoy.h | 31 +++++++++++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

(limited to 'ftnoir_protocol_vjoy')

diff --git a/ftnoir_protocol_vjoy/ftnoir_protocol_vjoy.h b/ftnoir_protocol_vjoy/ftnoir_protocol_vjoy.h
index 5c260d2e..30d89572 100644
--- a/ftnoir_protocol_vjoy/ftnoir_protocol_vjoy.h
+++ b/ftnoir_protocol_vjoy/ftnoir_protocol_vjoy.h
@@ -28,8 +28,8 @@
 #pragma once
 #include "ftnoir_protocol_base/ftnoir_protocol_base.h"
 #include "ui_ftnoir_vjoy_controls.h"
-#include <Windows.h>
-#include <VJoy.h>
+#include <windows.h>
+
 #include <QThread>
 #include <QUdpSocket>
 #include <QMessageBox>
@@ -92,3 +92,30 @@ public:
 
     void getIcon(QIcon *icon) { *icon = QIcon(":/images/vjoy.png"); }
 };
+
+#define VJOY_AXIS_MIN   -32768
+#define VJOY_AXIS_NIL   0
+#define VJOY_AXIS_MAX   32767
+
+#include <pshpack1.h>
+
+typedef struct _JOYSTICK_STATE
+{
+        UCHAR ReportId;                         // Report Id
+        SHORT XAxis;                            // X Axis
+        SHORT YAxis;                            // Y Axis
+        SHORT ZAxis;                            // Z Axis
+        SHORT XRotation;                        // X Rotation
+        SHORT YRotation;                        // Y Rotation
+        SHORT ZRotation;                        // Z Rotation
+        SHORT Slider;                           // Slider
+        SHORT Dial;                                     // Dial
+        USHORT POV;                                     // POV
+        UINT32 Buttons;                         // 32 Buttons
+} JOYSTICK_STATE, * PJOYSTICK_STATE;
+
+#include <poppack.h>
+
+extern "C" BOOL __stdcall VJoy_Initialize(PCHAR name, PCHAR serial);
+extern "C" VOID __stdcall VJoy_Shutdown();
+extern "C" BOOL __stdcall VJoy_UpdateJoyState(int id, PJOYSTICK_STATE pJoyState);
-- 
cgit v1.2.3