Add support for building on ARM64 MacOS

.gitignore

@@ -2152,3 +2152,4 @@ lib/libs2d_engine.a
 
 # user-specific config file
 include/config/config_local.h
+.DS_Store

Makefile

@@ -472,16 +472,18 @@ else ifeq ($(COMPILER),clang)
   CC      := clang
   CXX     := clang++
 endif
-# Prefer gcc's cpp if installed on the system
-ifneq (,$(call find-command,cpp-10))
-  CPP     := cpp-10
-else
-  CPP     := cpp
-endif
-ifneq ($(call find-command,mips-n64-ld),)
-LD        := mips-n64-ld
+
+ARCH := $(shell uname -p)
+
+# Check processor architecture. ARM users need a different binutils package.
+ifeq ($(ARCH), arm)
+  LD := tools/mips64-elf-ld-arm
 else
-LD        := tools/mips64-elf-ld
+  ifneq ($(call find-command,mips-n64-ld),)
+    LD        := mips-n64-ld
+  else
+    LD        := tools/mips64-elf-ld
+  endif
 endif
 AR        := $(CROSS)ar
 OBJDUMP   := $(CROSS)objdump
@@ -507,6 +509,18 @@ endif
 C_DEFINES := $(foreach d,$(DEFINES),-D$(d))
 DEF_INC_CFLAGS := $(foreach i,$(INCLUDE_DIRS),-I$(i)) $(C_DEFINES)
 
+# Prefer gcc's cpp if installed on the system
+ifneq (,$(call find-command,clang))
+  CPP     := clang
+  CPPFLAGS := -E -P -x c -Wno-trigraphs $(DEF_INC_CFLAGS)
+else ifneq (,$(call find-command,cpp-10))
+  CPP     := cpp-10
+  CPPFLAGS := -P -Wno-trigraphs $(DEF_INC_CFLAGS)
+else
+  CPP     := cpp
+  CPPFLAGS := -P -Wno-trigraphs $(DEF_INC_CFLAGS)
+endif
+
 # C compiler options
 CFLAGS = -G 0 $(OPT_FLAGS) $(TARGET_CFLAGS) $(MIPSISET) $(DEF_INC_CFLAGS)
 ifeq ($(COMPILER),gcc)
@@ -524,7 +538,6 @@ ASFLAGS     := -march=vr4300 -mabi=32 $(foreach i,$(INCLUDE_DIRS),-I$(i)) $(fore
 RSPASMFLAGS := $(foreach d,$(DEFINES),-definelabel $(subst =, ,$(d)))
 
 # C preprocessor flags
-CPPFLAGS := -P -Wno-trigraphs $(DEF_INC_CFLAGS)
 
 #==============================================================================#
 # Miscellaneous Tools                                                          #
@@ -650,7 +663,14 @@ unf: $(ROM) $(LOADER_EXEC)
 libultra: $(BUILD_DIR)/libultra.a
 
 patch: $(ROM)
-	$(FLIPS) --create --bps $(shell python3 tools/detect_baseroms.py $(VERSION)) $(ROM) $(BUILD_DIR)/$(TARGET_STRING).bps
+  ifeq ($(shell uname), Darwin)
+    ifeq ($(MAKECMDGOALS), patch)
+      $(error "The 'make patch' command is not supported on macOS.")
+    endif
+  else
+	  $(FLIPS) --create --bps $(shell python3 tools/detect_baseroms.py $(VERSION)) $(ROM) $(BUILD_DIR)/$(TARGET_STRING).bps
+  endif
+
 
 # Extra object file dependencies
 $(BUILD_DIR)/asm/ipl3.o:              $(IPL3_RAW_FILES)

sm64.ld

@@ -2,8 +2,8 @@ OUTPUT_ARCH (mips)
 
 #define LINKER /* Removes externs from preprocessed script */
 #define TARGET_N64
-#include "segments.h"
-#include "config.h"
+#include "include/segments.h"
+#include "include/config.h"
 #undef LINKER
 
 #define BEGIN_SEG(name, addr) \

tools/Makefile

@@ -7,9 +7,15 @@ CC           := gcc
 CXX          := g++
 CFLAGS       := -I. -O2 -s
 LDFLAGS      := -lm
-ALL_PROGRAMS := armips filesizer lz4tpack rncpack n64graphics n64graphics_ci mio0 slienc n64cksum textconv aifc_decode aiff_extract_codebook vadpcm_enc tabledesign extract_data_for_mio skyconv flips
+ALL_PROGRAMS := armips filesizer lz4tpack rncpack n64graphics n64graphics_ci mio0 slienc n64cksum textconv aifc_decode aiff_extract_codebook vadpcm_enc tabledesign extract_data_for_mio skyconv
 LIBAUDIOFILE := audiofile/libaudiofile.a
 
+OS := $(shell uname)
+
+ifneq ($(OS), Darwin)
+  ALL_PROGRAMS += flips
+endif
+
 ifeq ($(OS),Windows_NT)
   EXT := .exe
   OUTPUTS := $(ALL_PROGRAMS:=.exe)

tools/filesizer.c

@@ -1,4 +1,4 @@
-#ifndef _WIN32
+#if !defined(_WIN32) && !defined(__APPLE__)
  #include <byteswap.h>
 #else
 #define __bswap_constant_32(x) \

tools/lz4hc.c

@@ -1758,6 +1758,15 @@ LZ4HC_FindLongerMatch(LZ4HC_CCtx_internal* const ctx,
     return md;
 }
 
+#ifdef LZ4T
+int LZ4T_lastLiterals (
+    const BYTE** _ip,
+    BYTE** _op,
+    const BYTE** _anchor,
+    limitedOutput_directive limit,
+    BYTE* oend,
+    size_t length);
+#endif
 
 static int LZ4HC_compress_optimal ( LZ4HC_CCtx_internal* ctx,
                                     const char* const source,
@@ -2027,13 +2036,6 @@ static int LZ4HC_compress_optimal ( LZ4HC_CCtx_internal* ctx,
          op += lastRunSize;
      }
 #else
-int LZ4T_lastLiterals (
-    const BYTE** _ip,
-    BYTE** _op,
-    const BYTE** _anchor,
-    limitedOutput_directive limit,
-    BYTE* oend,
-    size_t length);
      LZ4T_lastLiterals(UPDATABLE(ip, op, anchor), limit, oend, (size_t)(iend - anchor));
 #endif