From c7141ac16c4da3b1ef7bb0a2f1b199be7834b354 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Mon, 22 Aug 2016 13:28:32 +0200 Subject: dinput: it's win32-only so don't guard --- dinput/dinput.cpp | 4 ---- dinput/dinput.hpp | 11 +++++------ 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 @@ -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 - +#endif #include +#endif class OPENTRACK_DINPUT_EXPORT dinput_handle final { @@ -53,5 +54,3 @@ public: static di_t make_di(); dinput_handle() = delete; }; - -#endif -- cgit v1.2.3