diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index bfb389a..36764b4 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -72,10 +72,6 @@ jobs: run: | patch -p1 < ../patches/moltenvk-osxcross-compat.patch - - name: Change macOS build target to 10.13 - run: | - patch -p1 < ../patches/moltenvk-1013-compat.patch - - name: Fetch Dependencies (Use Built Cache) if: steps.cache-dependencies.outputs.cache-hit == 'true' run: | diff --git a/MoltenVK b/MoltenVK index 49b97f2..db445ff 160000 --- a/MoltenVK +++ b/MoltenVK @@ -1 +1 @@ -Subproject commit 49b97f26ae013b9e5bfb3098ee5dea5e4f58e9e8 +Subproject commit db445ff2042d9ce348c439ad8451112f354b8d2a diff --git a/patches/moltenvk-1013-compat.patch b/patches/moltenvk-1013-compat.patch deleted file mode 100644 index 30443b3..0000000 --- a/patches/moltenvk-1013-compat.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/ExternalDependencies.xcodeproj/project.pbxproj b/ExternalDependencies.xcodeproj/project.pbxproj -index e7e226c9..5288d60f 100644 ---- a/ExternalDependencies.xcodeproj/project.pbxproj -+++ b/ExternalDependencies.xcodeproj/project.pbxproj -@@ -4586,7 +4586,7 @@ - GCC_WARN_UNUSED_VARIABLE = NO; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; - MACH_O_TYPE = staticlib; -- MACOSX_DEPLOYMENT_TARGET = 10.15; -+ MACOSX_DEPLOYMENT_TARGET = 10.13; - SKIP_INSTALL = YES; - TVOS_DEPLOYMENT_TARGET = 13.0; - }; -@@ -4636,7 +4636,7 @@ - GCC_WARN_UNUSED_VARIABLE = NO; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; - MACH_O_TYPE = staticlib; -- MACOSX_DEPLOYMENT_TARGET = 10.15; -+ MACOSX_DEPLOYMENT_TARGET = 10.13; - SKIP_INSTALL = YES; - TVOS_DEPLOYMENT_TARGET = 13.0; - VALIDATE_PRODUCT = YES; -diff --git a/MoltenVK/MoltenVK.xcodeproj/project.pbxproj b/MoltenVK/MoltenVK.xcodeproj/project.pbxproj -index 093da584..08351433 100644 ---- a/MoltenVK/MoltenVK.xcodeproj/project.pbxproj -+++ b/MoltenVK/MoltenVK.xcodeproj/project.pbxproj -@@ -2694,7 +2694,7 @@ - "\"${BUILT_PRODUCTS_DIR}\"", - ); - IPHONEOS_DEPLOYMENT_TARGET = 13.0; -- MACOSX_DEPLOYMENT_TARGET = 10.15; -+ MACOSX_DEPLOYMENT_TARGET = 10.13; - MARKETING_VERSION = "${CURRENT_PROJECT_VERSION}"; - MTL_ENABLE_DEBUG_INFO = YES; - PRELINK_LIBS = "${CONFIGURATION_BUILD_DIR}/libMoltenVKShaderConverter.a"; -@@ -2771,7 +2771,7 @@ - "\"${BUILT_PRODUCTS_DIR}\"", - ); - IPHONEOS_DEPLOYMENT_TARGET = 13.0; -- MACOSX_DEPLOYMENT_TARGET = 10.15; -+ MACOSX_DEPLOYMENT_TARGET = 10.13; - MARKETING_VERSION = "${CURRENT_PROJECT_VERSION}"; - MTL_ENABLE_DEBUG_INFO = NO; - PRELINK_LIBS = "${CONFIGURATION_BUILD_DIR}/libMoltenVKShaderConverter.a";