Commit 2e3973f0 authored by Libretro-Admin's avatar Libretro-Admin
Browse files

(MacOS) Add ARM 64bit MacOS and iOS builds

parent e7762bc6
Pipeline #12999 failed with stage
in 3 minutes and 8 seconds
......@@ -29,11 +29,23 @@ include:
- project: 'libretro-infrastructure/ci-templates'
file: '/linux-i686.yml'
# MacOS 64-bit
- project: 'libretro-infrastructure/ci-templates'
file: '/osx-x64.yml'
# MacOS ARM 64-bit
- project: 'libretro-infrastructure/ci-templates'
file: '/osx-arm64.yml'
################################## CELLULAR ################################
# Android
- project: 'libretro-infrastructure/ci-templates'
file: '/android-jni.yml'
# iOS 9
- project: 'libretro-infrastructure/ci-templates'
file: '/ios9.yml'
# Stages for building
stages:
- build-prepare
......@@ -69,6 +81,18 @@ libretro-build-linux-i686:
- .libretro-linux-i686-make-default
- .core-defs
# MacOS 64-bit
libretro-build-osx-x64:
extends:
- .libretro-osx-x64-make-default
- .core-defs
# MacOS ARM 64-bit
libretro-build-osx-arm64:
extends:
- .libretro-osx-arm64-make-default
- .core-defs
################################### CELLULAR #################################
# Android ARMv7a
android-armeabi-v7a:
......@@ -93,3 +117,9 @@ android-x86:
extends:
- .libretro-android-jni-x86
- .core-defs
# iOS 9
libretro-build-ios-9:
extends:
- .libretro-ios9-make-default
- .core-defs
......@@ -29,6 +29,9 @@ else ifneq ($(findstring Darwin,$(shell uname -a)),)
ifeq ($(shell uname -p),powerpc)
arch = ppc
endif
ifeq ($(shell uname -p),arm)
arch = arm
endif
else ifneq ($(findstring MINGW,$(shell uname -a)),)
system_platform = win
endif
......@@ -36,21 +39,6 @@ endif
TARGET_NAME := vemulator
LIBM = -lm
ifeq ($(ARCHFLAGS),)
ifeq ($(archs),ppc)
ARCHFLAGS = -arch ppc -arch ppc64
else
ARCHFLAGS = -arch i386 -arch x86_64
endif
endif
ifeq ($(platform), osx)
ifndef ($(NOUNIVERSAL))
CFLAGS += $(ARCHFLAGS)
LFLAGS += $(ARCHFLAGS)
endif
endif
ifeq ($(STATIC_LINKING), 1)
EXT := a
endif
......@@ -69,6 +57,31 @@ else ifneq (,$(findstring osx,$(platform)))
TARGET := $(TARGET_NAME)_libretro.dylib
fpic := -fPIC
SHARED := -dynamiclib
ifeq ($(UNIVERSAL),1)
ifeq ($(ARCHFLAGS),)
ARCHFLAGS = -arch i386 -arch x86_64
ifeq ($(archs),arm)
ARCHFLAGS = -arch arm64
endif
ifeq ($(archs),ppc)
ARCHFLAGS = -arch ppc -arch ppc64
endif
endif
ifeq ($(CROSS_COMPILE),1)
TARGET_RULE = -target $(LIBRETRO_APPLE_PLATFORM) -isysroot $(LIBRETRO_APPLE_ISYSROOT)
CFLAGS += $(TARGET_RULE)
CPPFLAGS += $(TARGET_RULE)
CXXFLAGS += $(TARGET_RULE)
LDFLAGS += $(TARGET_RULE)
endif
CFLAGS += $(ARCHFLAGS)
LFLAGS += $(ARCHFLAGS)
endif
else ifneq (,$(findstring ios,$(platform)))
TARGET := $(TARGET_NAME)_libretro_ios.dylib
fpic := -fPIC
......
......@@ -685,7 +685,6 @@ void VE_VMS_CPU::performHLE(size_t entryAddress)
byte month = ram->readByte_RAW(0x19);
byte yearH = ram->readByte_RAW(0x17);
byte yearL = ram->readByte_RAW(0x18);
byte year = (yearH << 8) | yearL;
byte hour = ram->readByte_RAW(0x1B);
byte min = ram->readByte_RAW(0x1C);
byte sec = ram->readByte_RAW(0x1D);
......@@ -2111,11 +2110,8 @@ int VE_VMS_CPU::processInstruction(bool dbg)
//LDC Flash
else if(opcode == 0x50)
{
byte ACC_data = ram->readByte_RAW(ACC);
size_t address = ram->readByte(TRL) | (ram->readByte(TRH) << 8);
//address += ACC_data;
byte data = flash->readByte(address);
ram->writeByte_RAW(ACC, data);
......
......@@ -132,7 +132,6 @@ public:
private:
size_t PC; //This counts where we reached in instruction memory (Starting from first instruction executed)
int clock; //In nanoseconds
double frequency;
int interruptLevel;
int currentInterrupt;
......
......@@ -97,7 +97,6 @@ private:
byte *rootBlock;
byte *data;
FILE *flashWriter;
char *romName;
bool IsRealFlash;
bool IsSaveEnabled;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment