From 53144ed8ecd32812e884d226ac7949a648de5139 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Hrdli=C4=8Dka?= <dhrdlicka@users.noreply.github.com>
Date: Wed, 16 Dec 2020 20:32:56 +0100
Subject: [PATCH] fix target architecture checks

---
 src/codegen/codegen_ops.c             | 4 ++--
 src/codegen_new/codegen_backend.h     | 6 +++---
 src/include/86box/vid_voodoo_render.h | 2 +-
 src/sound/resid-fp/sid.cc             | 2 +-
 src/video/vid_voodoo_render.c         | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/codegen/codegen_ops.c b/src/codegen/codegen_ops.c
index d1410346f..e398ad16a 100644
--- a/src/codegen/codegen_ops.c
+++ b/src/codegen/codegen_ops.c
@@ -15,9 +15,9 @@
 #include "codegen.h"
 #include "codegen_ops.h"
 
-#ifdef __amd64__
+#if defined __amd64__ || defined _M_X64
 #include "codegen_ops_x86-64.h"
-#elif defined i386 || defined __i386 || defined __i386__ || defined _X86_ || defined _M_IX86 || defined _M_X64
+#elif defined i386 || defined __i386 || defined __i386__ || defined _X86_ || defined _M_IX86
 #include "codegen_ops_x86.h"
 #endif
 
diff --git a/src/codegen_new/codegen_backend.h b/src/codegen_new/codegen_backend.h
index 931939004..56884c84b 100644
--- a/src/codegen_new/codegen_backend.h
+++ b/src/codegen_new/codegen_backend.h
@@ -1,13 +1,13 @@
 #ifndef _CODEGEN_BACKEND_H_
 #define _CODEGEN_BACKEND_H_
 
-#if defined __amd64__
+#if defined __amd64__ || defined _M_X64
 #include "codegen_backend_x86-64.h"
 #elif defined i386 || defined __i386 || defined __i386__ || defined _X86_ || defined _M_IX86
 #include "codegen_backend_x86.h"
-#elif defined __ARM_EABI__ || defined _ARM_
+#elif defined __ARM_EABI__ || defined _ARM_ || defined _M_ARM
 #include "codegen_backend_arm.h"
-#elif defined __aarch64__
+#elif defined __aarch64__ || defined _M_ARM64
 #include "codegen_backend_arm64.h"
 #else
 #error Dynamic recompiler not implemented on your platform
diff --git a/src/include/86box/vid_voodoo_render.h b/src/include/86box/vid_voodoo_render.h
index 1cb74fa5f..4596c59bb 100644
--- a/src/include/86box/vid_voodoo_render.h
+++ b/src/include/86box/vid_voodoo_render.h
@@ -1,4 +1,4 @@
-#if !(defined i386 || defined __i386 || defined __i386__ || defined _X86_ || defined WIN32 || defined _WIN32 || defined _WIN32) && !(defined __amd64__)
+#if !(defined i386 || defined __i386 || defined __i386__ || defined _X86_ || defined _M_IX86 || defined __amd64__ || defined _M_X64)
 #define NO_CODEGEN
 #endif
 
diff --git a/src/sound/resid-fp/sid.cc b/src/sound/resid-fp/sid.cc
index 431d5712d..158a76a69 100644
--- a/src/sound/resid-fp/sid.cc
+++ b/src/sound/resid-fp/sid.cc
@@ -29,7 +29,7 @@ enum host_cpu_feature {
 };
 
 /* This code is appropriate for 32-bit and 64-bit x86 CPUs. */
-#if defined(__x86_64__) || defined(__i386__) || defined(_MSC_VER)
+#if defined(__x86_64__) || defined(__i386__) || defined(_M_IX86) || defined(_M_X64)
 
 struct cpu_x86_regs_s {
   unsigned int eax;
diff --git a/src/video/vid_voodoo_render.c b/src/video/vid_voodoo_render.c
index 2d7b260d6..0637881f9 100644
--- a/src/video/vid_voodoo_render.c
+++ b/src/video/vid_voodoo_render.c
@@ -684,9 +684,9 @@ static inline void voodoo_tmu_fetch_and_blend(voodoo_t *voodoo, voodoo_params_t
                 state->tex_a[0] ^= 0xff;
 }
 
-#if (defined i386 || defined __i386 || defined __i386__ || defined _X86_ || defined WIN32 || defined _WIN32 || defined _WIN32) && !(defined __amd64__)
+#if (defined i386 || defined __i386 || defined __i386__ || defined _X86_ || defined _M_IX86) && !(defined __amd64__ || defined _M_X64)
 #include <86box/vid_voodoo_codegen_x86.h>
-#elif (defined __amd64__)
+#elif (defined __amd64__ || defined _M_X64)
 #include <86box/vid_voodoo_codegen_x86-64.h>
 #else
 int voodoo_recomp = 0;