From 22c39e7b92f082077f16a3609141982bcf2662af Mon Sep 17 00:00:00 2001 From: yoshisuga Date: Thu, 26 Jan 2023 09:26:10 -1000 Subject: [PATCH] Support for vulkan driver (#14908) --- .../RetroArch_iOS13.xcodeproj/project.pbxproj | 35 +++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/pkg/apple/RetroArch_iOS13.xcodeproj/project.pbxproj b/pkg/apple/RetroArch_iOS13.xcodeproj/project.pbxproj index 404edbb0d2..c22af3238f 100644 --- a/pkg/apple/RetroArch_iOS13.xcodeproj/project.pbxproj +++ b/pkg/apple/RetroArch_iOS13.xcodeproj/project.pbxproj @@ -102,6 +102,8 @@ 92CC05C721FEDD0B00FF79F0 /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 92CC05C621FEDD0B00FF79F0 /* MobileCoreServices.framework */; }; 92DAF33F277A370600FE2A9E /* EmulatorTouchMouse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92DAF33E277A370600FE2A9E /* EmulatorTouchMouse.swift */; }; 92E5DCD4231A5786006491BF /* modules in Resources */ = {isa = PBXBuildFile; fileRef = 92E5DCD3231A5786006491BF /* modules */; }; + 92EDD1632982E40C00AD33B4 /* libMoltenVK.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 92EDD1622982E40C00AD33B4 /* libMoltenVK.dylib */; }; + 92EDD1642982E40D00AD33B4 /* libMoltenVK.dylib in Embed Libraries */ = {isa = PBXBuildFile; fileRef = 92EDD1622982E40C00AD33B4 /* libMoltenVK.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -126,6 +128,17 @@ name = "Embed Foundation Extensions"; runOnlyForDeploymentPostprocessing = 0; }; + 92EDD1652982E40D00AD33B4 /* Embed Libraries */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + 92EDD1642982E40D00AD33B4 /* libMoltenVK.dylib in Embed Libraries */, + ); + name = "Embed Libraries"; + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ @@ -401,6 +414,7 @@ 92CC05C621FEDD0B00FF79F0 /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = System/Library/Frameworks/MobileCoreServices.framework; sourceTree = SDKROOT; }; 92DAF33E277A370600FE2A9E /* EmulatorTouchMouse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmulatorTouchMouse.swift; sourceTree = ""; }; 92E5DCD3231A5786006491BF /* modules */ = {isa = PBXFileReference; lastKnownFileType = folder; path = modules; sourceTree = ""; }; + 92EDD1622982E40C00AD33B4 /* libMoltenVK.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libMoltenVK.dylib; path = iOS/modules/libMoltenVK.dylib; sourceTree = ""; }; 96366C5416C9AC3300D64A22 /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = System/Library/Frameworks/CoreAudio.framework; sourceTree = SDKROOT; }; 96366C5816C9ACF500D64A22 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; }; 963C3C33186E3DED00A6EB1E /* GameController.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GameController.framework; path = System/Library/Frameworks/GameController.framework; sourceTree = SDKROOT; }; @@ -424,6 +438,7 @@ 92CC05C521FEDC9F00FF79F0 /* CFNetwork.framework in Frameworks */, 9204BE121D319EF300BD49DB /* libz.dylib in Frameworks */, 9204BE131D319EF300BD49DB /* QuartzCore.framework in Frameworks */, + 92EDD1632982E40C00AD33B4 /* libMoltenVK.dylib in Frameworks */, 9204BE141D319EF300BD49DB /* GameController.framework in Frameworks */, 9204BE151D319EF300BD49DB /* CoreText.framework in Frameworks */, 9204BE161D319EF300BD49DB /* CoreLocation.framework in Frameworks */, @@ -1129,6 +1144,7 @@ 96AFAE2816C1D4EA009DE44C /* Frameworks */ = { isa = PBXGroup; children = ( + 92EDD1622982E40C00AD33B4 /* libMoltenVK.dylib */, 9210C2F124B3A19100E6FE7C /* Metal.framework */, 9210C2F024B3A19100E6FE7C /* MetalKit.framework */, 92CC05C621FEDD0B00FF79F0 /* MobileCoreServices.framework */, @@ -1197,6 +1213,7 @@ 9204BE271D319EF300BD49DB /* ShellScript */, 9204BE211D319EF300BD49DB /* Resources */, 9292D6F528F549D500E47A75 /* Embed Foundation Extensions */, + 92EDD1652982E40D00AD33B4 /* Embed Libraries */, ); buildRules = ( ); @@ -1494,12 +1511,13 @@ "$(DEPS_DIR)/glslang/glslang/glslang/OSDependent/Unix", "$(DEPS_DIR)/glslang/glslang/SPIRV", "$(DEPS_DIR)/glslang/glslang/glslang/MachineIndependent", + ../../gfx/include, ); INFOPLIST_FILE = "$(SRCROOT)/iOS/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_NO_PIE = YES; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ""; + LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/iOS/modules"; MARKETING_VERSION = 1.14.0; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = NO; @@ -1625,12 +1643,13 @@ "$(DEPS_DIR)/glslang/glslang/glslang/OSDependent/Unix", "$(DEPS_DIR)/glslang/glslang/SPIRV", "$(DEPS_DIR)/glslang/glslang/glslang/MachineIndependent", + ../../gfx/include, ); INFOPLIST_FILE = "$(SRCROOT)/iOS/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_NO_PIE = YES; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ""; + LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/iOS/modules"; MARKETING_VERSION = 1.14.0; MTL_FAST_MATH = YES; OTHER_CFLAGS = ( @@ -1771,6 +1790,7 @@ "-DHAVE_IOS_CUSTOMKEYBOARD", "-DHAVE_IOS_TOUCHMOUSE", "-DHAVE_IOS_SWIFT", + "-DHAVE_VULKAN", ); PRODUCT_BUNDLE_IDENTIFIER = com.libretro.RetroArchiOS11; PRODUCT_NAME = RetroArch; @@ -2226,6 +2246,10 @@ GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ../; IPHONEOS_DEPLOYMENT_TARGET = 11.0; + LIBRARY_SEARCH_PATHS = ( + "$(PROJECT_DIR)/iOS/modules", + "@executable_path/Frameworks", + ); ONLY_ACTIVE_ARCH = NO; OTHER_CFLAGS = ( "-DDONT_WANT_ARM_ASM_OPTIMIZATIONS", @@ -2275,6 +2299,7 @@ "-DHAVE_RTGA", "-DHAVE_COCOATOUCH", "-DHAVE_MAIN", + "-DHAVE_VULKAN", ); "OTHER_LDFLAGS[arch=*]" = "-Wl,-segalign,4000"; SDKROOT = iphoneos; @@ -2303,6 +2328,10 @@ GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ../; IPHONEOS_DEPLOYMENT_TARGET = 11.0; + LIBRARY_SEARCH_PATHS = ( + "$(PROJECT_DIR)/iOS/modules", + "@executable_path/Frameworks", + ); OTHER_CFLAGS = ( "-DNS_BLOCK_ASSERTIONS=1", "-DNDEBUG", @@ -2352,7 +2381,9 @@ "-DHAVE_RTGA", "-DHAVE_COCOATOUCH", "-DHAVE_MAIN", + "-DHAVE_VULKAN", ); + "OTHER_CFLAGS[arch=*]" = ""; "OTHER_LDFLAGS[arch=*]" = "-Wl,-segalign,4000"; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2";