summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--opentrack-dinput/keybinding-worker.hpp5
-rw-r--r--opentrack-dinput/win32-joystick.hpp7
-rw-r--r--opentrack-logic/win32-shortcuts.cpp1
3 files changed, 7 insertions, 6 deletions
diff --git a/opentrack-dinput/keybinding-worker.hpp b/opentrack-dinput/keybinding-worker.hpp
index 439d2066..c0d61c2f 100644
--- a/opentrack-dinput/keybinding-worker.hpp
+++ b/opentrack-dinput/keybinding-worker.hpp
@@ -20,11 +20,6 @@
#include <functional>
#include <vector>
-#undef DIRECTINPUT_VERSION
-#define DIRECTINPUT_VERSION 0x0800
-#include <windows.h>
-#include <dinput.h>
-
struct OPENTRACK_DINPUT_EXPORT Key
{
BYTE keycode;
diff --git a/opentrack-dinput/win32-joystick.hpp b/opentrack-dinput/win32-joystick.hpp
index c4fcdde2..a69ec765 100644
--- a/opentrack-dinput/win32-joystick.hpp
+++ b/opentrack-dinput/win32-joystick.hpp
@@ -1,3 +1,10 @@
+/* Copyright (c) 2015-2016, Stanislaw Halik <sthalik@misaki.pl>
+
+ * Permission to use, copy, modify, and/or distribute this
+ * software for any purpose with or without fee is hereby granted,
+ * provided that the above copyright notice and this permission
+ * notice appear in all copies.
+ */
#pragma once
#ifdef _WIN32
diff --git a/opentrack-logic/win32-shortcuts.cpp b/opentrack-logic/win32-shortcuts.cpp
index 5c19cad7..df9145a0 100644
--- a/opentrack-logic/win32-shortcuts.cpp
+++ b/opentrack-logic/win32-shortcuts.cpp
@@ -10,7 +10,6 @@
# ifndef DIRECTINPUT_VERSION
# define DIRECTINPUT_VERSION 0x800
# endif
-# include <windows.h>
# include <dinput.h>
#include "win32-shortcuts.h"