Merge branch 'master' into sewer_beta

2 years ago · 41827d215f
1 changed files with 4 additions and 1 deletions
--- a/cl_dll/input_mouse.h
+++ b/cl_dll/input_mouse.h
@ -1,4 +1,7 @@
				@@ -1,4 +1,7 @@
 #pragma once
+
+#include "build.h"
+
 #if !defined(INPUT_MOUSE_H)
 #define INPUT_MOUSE_H
 #include "cl_dll.h"
@ -45,7 +48,7 @@ protected:
				@@ -45,7 +48,7 @@ protected:
 };

 // No need for goldsource input support on the platforms that are not supported by GoldSource.
-#if GOLDSOURCE_SUPPORT && (_WIN32 || __linux__ || __APPLE__) && (__i386 || _M_IX86)
+#if GOLDSOURCE_SUPPORT && ( XASH_WIN32 || ( XASH_LINUX && !XASH_ANDROID ) || XASH_APPLE ) && XASH_X86
 #define SUPPORT_GOLDSOURCE_INPUT	1

 #if _WIN32