summaryrefslogtreecommitdiffhomepage
path: root/dinput
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2016-08-22 13:28:32 +0200
committerStanislaw Halik <sthalik@misaki.pl>2016-08-23 00:05:15 +0200
commitc7141ac16c4da3b1ef7bb0a2f1b199be7834b354 (patch)
treefa4f5def549d4e106058028e2f19f8a51a17e3c0 /dinput
parent67a293879286999e0289853bc0d7a26e75f6b909 (diff)
dinput: it's win32-only so don't guard
Diffstat (limited to 'dinput')
-rw-r--r--dinput/dinput.cpp4
-rw-r--r--dinput/dinput.hpp11
2 files changed, 5 insertions, 10 deletions
diff --git a/dinput/dinput.cpp b/dinput/dinput.cpp
index 138cac71..1a61ce62 100644
--- a/dinput/dinput.cpp
+++ b/dinput/dinput.cpp
@@ -1,5 +1,3 @@
-#ifdef _WIN32
-
#include "dinput.hpp"
#include "compat/win32-com.hpp"
#include <QDebug>
@@ -89,5 +87,3 @@ dinput_handle::di_t::~di_t()
if (handle)
unref_di();
}
-
-#endif
diff --git a/dinput/dinput.hpp b/dinput/dinput.hpp
index 59873527..0f737ca5 100644
--- a/dinput/dinput.hpp
+++ b/dinput/dinput.hpp
@@ -8,16 +8,17 @@
#pragma once
-#ifdef _WIN32
-
#include "export.hpp"
+#ifdef Q_MOC_RUN
+typedef void* LPDIRECTINPUT8;
+#else
#ifndef DIRECTINPUT_VERSION
# define DIRECTINPUT_VERSION 0x800
-#endif
#include <dinput.h>
-
+#endif
#include <atomic>
+#endif
class OPENTRACK_DINPUT_EXPORT dinput_handle final
{
@@ -53,5 +54,3 @@ public:
static di_t make_di();
dinput_handle() = delete;
};
-
-#endif