diff --git a/pkg/apple/QTConfig.xcconfig b/pkg/apple/QTConfig.xcconfig index 23ae8c9dfa..095ec647be 100644 --- a/pkg/apple/QTConfig.xcconfig +++ b/pkg/apple/QTConfig.xcconfig @@ -19,4 +19,3 @@ FRAMEWORK_SEARCH_PATHS[sdk=macosx*] = $(inherited) $(QT_FRAMEWORK_PATH) OTHER_CFLAGS = $(inherited) $(QT_CFLAGS) HEADER_SEARCH_PATHS = $(inherited) $(QT_HEADER_SEARCH_PATHS) -LD_RUNPATH_SEARCH_PATHS = @executable_path diff --git a/pkg/apple/RetroArch_Metal.xcodeproj/project.pbxproj b/pkg/apple/RetroArch_Metal.xcodeproj/project.pbxproj index 2985ba3510..5a4f4aacf0 100644 --- a/pkg/apple/RetroArch_Metal.xcodeproj/project.pbxproj +++ b/pkg/apple/RetroArch_Metal.xcodeproj/project.pbxproj @@ -65,6 +65,11 @@ 0720995929B1258C001642BB /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84DD5EB41A89E737007336C1 /* IOKit.framework */; }; 072976DD296284F600D6E00C /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 072976DC296284F600D6E00C /* OpenGL.framework */; }; 0746953A2997393000CCB7BD /* GameController.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 074695362995C03900CCB7BD /* GameController.framework */; }; + 076E640C2BF30A7A00681536 /* CoreHaptics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0795A8C6299A095300D5035D /* CoreHaptics.framework */; }; + 076E640D2BF30A9200681536 /* GameController.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 074695362995C03900CCB7BD /* GameController.framework */; }; + 076E640E2BF30AA200681536 /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 070A883F2A4E7A1B003161C0 /* OpenAL.framework */; }; + 076E64102BF30AFF00681536 /* MoltenVK.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 07EF0FF42BEB114000EDCA9B /* MoltenVK.xcframework */; }; + 076E64112BF30AFF00681536 /* MoltenVK.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 07EF0FF42BEB114000EDCA9B /* MoltenVK.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 0790F6792BF282B400AA58C9 /* Media.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 0790F6782BF282B400AA58C9 /* Media.xcassets */; }; 0790F67A2BF282B400AA58C9 /* Media.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 0790F6782BF282B400AA58C9 /* Media.xcassets */; }; 0790F67B2BF282B400AA58C9 /* Media.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 0790F6782BF282B400AA58C9 /* Media.xcassets */; }; @@ -125,6 +130,7 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( + 076E64112BF30AFF00681536 /* MoltenVK.xcframework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -603,16 +609,19 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 076E640E2BF30AA200681536 /* OpenAL.framework in Frameworks */, D27C508A2228360D00113BC0 /* AudioToolbox.framework in Frameworks */, D27C50882228360000113BC0 /* AVFoundation.framework in Frameworks */, + 076E640D2BF30A9200681536 /* GameController.framework in Frameworks */, 053FC272214341E000D98D46 /* QtConcurrent.framework in Frameworks */, 053FC275214341F000D98D46 /* QtCore.framework in Frameworks */, 053FC270214340F500D98D46 /* QtGui.framework in Frameworks */, 053FC271214340F500D98D46 /* QtNetwork.framework in Frameworks */, 053FC26521433F2200D98D46 /* QtWidgets.framework in Frameworks */, + 076E640C2BF30A7A00681536 /* CoreHaptics.framework in Frameworks */, 05422E4A2140C8DB00F09961 /* QuartzCore.framework in Frameworks */, + 076E64102BF30AFF00681536 /* MoltenVK.xcframework in Frameworks */, 05422E4B2140C8DB00F09961 /* IOSurface.framework in Frameworks */, - 07EF0FF62BEB114000EDCA9B /* MoltenVK.xcframework in Frameworks */, 05422E4C2140C8DB00F09961 /* Metal.framework in Frameworks */, 05422E4D2140C8DB00F09961 /* MetalKit.framework in Frameworks */, 05422E4E2140C8DB00F09961 /* libz.dylib in Frameworks */, @@ -1933,10 +1942,6 @@ GCC_MODEL_TUNING = G5; GCC_OPTIMIZATION_LEVEL = 0; INSTALL_PATH = "@rpath"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/../Frameworks", - ); MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; OTHER_CFLAGS = ( "$(inherited)", @@ -1974,10 +1979,6 @@ GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; INSTALL_PATH = "@rpath"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/../Frameworks", - ); OTHER_CFLAGS = ( "$(inherited)", "$(QT_CFLAGS)", diff --git a/ui/drivers/ui_cocoa.m b/ui/drivers/ui_cocoa.m index 75819a2bb5..5d3bdbb4f9 100644 --- a/ui/drivers/ui_cocoa.m +++ b/ui/drivers/ui_cocoa.m @@ -795,7 +795,7 @@ static ui_application_t ui_application_cocoa = { { int ret; #ifdef HAVE_QT - const ui_application_t *application = &ui_application_qt; + const ui_application_t *application = uico_state_get_ptr()->drv->application; #else const ui_application_t *application = &ui_application_cocoa; #endif @@ -815,7 +815,7 @@ static ui_application_t ui_application_cocoa = { if (ret == -1) { #ifdef HAVE_QT - ui_application_qt.quit(); + application->quit(); #endif break; }