claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix target architecture checks

Browse Source
This commit is contained in:
David Hrdlička
2020-12-16 20:32:56 +01:00
parent fd554cbcbc
commit 53144ed8ec
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/codegen/codegen_ops.c
View File

@@ -15,9 +15,9 @@
#include "codegen.h" #include "codegen.h"
#include "codegen_ops.h" #include "codegen_ops.h"
#ifdef __amd64__ #if defined __amd64__ || defined _M_X64
#include "codegen_ops_x86-64.h" #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" #include "codegen_ops_x86.h"
#endif #endif

6
src/codegen_new/codegen_backend.h
View File

@@ -1,13 +1,13 @@
#ifndef _CODEGEN_BACKEND_H_ #ifndef _CODEGEN_BACKEND_H_
#define _CODEGEN_BACKEND_H_ #define _CODEGEN_BACKEND_H_
#if defined __amd64__ #if defined __amd64__ || defined _M_X64
#include "codegen_backend_x86-64.h" #include "codegen_backend_x86-64.h"
#elif defined i386 || defined __i386 || defined __i386__ || defined _X86_ || defined _M_IX86 #elif defined i386 || defined __i386 || defined __i386__ || defined _X86_ || defined _M_IX86
#include "codegen_backend_x86.h" #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" #include "codegen_backend_arm.h"
#elif defined __aarch64__ #elif defined __aarch64__ || defined _M_ARM64
#include "codegen_backend_arm64.h" #include "codegen_backend_arm64.h"
#else #else
#error Dynamic recompiler not implemented on your platform #error Dynamic recompiler not implemented on your platform

2
src/include/86box/vid_voodoo_render.h
View File

@@ -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 #define NO_CODEGEN
#endif #endif

2
src/sound/resid-fp/sid.cc
View File

@@ -29,7 +29,7 @@ enum host_cpu_feature {
}; };
/* This code is appropriate for 32-bit and 64-bit x86 CPUs. */ /* 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 { struct cpu_x86_regs_s {
unsigned int eax; unsigned int eax;

4
src/video/vid_voodoo_render.c
View File

@@ -684,9 +684,9 @@ static inline void voodoo_tmu_fetch_and_blend(voodoo_t *voodoo, voodoo_params_t
state->tex_a[0] ^= 0xff; 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> #include <86box/vid_voodoo_codegen_x86.h>
#elif (defined __amd64__) #elif (defined __amd64__ || defined _M_X64)
#include <86box/vid_voodoo_codegen_x86-64.h> #include <86box/vid_voodoo_codegen_x86-64.h>
#else #else
int voodoo_recomp = 0; int voodoo_recomp = 0;