Updates to Makefile and qb configure scripts for Apple

Author: LibretroAdmin

Makefile

@@ -171,7 +171,11 @@ ifneq ($(MOC_HEADERS),)
     RARCH_OBJ += $(MOC_OBJ)
 endif
 
-all: $(TARGET) config.mk
+ifeq ($(HAVE_METAL), 1)
+   METALLIB := default.metallib
+endif
+
+all: $(TARGET) $(METALLIB) config.mk
 
 define INFO
 ASFLAGS: $(ASFLAGS)
@@ -230,6 +234,23 @@ $(TARGET): $(RARCH_OBJ)
 	@$(if $(Q), $(shell echo echo LD $@),)
 	$(Q)$(LINK) -o $@ $(RARCH_OBJ) $(LIBS) $(LDFLAGS) $(LIBRARY_DIRS)
 
+# Compile the Metal shader library used by gfx/drivers/metal.m via
+# [device newDefaultLibrary]. Xcode produces this automatically for the
+# Metal.xcodeproj build; the commandline build has to do it by hand.
+# The .metallib must sit next to the retroarch binary at runtime.
+ifeq ($(HAVE_METAL), 1)
+METAL_SHADER_SRCS := gfx/common/metal/Shaders.metal gfx/common/metal/menu_pipeline.metal
+METAL_AIR_FILES  := $(METAL_SHADER_SRCS:.metal=.air)
+
+%.air: %.metal
+	@$(if $(Q), $(shell echo echo METAL $<),)
+	$(Q)xcrun -sdk macosx metal $(ARCHFLAGS) -c $< -o $@
+
+default.metallib: $(METAL_AIR_FILES)
+	@$(if $(Q), $(shell echo echo METALLIB $@),)
+	$(Q)xcrun -sdk macosx metallib $(METAL_AIR_FILES) -o $@
+endif
+
 $(OBJDIR)/%.o: %.c config.h config.mk
 	@mkdir -p $(dir $@)
 	@$(if $(Q), $(shell echo echo CC $<),)
@@ -245,6 +266,16 @@ $(OBJDIR)/%.o: %.m
 	@$(if $(Q), $(shell echo echo OBJC $<),)
 	$(Q)$(CXX) $(OBJCFLAGS) $(DEFINES) -MMD -c -o $@ $<
 
+# ARC (Automatic Reference Counting) overrides. These three Objective-C
+# files use ARC-only constructs (__weak, etc.) and must be built with
+# -fobjc-arc. The rest of the RetroArch Objective-C code is MRC-written
+# (explicit retain/release, NSAutoreleasePool, etc.) and would fail to
+# compile under ARC — so we cannot set -fobjc-arc globally. Xcode does
+# the equivalent via per-file CLANG_ENABLE_OBJC_ARC=YES build settings.
+$(OBJDIR)/gfx/drivers/metal.o: OBJCFLAGS += -fobjc-arc
+$(OBJDIR)/gfx/common/metal/metal_renderer.o: OBJCFLAGS += -fobjc-arc
+$(OBJDIR)/input/drivers_joypad/mfi_joypad.o: OBJCFLAGS += -fobjc-arc
+
 $(OBJDIR)/%.o: %.S config.h config.mk $(HEADERS)
 	@mkdir -p $(dir $@)
 	@$(if $(Q), $(shell echo echo AS $<),)
@@ -264,6 +295,9 @@ install: $(TARGET)
 	mkdir -p $(DESTDIR)$(MAN_DIR)/man6 2>/dev/null || /bin/true
 	mkdir -p $(DESTDIR)$(DATA_DIR)/pixmaps 2>/dev/null || /bin/true
 	cp $(TARGET) $(DESTDIR)$(BIN_DIR)
+	@if test "$(HAVE_METAL)" = "1" && test -f default.metallib; then \
+		cp default.metallib $(DESTDIR)$(BIN_DIR)/; \
+	fi
 	cp tools/cg2glsl.py $(DESTDIR)$(BIN_DIR)/retroarch-cg2glsl
 	cp retroarch.cfg $(DESTDIR)$(GLOBAL_CONFIG_DIR)
 	cp com.libretro.RetroArch.metainfo.xml $(DESTDIR)$(DATA_DIR)/metainfo
@@ -316,6 +350,7 @@ clean:
 	$(Q)rm -rf $(OBJDIR_BASE)
 	$(Q)rm -f $(TARGET)
 	$(Q)rm -f *.d
+	$(Q)rm -f default.metallib gfx/common/metal/*.air
 
 .PHONY: all install uninstall clean
 

Makefile.common

@@ -1643,14 +1643,23 @@ endif
 
 ifeq ($(HAVE_METAL), 1)
    DEFINES += -DHAVE_METAL
-   LIBS += -framework Metal -framework MetalKit
-   # Metal code relies on ARC (Automatic Reference Counting), enable it
-   DEF_FLAGS += -fobjc-arc
+   LIBS += -framework Metal -framework MetalKit -framework QuartzCore
+   # Metal code (metal.m, metal_renderer.m) relies on ARC. Enabled per-file
+   # via an override in the top-level Makefile, since applying -fobjc-arc
+   # globally would break the MRC-written Cocoa code (ui_cocoa.m et al.).
    OBJ += \
 	  gfx/common/metal/metal_renderer.o \
 	  gfx/drivers/metal.o
 endif
 
+ifeq ($(HAVE_MFI), 1)
+   DEFINES += -DHAVE_MFI
+   LIBS    += -framework GameController -framework CoreHaptics
+   # mfi_joypad.m uses __weak references, which require ARC. Enabled
+   # per-file in the top-level Makefile (see comment above).
+   OBJ     += input/drivers_joypad/mfi_joypad.o
+endif
+
 ifeq ($(HAVE_EGL), 1)
    DEFINES += -DHAVE_EGL
    DEF_FLAGS += $(EGL_CFLAGS)
@@ -2575,6 +2584,7 @@ ifeq ($(HAVE_COCOA), 1)
 endif
 ifeq ($(HAVE_COCOA_METAL), 1)
    HAVE_COCOA_COMMON = 1
+   DEFINES += -DHAVE_COCOA_METAL
 endif
 
 ifeq ($(HAVE_COCOA_COMMON),1)

qb/config.libs.sh

@@ -244,6 +244,19 @@ check_platform Linux RPILED 'The RPI led driver is' true
 check_platform Darwin METAL 'Metal is' true
 
 if [ "$OS" = 'Darwin' ]; then
+   # macOS: the Metal and Vulkan (MoltenVK) defaults differ from what the
+   # generic qb logic produces.
+   #   * HAVE_METAL defaults to 'no' in config.params.sh so check_platform
+   #     early-outs. Force it on here so the Metal video driver is built,
+   #     unless the user explicitly passed --disable-metal.
+   #   * HAVE_VULKAN must be set to 'yes' before the COCOA_METAL check
+   #     below, which decides which AppKit glue to compile based on
+   #     whether Metal/Vulkan is in play. Link-time libvulkan is not
+   #     required on Darwin; MoltenVK is loaded dynamically at runtime
+   #     by gfx/common/vulkan_common.c.
+   [ "${USER_METAL:-}"  != 'no' ] && HAVE_METAL=yes
+   [ "${USER_VULKAN:-}" != 'no' ] && HAVE_VULKAN=yes
+
    check_platform Darwin COCOA 'Cocoa is' true
    check_lib '' COREAUDIO "-framework AudioUnit" AudioUnitInitialize
    check_lib '' CORETEXT "-framework CoreText" CTFontCreateWithName
@@ -259,6 +272,10 @@ if [ "$OS" = 'Darwin' ]; then
    check_lib '' CORELOCATION "-framework CoreLocation"
    check_lib '' IOHIDMANAGER "-framework IOKit" IOHIDManagerCreate
    check_lib '' AL "-framework OpenAL" alcOpenDevice
+   # MFi (Made For iPhone) / GameController.framework joypad support.
+   # Used for any modern gamepad on macOS (Xbox, DualShock, DualSense, MFi).
+   # Matches the -DHAVE_MFI default in pkg/apple/BaseConfig.xcconfig.
+   check_lib '' MFI "-framework GameController"
    HAVE_X11=no # X11 breaks on recent OSXes even if present.
    HAVE_SDL=no
    HAVE_SW2=no
@@ -585,6 +602,12 @@ check_enabled THREADS VULKAN vulkan 'Threads are' false
 
 if [ "$HAVE_VULKAN" != "no" ] && [ "$OS" = 'Win32' ]; then
    HAVE_VULKAN=yes
+elif [ "$HAVE_VULKAN" != "no" ] && [ "$OS" = 'Darwin' ]; then
+   # macOS: Vulkan is provided by MoltenVK and is loaded dynamically at
+   # runtime via gfx/common/vulkan_common.c (see vksym.h). Link-time
+   # presence of libvulkan is not required, mirroring the Win32 path above
+   # and matching what pkg/apple/Metal.xcconfig does for the Xcode build.
+   HAVE_VULKAN=yes
 else
    check_lib '' VULKAN -lvulkan vkCreateInstance
 fi

qb/config.params.sh

@@ -214,4 +214,5 @@ HAVE_TEST_DRIVERS=yes      # Test input driver
 HAVE_GAME_AI=no
 HAVE_SMBCLIENT=auto        # SMB client support
 HAVE_BUILTINSMBCLIENT=no   # Use builtin libsmb2
-HAVE_COCOA=auto            # Cocoa support (Darwin/Apple)
+HAVE_COCOA=auto            # Cocoa support (Darwin/Apple)
+HAVE_MFI=auto              # GameController.framework joypad support (Apple)