Merge pull request #6162 from aliaspider/master

(msvc) support msvc's Predefined Macros in features_cpu.c
This commit is contained in:
Twinaphex 2018-01-23 19:38:35 +01:00 committed by GitHub
commit b8da3d0e9f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions

View File

@ -108,7 +108,8 @@ export PATH := $(PATH)
#$(info PATH : $(PATH))
#$(error end)
ifeq ($(TARGET_ARCH),x64)
DEFINES += -D__SSE__ -D__SSE2__
ifeq ($(TARGET_ARCH2),x64)
DEFINES += -D__x86_64__
else
#DEFINES += -D__i686__

View File

@ -243,7 +243,7 @@ retro_time_t cpu_features_get_time_usec(void)
#endif
}
#if defined(__x86_64__) || defined(__i386__) || defined(__i486__) || defined(__i686__)
#if defined(__x86_64__) || defined(__i386__) || defined(__i486__) || defined(__i686__) || defined(_M_X64) || defined(_M_IX86)
#define CPU_X86
#endif