libretro/mame2010-libretro
1
0
Fork 0
mirror of https://github.com/libretro/mame2010-libretro.git synced 2024-11-22 23:40:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Do away with ARM_ENABLED check - and make it compile on ARM64 mac

Browse Source
This commit is contained in:
twinaphex 2021-01-27 14:15:24 +01:00
parent 1549da1c32
commit 9314196b00
5 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -849,10 +849,6 @@ endif
# generic rules
#-------------------------------------------------
ifeq ($(ARM_ENABLED), 1)
CFLAGS += -DARM_ENABLED
endif
ifeq ($(X86_SH2DRC), 0)
CFLAGS += -DDISABLE_SH2DRC
endif

4
jni/Android.mk
View File

@ -38,10 +38,6 @@ COREFLAGS += -DCRLF=2 -DINLINE="static inline" -Wno-c++11-narrowing -Wno-reserve
# For testing only, remove before PR
COREFLAGS += -Wno-implicit-exception-spec-mismatch -Wno-inline-new-delete -Wno-tautological-undefined-compare
ifneq ($(filter $(TARGET_ARCH_ABI), armeabi-v7a arm64-v8a),)
COREFLAGS += -DARM_ENABLED
endif
GIT_VERSION ?= " $(shell git rev-parse --short HEAD || echo unknown)"
ifneq ($(GIT_VERSION)," unknown")
COREFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\"

3
src/osd/retro/osinline.h
View File

@ -35,8 +35,7 @@ empty
#endif
#if defined(ARM_ENABLED)
#if defined(__aarch64__) || defined(_M_ARM64) || defined(__arm__) || defined(_M_ARM)
#ifndef YieldProcessor
#define YieldProcessor() do {} while (0)
#define osd_yield_processor() YieldProcessor()

4
src/osd/retro/retroos.c
View File

@ -383,13 +383,13 @@ osd_directory_entry *osd_stat(const char *path)
{
int err;
osd_directory_entry *result = NULL;
#if defined(SDLMAME_NO64BITIO) || defined(ANDROID) || defined(WIN32) || defined(SDLMAME_BSD)
#if defined(SDLMAME_NO64BITIO) || defined(ANDROID) || defined(WIN32) || defined(SDLMAME_BSD) || defined(__APPLE__)
struct stat st;
#else
struct stat64 st;
#endif
#if defined(SDLMAME_NO64BITIO) || defined(ANDROID) || defined(WIN32) || defined(SDLMAME_BSD)
#if defined(SDLMAME_NO64BITIO) || defined(ANDROID) || defined(WIN32) || defined(SDLMAME_BSD) || defined(__APPLE__)
err = stat(path, &st);
#else
err = stat64(path, &st);

1
src/osd/retro/retrowork.c
View File

@ -6,6 +6,7 @@
#include "retroos.h"
#include "eminline.h"
#include "osinline.h"
//============================================================
// DEBUGGING