From aa52f960c8e2137c67620f3497248fffe100ef56 Mon Sep 17 00:00:00 2001
From: David Guillen Fandos <david@davidgf.net>
Date: Sat, 6 Nov 2021 12:32:20 +0100
Subject: [PATCH] Fix Makefile arch detection support

x86/64 detection only enabled for unix platforms, since other platforms
have hardcoded rules (including windows).
---
 Makefile | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 6d47bf6..65796cf 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@ else ifneq ($(findstring win,$(shell uname -s)),)
 endif
 endif
 
-
+ifeq ($(platform), unix)
 ifeq ($(firstword $(filter x86_64,$(UNAME))),x86_64)
 	HAVE_DYNAREC := 1
 	CPU_ARCH := x86_32
@@ -31,6 +31,7 @@ else ifeq ($(firstword $(filter x86,$(UNAME))),x86)
 	HAVE_DYNAREC := 1
 	CPU_ARCH := x86_32
 endif
+endif
 
 FORCE_32BIT :=
 
@@ -463,10 +464,11 @@ else
 	CC ?= gcc
 	SHARED := -shared -static-libgcc -static-libstdc++ -s -Wl,--version-script=link.T
 	CFLAGS += -D__WIN32__ -D__WIN32_LIBRETRO__
-	ifeq ($(HAVE_DYNAREC),1)
-		MMAP_JIT_CACHE = 1
-	endif
 
+	# Windows32/64 has dynarec support
+	HAVE_DYNAREC := 1
+	CPU_ARCH := x86_32
+	MMAP_JIT_CACHE = 1
 endif
 
 ifeq ($(MMAP_JIT_CACHE), 1)