summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2013-09-19 18:08:04 +0200
committerStanislaw Halik <sthalik@misaki.pl>2013-09-19 18:08:04 +0200
commit65229f5ad8ce2c8e999b0cf181c11383b0a9effb (patch)
tree632cb73b6b39f9cb6f43fd090c0d988f6d2cddfe
parent2a3dc6a351d4fcd04e50a957b23e638ffa4bea46 (diff)
don't redefine dinput version that much
-rw-r--r--facetracknoir/global-shortcuts.cpp8
-rw-r--r--facetracknoir/shortcuts.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/facetracknoir/global-shortcuts.cpp b/facetracknoir/global-shortcuts.cpp
index e96530ae..1c10b160 100644
--- a/facetracknoir/global-shortcuts.cpp
+++ b/facetracknoir/global-shortcuts.cpp
@@ -1,9 +1,11 @@
#include "facetracknoir/facetracknoir.h"
#if defined(_WIN32)
-#include <windows.h>
-#define DIRECTINPUT_VERSION 0x800
-#include <dinput.h>
+# ifndef DIRECTINPUT_VERSION
+# define DIRECTINPUT_VERSION 0x800
+# endif
+# include <windows.h>
+# include <dinput.h>
QList<int> global_windows_key_sequences =
QList<int>()
diff --git a/facetracknoir/shortcuts.h b/facetracknoir/shortcuts.h
index 685c78b6..05c36520 100644
--- a/facetracknoir/shortcuts.h
+++ b/facetracknoir/shortcuts.h
@@ -39,8 +39,6 @@ extern QList<int> global_windows_key_sequences;
# undef DIRECTINPUT_VERSION
# define DIRECTINPUT_VERSION 0x0800
# include <windows.h>
-# undef DIRECTINPUT_VERSION
-# define DIRECTINPUT_VERSION 0x0800
# include <dinput.h>
struct Key {