better moltenvk bundle crap

Author: warmenhoven

Makefile

@@ -404,6 +404,11 @@ BUNDLE_BUILD       ?= 44
 # If nothing matches (e.g. building with a custom toolchain), fall back to 10.13.
 BUNDLE_MIN_OS      ?= $(or $(patsubst -mmacosx-version-min=%,%,$(filter -mmacosx-version-min=%,$(MINVERFLAGS))),10.13)
 INFO_PLIST_SRC     := pkg/apple/OSX/Info_Metal.plist
+# Universal (arm64 + x86_64) MoltenVK.framework shipped in the repo.
+# Only copied when HAVE_VULKAN=1; on pre-Metal / non-Vulkan builds
+# (e.g. ppc 10.5, i386 10.6) the Vulkan code path isn't compiled in
+# and shipping MoltenVK would be dead weight that can't even load.
+MOLTENVK_FRAMEWORK := pkg/apple/Frameworks/MoltenVK.xcframework/macos-arm64_x86_64/MoltenVK.framework
 
 bundle: $(TARGET) $(METALLIB)
 	@echo "Assembling $(BUNDLE) (min macOS $(BUNDLE_MIN_OS))"
@@ -422,6 +427,10 @@ bundle: $(TARGET) $(METALLIB)
 		$(BUNDLE)/Contents/Resources/filters/audio/ 2>/dev/null || true
 	$(Q)cp gfx/video_filters/*.filt \
 		$(BUNDLE)/Contents/Resources/filters/video/ 2>/dev/null || true
+	$(Q)if [ "$(HAVE_VULKAN)" = "1" ] && [ -d $(MOLTENVK_FRAMEWORK) ]; then \
+		mkdir -p $(BUNDLE)/Contents/Frameworks; \
+		cp -R $(MOLTENVK_FRAMEWORK) $(BUNDLE)/Contents/Frameworks/; \
+	fi
 	$(Q)printf 'APPL????' > $(BUNDLE)/Contents/PkgInfo
 	$(Q)sed \
 		-e 's|$$(EXECUTABLE_NAME)|$(BUNDLE_EXECUTABLE)|g' \
@@ -431,6 +440,19 @@ bundle: $(TARGET) $(METALLIB)
 		-e 's|$$(CURRENT_PROJECT_VERSION)|$(BUNDLE_BUILD)|g' \
 		-e 's|$$(MACOSX_DEPLOYMENT_TARGET)|$(BUNDLE_MIN_OS)|g' \
 		$(INFO_PLIST_SRC) > $(BUNDLE)/Contents/Info.plist
+	@# Ad-hoc code signing. On Apple Silicon (and increasingly on Intel with
+	@# hardened runtime enforcement), dyld refuses to load unsigned dylibs
+	@# even for ad-hoc app-internal use — including the MoltenVK framework
+	@# copied in above. `codesign --sign -` produces an ad-hoc signature
+	@# that satisfies the loader without requiring a developer identity.
+	@# Sign nested content first (frameworks), then the outer .app wrapper,
+	@# so the app's seal covers all contents.
+	$(Q)if [ -d $(BUNDLE)/Contents/Frameworks ]; then \
+		for fw in $(BUNDLE)/Contents/Frameworks/*.framework; do \
+			[ -d "$$fw" ] && codesign --force --sign - --timestamp=none "$$fw"; \
+		done; \
+	fi
+	$(Q)codesign --force --sign - --timestamp=none $(BUNDLE)
 	@echo "Done. Run with: open $(BUNDLE)"
 
 .PHONY: bundle

Makefile.common

@@ -133,26 +133,26 @@ ifneq ($(findstring Darwin,$(OS)),)
    ARCHFLAGS=
    MINVERFLAGS=
    ifeq ($(shell uname -p),arm)
-      MINVERFLAGS = -mmacosx-version-min=10.15 -stdlib=libc++ # macOS  (Metal, ARM 64bit)
+      MINVERFLAGS = -mmacosx-version-min=10.15 # macOS  (Metal, ARM 64bit)
    else ifeq ($(HAVE_METAL),1)
-      MINVERFLAGS = -mmacosx-version-min=10.13 -stdlib=libc++  # macOS  (Metal, x86 64bit)
+      MINVERFLAGS = -mmacosx-version-min=10.13 # macOS  (Metal, x86 64bit)
    else ifeq ($(shell uname -p),powerpc)
       MINVERFLAGS = -mmacosx-version-min=10.5  # macOSX (PowerPC 32-bit)
    else ifeq ($(shell uname -m),i386)
       MINVERFLAGS = -mmacosx-version-min=10.6  # macOSX (OpenGL, x86 32bit)
    else
-      MINVERFLAGS = -mmacosx-version-min=10.7 -stdlib=libc++ # macOSX (OpenGL, x86 64bit)
+      MINVERFLAGS = -mmacosx-version-min=10.7 # macOSX (OpenGL, x86 64bit)
    endif
 
 	# Build for a specific architecture when ARCH is defined as a switch
    ifeq ($(ARCH),arm64)
-      MINVERFLAGS  = -mmacosx-version-min=10.15 -stdlib=libc++ # macOS  (Metal, ARM 64bit)
+      MINVERFLAGS  = -mmacosx-version-min=10.15 # macOS  (Metal, ARM 64bit)
       ARCHFLAGS    = -arch arm64
    else ifeq ($(ARCH),x86_64)
       ifeq ($(HAVE_METAL),1)
-         MINVERFLAGS  = -mmacosx-version-min=10.13 -stdlib=libc++
+         MINVERFLAGS  = -mmacosx-version-min=10.13
       else
-         MINVERFLAGS  = -mmacosx-version-min=10.7  -stdlib=libc++
+         MINVERFLAGS  = -mmacosx-version-min=10.7
       endif
       ARCHFLAGS       = -arch x86_64
    else ifeq ($(ARCH),x86)
@@ -1741,6 +1741,18 @@ ifeq ($(HAVE_VULKAN), 1)
    NEED_CXX_LINKER = 1
    DEFINES += -DHAVE_VULKAN
    INCLUDE_DIRS += -Igfx/include
+
+   # On macOS, the Vulkan loader at gfx/common/vulkan_common.c dlopens
+   # "MoltenVK" by bare name. Embed rpath entries pointing at the Frameworks
+   # dir inside an .app bundle, so that `make bundle` (which copies
+   # pkg/apple/Frameworks/MoltenVK.xcframework/macos-arm64_x86_64/MoltenVK.framework
+   # into Contents/Frameworks) produces a self-contained bundle with no
+   # external MoltenVK dependency. Matches what Xcode's
+   # LD_RUNPATH_SEARCH_PATHS does for the .xcodeproj build.
+   ifneq ($(findstring Darwin,$(OS)),)
+      LDFLAGS += -Xlinker -rpath -Xlinker @executable_path/../Frameworks \
+                 -Xlinker -rpath -Xlinker @executable_path/../Frameworks/MoltenVK.framework
+   endif
 endif
 
 ifeq ($(HAVE_OPENGL_CORE), 1)

pkg/apple/RetroArch_Metal.xcodeproj/project.pbxproj

@@ -1951,7 +1951,6 @@
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
-					"@executable_path/../Frameworks/MoltenVK.framework",
 				);
 				LLVM_LTO = YES_THIN;
 				MACOSX_DEPLOYMENT_TARGET = 10.13;
@@ -2035,7 +2034,6 @@
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
-					"@executable_path/../Frameworks/MoltenVK.framework",
 				);
 				LLVM_LTO = YES_THIN;
 				MACOSX_DEPLOYMENT_TARGET = 10.13;

pkg/apple/RetroArch_iOS13.xcodeproj/project.pbxproj

@@ -1719,7 +1719,6 @@
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
-					"@executable_path/Frameworks/MoltenVK.framework",
 				);
 				LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/iOS/modules";
 				PRODUCT_BUNDLE_IDENTIFIER = "$(IOS_BUNDLE_IDENTIFIER)";
@@ -1739,7 +1738,6 @@
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
-					"@executable_path/Frameworks/MoltenVK.framework",
 				);
 				LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/iOS/modules";
 				PRODUCT_BUNDLE_IDENTIFIER = "$(IOS_BUNDLE_IDENTIFIER)";
@@ -1758,7 +1756,6 @@
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
-					"@executable_path/Frameworks/MoltenVK.framework",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = "$(TVOS_BUNDLE_IDENTIFIER)";
 				PRODUCT_NAME = RetroArchTV;
@@ -1778,7 +1775,6 @@
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
-					"@executable_path/Frameworks/MoltenVK.framework",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = "$(TVOS_BUNDLE_IDENTIFIER)";
 				PRODUCT_NAME = RetroArchTV;
@@ -1877,17 +1873,14 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_KEY_CFBundleDisplayName = RetroArch;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.entertainment";
 				IOS_BUNDLE_IDENTIFIER = com.libretro.RetroArchiOS11;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
-				LIBRARY_SEARCH_PATHS = "";
 				LLVM_LTO = YES_THIN;
 				MARKETING_VERSION = 1.22.2;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
-				OTHER_CFLAGS = "$(inherited)";
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
@@ -1936,18 +1929,15 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_KEY_CFBundleDisplayName = RetroArch;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.entertainment";
 				IOS_BUNDLE_IDENTIFIER = com.libretro.RetroArchiOS11;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
-				LIBRARY_SEARCH_PATHS = "";
 				LLVM_LTO = YES_THIN;
 				MARKETING_VERSION = 1.22.2;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				MTL_IGNORE_WARNINGS = YES;
-				OTHER_CFLAGS = "$(inherited)";
 				SDKROOT = iphoneos;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";

qb/config.params.sh

@@ -111,7 +111,7 @@ HAVE_EGL=auto              # EGL context support
 HAVE_VG=auto               # OpenVG support
 HAVE_CG=auto               # Cg shader support
 HAVE_HLSL=no               # HLSL9 shader support (for Direct3D9)
-HAVE_BUILTINZLIB=auto      # Bake in zlib
+HAVE_BUILTINZLIB=no        # Bake in zlib
 HAVE_ZLIB=auto             # zlib support (ZIP extract, PNG decoding/encoding)
 HAVE_ALSA=auto             # ALSA support
 C89_ALSA=no
@@ -215,4 +215,4 @@ HAVE_GAME_AI=no
 HAVE_SMBCLIENT=auto        # SMB client support
 HAVE_BUILTINSMBCLIENT=no   # Use builtin libsmb2
 HAVE_COCOA=auto            # Cocoa support (Darwin/Apple)
-HAVE_MFI=auto              # GameController.framework joypad support (Apple)
+HAVE_MFI=auto              # GameController.framework joypad support (Apple)