summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorFire_Head <Fire-Head@users.noreply.github.com>2020-04-23 10:50:06 +0200
committerGitHub <noreply@github.com>2020-04-23 10:50:06 +0200
commitff46dc1c6c5a9e8a42ba9f5ac5f1e7a5b7408cc2 (patch)
treed461c5aca74e9679ec87d1e3d70a5e674a57ee21 /src/core
parentfix #ifdef (diff)
parentMerge pull request #482 from withmorten/master (diff)
downloadre3-ff46dc1c6c5a9e8a42ba9f5ac5f1e7a5b7408cc2.tar
re3-ff46dc1c6c5a9e8a42ba9f5ac5f1e7a5b7408cc2.tar.gz
re3-ff46dc1c6c5a9e8a42ba9f5ac5f1e7a5b7408cc2.tar.bz2
re3-ff46dc1c6c5a9e8a42ba9f5ac5f1e7a5b7408cc2.tar.lz
re3-ff46dc1c6c5a9e8a42ba9f5ac5f1e7a5b7408cc2.tar.xz
re3-ff46dc1c6c5a9e8a42ba9f5ac5f1e7a5b7408cc2.tar.zst
re3-ff46dc1c6c5a9e8a42ba9f5ac5f1e7a5b7408cc2.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/CdStream.cpp2
-rw-r--r--src/core/Game.cpp2
-rw-r--r--src/core/Timer.cpp2
-rw-r--r--src/core/re3.cpp2
4 files changed, 3 insertions, 5 deletions
diff --git a/src/core/CdStream.cpp b/src/core/CdStream.cpp
index 1ab1c8b0..ea79fb9a 100644
--- a/src/core/CdStream.cpp
+++ b/src/core/CdStream.cpp
@@ -1,4 +1,4 @@
-#include <windows.h>
+#define WITHWINDOWS
#include "common.h"
#include "CdStream.h"
diff --git a/src/core/Game.cpp b/src/core/Game.cpp
index 6f3eee29..bfe6eee3 100644
--- a/src/core/Game.cpp
+++ b/src/core/Game.cpp
@@ -1,7 +1,5 @@
#pragma warning( push )
#pragma warning( disable : 4005)
-#define DIRECTINPUT_VERSION 0x0800
-#include <dinput.h>
#pragma warning( pop )
#include "common.h"
#include "win.h"
diff --git a/src/core/Timer.cpp b/src/core/Timer.cpp
index 8f8570d7..aca7c1dc 100644
--- a/src/core/Timer.cpp
+++ b/src/core/Timer.cpp
@@ -1,4 +1,4 @@
-#include <windows.h>
+#define WITHWINDOWS
#include "common.h"
#include "DMAudio.h"
diff --git a/src/core/re3.cpp b/src/core/re3.cpp
index 3c2bc31f..4cec5773 100644
--- a/src/core/re3.cpp
+++ b/src/core/re3.cpp
@@ -1,6 +1,6 @@
#include <direct.h>
#include <csignal>
-#include <windows.h>
+#define WITHWINDOWS
#include "common.h"
#include "patcher.h"
#include "Renderer.h"