diff --git a/griffin/griffin.c b/griffin/griffin.c
index 72faf6a311..34e5492f21 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -1685,12 +1685,3 @@ ANDROID PLAY FEATURE DELIVERY
#if defined(ANDROID)
#include "../play_feature_delivery/play_feature_delivery.c"
#endif
-
-/*============================================================
-STEAM INTEGRATION USING MIST
-============================================================ */
-#ifdef HAVE_MIST
-#include "../steam/steam.c"
-#include "../tasks/task_steam.c"
-#include "../network/presence.c"
-#endif
diff --git a/pkg/apple/BaseConfig.xcconfig b/pkg/apple/BaseConfig.xcconfig
index 878df93e13..7b7b6fc535 100644
--- a/pkg/apple/BaseConfig.xcconfig
+++ b/pkg/apple/BaseConfig.xcconfig
@@ -3,91 +3,7 @@
// RetroArch
//
//
-
-OTHER_CFLAGS = $(inherited) -DENABLE_HLSL
-OTHER_CFLAGS = $(inherited) -DFLAC__HAS_OGG=0
-OTHER_CFLAGS = $(inherited) -DGLSLANG_OSINCLUDE_UNIX
-OTHER_CFLAGS = $(inherited) -DHAVE_7ZIP
-OTHER_CFLAGS = $(inherited) -DHAVE_ACCESSIBILITY
-OTHER_CFLAGS = $(inherited) -DHAVE_AUDIOMIXER
-OTHER_CFLAGS = $(inherited) -DHAVE_BSV_MOVIE
-OTHER_CFLAGS = $(inherited) -DHAVE_BUILTINGLSLANG
-OTHER_CFLAGS = $(inherited) -DHAVE_CC_RESAMPLER
-OTHER_CFLAGS = $(inherited) -DHAVE_CHD
-OTHER_CFLAGS = $(inherited) -DHAVE_CHEATS
-OTHER_CFLAGS = $(inherited) -DHAVE_CHEEVOS
-OTHER_CFLAGS = $(inherited) -DHAVE_COCOA_METAL
-OTHER_CFLAGS = $(inherited) -DHAVE_COMMAND
-OTHER_CFLAGS = $(inherited) -DHAVE_CONFIGFILE
-OTHER_CFLAGS = $(inherited) -DHAVE_COREAUDIO
-OTHER_CFLAGS = $(inherited) -DHAVE_COREAUDIO3
-OTHER_CFLAGS = $(inherited) -DHAVE_DISCORD
-OTHER_CFLAGS = $(inherited) -DHAVE_DR_FLAC
-OTHER_CFLAGS = $(inherited) -DHAVE_DR_MP3
-OTHER_CFLAGS = $(inherited) -DHAVE_DSP_FILTER
-OTHER_CFLAGS = $(inherited) -DHAVE_DYLIB
-OTHER_CFLAGS = $(inherited) -DHAVE_DYNAMIC
-OTHER_CFLAGS = $(inherited) -DHAVE_EASTEREGG
-OTHER_CFLAGS = $(inherited) -DHAVE_FLAC
-OTHER_CFLAGS = $(inherited) -DHAVE_GETOPT_LONG
-OTHER_CFLAGS = $(inherited) -DHAVE_GFX_WIDGETS
-OTHER_CFLAGS = $(inherited) -DHAVE_GIT_VERSION
-OTHER_CFLAGS = $(inherited) -DHAVE_GLSL
-OTHER_CFLAGS = $(inherited) -DHAVE_GLSLANG
-OTHER_CFLAGS = $(inherited) -DHAVE_GRIFFIN
-OTHER_CFLAGS = $(inherited) -DHAVE_HID
-OTHER_CFLAGS = $(inherited) -DHAVE_IFINFO
-OTHER_CFLAGS = $(inherited) -DHAVE_IMAGEVIEWER
-OTHER_CFLAGS = $(inherited) -DHAVE_IOHIDMANAGER
-OTHER_CFLAGS = $(inherited) -DHAVE_LANGEXTRA
-OTHER_CFLAGS = $(inherited) -DHAVE_LIBRETRODB
-OTHER_CFLAGS = $(inherited) -DHAVE_LROUND
-OTHER_CFLAGS = $(inherited) -DHAVE_MATERIALUI
-OTHER_CFLAGS = $(inherited) -DHAVE_MENU
-OTHER_CFLAGS = $(inherited) -DHAVE_METAL
-OTHER_CFLAGS = $(inherited) -DHAVE_MFI
-OTHER_CFLAGS = $(inherited) -DHAVE_MMAP
-OTHER_CFLAGS = $(inherited) -DHAVE_NETPLAYDISCOVERY
-OTHER_CFLAGS = $(inherited) -DHAVE_NETWORKGAMEPAD
-OTHER_CFLAGS = $(inherited) -DHAVE_NETWORKING
-OTHER_CFLAGS = $(inherited) -DHAVE_NETWORK_CMD
-OTHER_CFLAGS = $(inherited) -DHAVE_NO_BUILTINZLIB
-OTHER_CFLAGS = $(inherited) -DHAVE_OPENGL
-OTHER_CFLAGS = $(inherited) -DHAVE_OPENGL_CORE
-OTHER_CFLAGS = $(inherited) -DHAVE_OVERLAY
-OTHER_CFLAGS = $(inherited) -DHAVE_OZONE
-OTHER_CFLAGS = $(inherited) -DHAVE_PATCH
-OTHER_CFLAGS = $(inherited) -DHAVE_RBMP
-OTHER_CFLAGS = $(inherited) -DHAVE_REWIND
-OTHER_CFLAGS = $(inherited) -DHAVE_RGUI
-OTHER_CFLAGS = $(inherited) -DHAVE_RJPEG
-OTHER_CFLAGS = $(inherited) -DHAVE_RPNG
-OTHER_CFLAGS = $(inherited) -DHAVE_RTGA
-OTHER_CFLAGS = $(inherited) -DHAVE_RUNAHEAD
-OTHER_CFLAGS = $(inherited) -DHAVE_RWAV
-OTHER_CFLAGS = $(inherited) -DHAVE_SCREENSHOTS
-OTHER_CFLAGS = $(inherited) -DHAVE_SHADERPIPELINE
-OTHER_CFLAGS = $(inherited) -DHAVE_SLANG
-OTHER_CFLAGS = $(inherited) -DHAVE_SPIRV_CROSS
-OTHER_CFLAGS = $(inherited) -DHAVE_STB_FONT
-OTHER_CFLAGS = $(inherited) -DHAVE_STB_VORBIS
-OTHER_CFLAGS = $(inherited) -DHAVE_THREADS
-OTHER_CFLAGS = $(inherited) -DHAVE_TRANSLATE
-OTHER_CFLAGS = $(inherited) -DHAVE_UPDATE_ASSETS
-OTHER_CFLAGS = $(inherited) -DHAVE_UPDATE_CORE_INFO
-OTHER_CFLAGS = $(inherited) -DHAVE_VIDEO_FILTER
-OTHER_CFLAGS = $(inherited) -DHAVE_VIDEO_LAYOUT
-OTHER_CFLAGS = $(inherited) -DHAVE_VULKAN
-OTHER_CFLAGS = $(inherited) -DHAVE_XMB
-OTHER_CFLAGS = $(inherited) -DHAVE_ZLIB
-OTHER_CFLAGS = $(inherited) -DINLINE=inline
-OTHER_CFLAGS = $(inherited) -DMETAL_DEBUG
-OTHER_CFLAGS = $(inherited) -DOSX
-OTHER_CFLAGS = $(inherited) -DRARCH_INTERNAL
-OTHER_CFLAGS = $(inherited) -DRC_DISABLE_LUA
-OTHER_CFLAGS = $(inherited) -DWANT_GLSLANG
-OTHER_CFLAGS = $(inherited) -D_7ZIP_ST
-OTHER_CFLAGS = $(inherited) -D__LIBRETRO__
+OTHER_CFLAGS = $(inherited) -DHAVE_RUNAHEAD -DHAVE_BSV_MOVIE -DHAVE_GRIFFIN -DHAVE_FLAC -DHAVE_DR_FLAC -DHAVE_DR_MP3 -DHAVE_LROUND -DFLAC__HAS_OGG=0 -DHAVE_CHD -DHAVE_STB_VORBIS -DHAVE_UPDATE_ASSETS -DHAVE_UPDATE_CORES -DHAVE_UPDATE_CORE_INFO -DHAVE_ONLINE_UPDATER -DHAVE_LANGEXTRA -DRC_DISABLE_LUA -DHAVE_CHEEVOS -DHAVE_IMAGEVIEWER -DHAVE_IOHIDMANAGER -DHAVE_STB_FONT -DHAVE_RGUI -DHAVE_MENU -DHAVE_CONFIGFILE -DHAVE_PATCH -DHAVE_DSP_FILTER -DHAVE_VIDEO_FILTER -DHAVE_REWIND -DHAVE_SCREENSHOTS -DHAVE_CHEATS -DHAVE_GFX_WIDGETS -DOSX -DHAVE_CC_RESAMPLER -DHAVE_GLSL -DINLINE=inline -D__LIBRETRO__ -DHAVE_COREAUDIO -DHAVE_DYNAMIC -DHAVE_OVERLAY -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DHAVE_NETWORKGAMEPAD -DHAVE_NETWORKING -DHAVE_IFINFO -DHAVE_NETPLAYDISCOVERY -DRARCH_INTERNAL -DHAVE_THREADS -DHAVE_DYLIB -DHAVE_7ZIP -D_7ZIP_ST -DHAVE_MATERIALUI -DHAVE_HID -DHAVE_XMB -DHAVE_SHADERPIPELINE -DHAVE_MMAP -DHAVE_LIBRETRODB -DHAVE_GETOPT_LONG -DHAVE_METAL -DHAVE_COCOA_METAL -DHAVE_SLANG -DHAVE_GLSLANG -DHAVE_BUILTINGLSLANG -DHAVE_SPIRV_CROSS -DWANT_GLSLANG -DENABLE_HLSL -DGLSLANG_OSINCLUDE_UNIX -DMETAL_DEBUG -DHAVE_OPENGL -DHAVE_OZONE -DHAVE_EASTEREGG -DHAVE_GIT_VERSION -DHAVE_COREAUDIO3 -DHAVE_AUDIOMIXER -DHAVE_RWAV -DHAVE_NO_BUILTINZLIB -DHAVE_TRANSLATE -DHAVE_COMMAND -DHAVE_NETWORK_CMD -DHAVE_ACCESSIBILITY -DHAVE_TRANSLATE -DHAVE_DISCORD -DHAVE_CORE_INFO_CACHE
OTHER_CFLAGS[arch=x86_64] = $(inherited) -DHAVE_SSE
OTHER_CFLAGS[arch=arm64] = $(inherited) -D__ARM_NEON__ -DHAVE_NEON
diff --git a/pkg/apple/ExportOptions.plist b/pkg/apple/ExportOptions.plist
deleted file mode 100644
index 5383e89785..0000000000
--- a/pkg/apple/ExportOptions.plist
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>method</key>
- <string>developer-id</string>
- <key>signingCertificate</key>
- <string>Developer ID Application</string>
- <key>destination</key>
- <string>upload</string>
- <key>signingStyle</key>
- <string>automatic</string>
- <key>teamID</key>
- <string>UK699V5ZS8</string>
-</dict>
-</plist>
diff --git a/pkg/apple/Metal.xcconfig b/pkg/apple/Metal.xcconfig
index 18abc3964d..18a78dad34 100644
--- a/pkg/apple/Metal.xcconfig
+++ b/pkg/apple/Metal.xcconfig
@@ -4,6 +4,4 @@
//
//
-#include "BaseConfig.xcconfig"
-OTHER_CFLAGS = $(inherited) -DHAVE_MAIN -DHAVE_CORE_INFO_CACHE -DHAVE_ONLINE_UPDATER -DHAVE_UPDATE_CORES
-
+OTHER_CFLAGS = $(inherited) -DHAVE_MAIN -DHAVE_COCOA_METAL
diff --git a/pkg/apple/RetroArch.entitlements b/pkg/apple/RetroArch.entitlements
index 3b95f077c9..4917f3c2fc 100644
--- a/pkg/apple/RetroArch.entitlements
+++ b/pkg/apple/RetroArch.entitlements
@@ -2,8 +2,6 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
- <key>com.apple.security.cs.allow-dyld-environment-variables</key>
- <true/>
<key>com.apple.security.cs.disable-executable-page-protection</key>
<true/>
<key>com.apple.security.cs.disable-library-validation</key>
diff --git a/pkg/apple/RetroArch_Metal.xcodeproj/project.pbxproj b/pkg/apple/RetroArch_Metal.xcodeproj/project.pbxproj
index 7db2f0673e..ce4bda4486 100644
--- a/pkg/apple/RetroArch_Metal.xcodeproj/project.pbxproj
+++ b/pkg/apple/RetroArch_Metal.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
- objectVersion = 54;
+ objectVersion = 50;
objects = {
/* Begin PBXBuildFile section */
@@ -149,6 +149,7 @@
053FC25621433F1800D98D46 /* QtNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QtNetwork.framework; path = /usr/local/opt/qt/lib/QtNetwork.framework; sourceTree = "<group>"; };
053FC25721433F1800D98D46 /* QtWidgets.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QtWidgets.framework; path = /usr/local/opt/qt/lib/QtWidgets.framework; sourceTree = "<group>"; };
05422E592140C8DB00F09961 /* RetroArch.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RetroArch.app; sourceTree = BUILT_PRODUCTS_DIR; };
+ 05422E5B2140CE3500F09961 /* VulkanConfig.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = VulkanConfig.xcconfig; sourceTree = "<group>"; };
05422E5C2140CFC500F09961 /* Metal.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Metal.xcconfig; sourceTree = "<group>"; };
0548E2B320F976E10094A083 /* dynamic.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = dynamic.c; path = ../../dynamic.c; sourceTree = "<group>"; };
0548E2B420F976E10094A083 /* dynamic.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = dynamic.h; path = ../../dynamic.h; sourceTree = "<group>"; };
@@ -496,8 +497,6 @@
05F2874120F2BEEA00632D47 /* task_patch.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = task_patch.c; sourceTree = "<group>"; };
072976DC296284F600D6E00C /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; };
074695362995C03900CCB7BD /* GameController.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GameController.framework; path = System/Library/Frameworks/GameController.framework; sourceTree = SDKROOT; };
- 0775553F29A900BF00D876AB /* ExportOptions.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = ExportOptions.plist; sourceTree = "<group>"; };
- 0776EF3829A005D600AF0237 /* Steam.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Steam.xcconfig; sourceTree = "<group>"; };
0795A8C6299A095300D5035D /* CoreHaptics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreHaptics.framework; path = System/Library/Frameworks/CoreHaptics.framework; sourceTree = SDKROOT; };
07B634CF296391FF00B3D78D /* libMoltenVK.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libMoltenVK.dylib; path = Frameworks/MoltenVK/dylib/macOS/libMoltenVK.dylib; sourceTree = "<group>"; };
089C165DFE840E0CC02AAC07 /* InfoPlist.strings */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = InfoPlist.strings; path = OSX/en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
@@ -1358,13 +1357,12 @@
29B97314FDCFA39411CA2CEA /* RetroArch */ = {
isa = PBXGroup;
children = (
- 0775553F29A900BF00D876AB /* ExportOptions.plist */,
686201AB24B823A800EBDD95 /* RetroArch.entitlements */,
05D7753120A55D2700646447 /* BaseConfig.xcconfig */,
05422E5C2140CFC500F09961 /* Metal.xcconfig */,
A90207489289602F593626D5 /* QTConfig.xcconfig */,
+ 05422E5B2140CE3500F09961 /* VulkanConfig.xcconfig */,
9254B2E625F5516A00A1E0DA /* GitLabCI.xcconfig */,
- 0776EF3829A005D600AF0237 /* Steam.xcconfig */,
840222FA1A889EA2009AB261 /* Core */,
05A8C51920DB72C200FF7857 /* Sources */,
841CBB821A8A33810066E9F1 /* Assets */,
@@ -1466,7 +1464,6 @@
8D11072C0486CEB800E47090 /* Sources */,
8D11072E0486CEB800E47090 /* Frameworks */,
0536DF8D20A6BDAC00BBB67F /* Embed Libraries */,
- 07DF7D6729A9DC570038AFFF /* ShellScript */,
);
buildRules = (
);
@@ -1559,24 +1556,6 @@
shellPath = /bin/sh;
shellScript = "make -C ${SRCBASE} -f Makefile.apple HAVE_MENU=1 HAVE_CONFIGFILE=1 HAVE_PATCH=1 HAVE_DSP_FILTER=1 HAVE_REWIND=1 HAVE_SCREENSHOTS=1 HAVE_CHEATS=1 HAVE_CORE_INFO_CACHE=1 HAVE_GFX_WIDGETS=1 HAVE_QT=1 HAVE_SLANG=1 MOC=${QT_INSTALL}/bin/moc generate\n";
};
- 07DF7D6729A9DC570038AFFF /* ShellScript */ = {
- isa = PBXShellScriptBuildPhase;
- alwaysOutOfDate = 1;
- buildActionMask = 2147483647;
- files = (
- );
- inputFileListPaths = (
- );
- inputPaths = (
- );
- outputFileListPaths = (
- );
- outputPaths = (
- );
- runOnlyForDeploymentPostprocessing = 0;
- shellPath = /bin/sh;
- shellScript = "\nif [ -d \"$MIST_PATH\" ]; then\n cp \"$MIST_PATH\"/mist/*.txt \"$TARGET_BUILD_DIR\"/\"$UNLOCALIZED_RESOURCES_FOLDER_PATH\"/\n\n cp \"$MIST_PATH\"/libmist.dylib \"$TARGET_BUILD_DIR\"/\"$FRAMEWORKS_FOLDER_PATH\"/\n install_name_tool -id @rpath/libmist.dylib \"$TARGET_BUILD_DIR\"/\"$FRAMEWORKS_FOLDER_PATH\"/libmist.dylib\n codesign --force --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" --timestamp -o runtime --preserve-metadata=identifier,entitlements,flags --generate-entitlement-der \"$TARGET_BUILD_DIR\"/\"$FRAMEWORKS_FOLDER_PATH\"/libmist.dylib\n\n mkdir \"$TARGET_BUILD_DIR\"/\"$EXECUTABLE_FOLDER_PATH\"/mist\n\n # this shouldn't be here, it can't be notarized\n if [ -n \"$STEAM_APPID\" ]; then\n echo \"$STEAM_APPID\" > \"$TARGET_BUILD_DIR\"/\"$EXECUTABLE_FOLDER_PATH\"/mist/steam_appid.txt\n fi\n\n cp \"$MIST_PATH\"/mist/libsteam_api.dylib \"$TARGET_BUILD_DIR\"/\"$EXECUTABLE_FOLDER_PATH\"/mist/\n codesign --force --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" --timestamp -o runtime --preserve-metadata=identifier,entitlements,flags --generate-entitlement-der \"$TARGET_BUILD_DIR\"/\"$EXECUTABLE_FOLDER_PATH\"/mist/libsteam_api.dylib\n\n cp \"$MIST_PATH\"/mist/mist \"$TARGET_BUILD_DIR\"/\"$EXECUTABLE_FOLDER_PATH\"/mist/\n codesign --force --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" --timestamp -o runtime --preserve-metadata=identifier,entitlements,flags --generate-entitlement-der \"$TARGET_BUILD_DIR\"/\"$EXECUTABLE_FOLDER_PATH\"/mist/mist\nfi\n";
- };
/* End PBXShellScriptBuildPhase section */
/* Begin PBXSourcesBuildPhase section */
@@ -1720,6 +1699,7 @@
GCC_DYNAMIC_NO_PIC = NO;
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
+ INSTALL_PATH = "$(HOME)/Applications";
LD_RUNPATH_SEARCH_PATHS = (
"$(LD_RUNPATH_SEARCH_PATHS_$(IS_MACCATALYST))",
"@executable_path/../Frameworks",
@@ -1728,6 +1708,14 @@
"$(SRCBASE)/pkg/apple/Frameworks/MoltenVK/dylib/macOS",
"$(PROJECT_DIR)/Frameworks/MoltenVK/dylib/macOS",
);
+ OTHER_CFLAGS = (
+ "$(inherited)",
+ "-DHAVE_MAIN",
+ "-DHAVE_COCOA_METAL",
+ "-DHAVE_OPENGL_CORE",
+ "-DHAVE_VULKAN",
+ "-DHAVE_MFI",
+ );
OTHER_CODE_SIGN_FLAGS = "--deep --timestamp";
OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = YES;
@@ -1751,6 +1739,7 @@
ENABLE_HARDENED_RUNTIME = YES;
GCC_MODEL_TUNING = G5;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
+ INSTALL_PATH = "$(HOME)/Applications";
LD_RUNPATH_SEARCH_PATHS = (
"$(LD_RUNPATH_SEARCH_PATHS_$(IS_MACCATALYST))",
"@executable_path/../Frameworks",
@@ -1759,6 +1748,14 @@
"$(SRCBASE)/pkg/apple/Frameworks/MoltenVK/dylib/macOS",
"$(PROJECT_DIR)/Frameworks/MoltenVK/dylib/macOS",
);
+ OTHER_CFLAGS = (
+ "$(inherited)",
+ "-DHAVE_MAIN",
+ "-DHAVE_COCOA_METAL",
+ "-DHAVE_OPENGL_CORE",
+ "-DHAVE_VULKAN",
+ "-DHAVE_MFI",
+ );
OTHER_CODE_SIGN_FLAGS = "--deep --timestamp";
OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = YES;
@@ -1901,7 +1898,7 @@
05422E582140C8DB00F09961 /* Release */,
);
defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Release;
+ defaultConfigurationName = Debug;
};
C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "RetroArch" */ = {
isa = XCConfigurationList;
@@ -1910,7 +1907,7 @@
C01FCF4C08A954540054247B /* Release */,
);
defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Release;
+ defaultConfigurationName = Debug;
};
C01FCF4E08A954540054247B /* Build configuration list for PBXProject "RetroArch_Metal" */ = {
isa = XCConfigurationList;
@@ -1919,7 +1916,7 @@
C01FCF5008A954540054247B /* Release */,
);
defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Release;
+ defaultConfigurationName = Debug;
};
/* End XCConfigurationList section */
};
diff --git a/pkg/apple/Steam.xcconfig b/pkg/apple/Steam.xcconfig
deleted file mode 100644
index fa5132cc6a..0000000000
--- a/pkg/apple/Steam.xcconfig
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// Steam.xcconfig
-// RetroArch_Metal
-//
-
-#include "BaseConfig.xcconfig"
-
-OTHER_CFLAGS = $(inherited) -DHAVE_MAIN -DHAVE_STEAM -DHAVE_MIST -DHAVE_PRESENCE
-HEADER_SEARCH_PATHS = $(inherited) $(MIST_PATH)/include
-OTHER_LDFLAGS = $(inherited) -L$(MIST_PATH) -lmist
-
-DEVELOPMENT_TEAM=UK699V5ZS8
-CODE_SIGN_STYLE = Automatic
diff --git a/pkg/apple/VulkanConfig.xcconfig b/pkg/apple/VulkanConfig.xcconfig
new file mode 100644
index 0000000000..afdca6d08d
--- /dev/null
+++ b/pkg/apple/VulkanConfig.xcconfig
@@ -0,0 +1,20 @@
+//
+// BaseConfig.xcconfig
+// RetroArch
+//
+// Created by Stuart Carnie on 5/10/18.
+//
+VULKAN_PACKAGE_PATH = /Volumes/Data/projects/frameworks/vulkan/moltenvk/Package
+
+// macOS
+VULKAN_FRAMEWORK_PATH[sdk=macosx*] = $(VULKAN_PACKAGE_PATH)/$(CONFIGURATION)/MoltenVK/macOS
+
+// general
+FRAMEWORK_SEARCH_PATHS[sdk=macosx*] = $(inherited) $(LOCAL_LIBRARY_DIR)/Frameworks $(VULKAN_FRAMEWORK_PATH)
+LIBRARY_SEARCH_PATHS[sdk=macosx*] = $(inherited) $(VULKAN_FRAMEWORK_PATH)
+
+OTHER_LDFLAGS = $(inherited) -lMoltenVK -framework MoltenVK
+
+OTHER_CFLAGS = $(inherited) $(QT_CFLAGS) -DHAVE_VULKAN
+
+LD_RUNPATH_SEARCH_PATHS = @executable_path