diff --git a/Cores/PPSSPP/PVPPSSPP.xcodeproj/project.pbxproj b/Cores/PPSSPP/PVPPSSPP.xcodeproj/project.pbxproj index 0d82776b55..819d5f27f2 100644 --- a/Cores/PPSSPP/PVPPSSPP.xcodeproj/project.pbxproj +++ b/Cores/PPSSPP/PVPPSSPP.xcodeproj/project.pbxproj @@ -1273,6 +1273,7 @@ isa = PBXNativeTarget; buildConfigurationList = 93E74212295B67C70028EB94 /* Build configuration list for PBXNativeTarget "PVPPSSPP" */; buildPhases = ( + 9383100B2CEF6C7200DF2BBC /* ShellScript */, 93E741E7295B67C70028EB94 /* Sources */, 93E741F3295B67C70028EB94 /* Frameworks */, 93E74206295B67C70028EB94 /* Headers */, @@ -1723,6 +1724,23 @@ shellPath = /bin/sh; shellScript = "#Use 1.3.250.1 libMoltenVK in ${SRCROOT}/lib instead\ncp \"${SRCROOT}/lib/libMoltenVK_1.3.250.1.dylib\" \"${SRCROOT}/lib/libMoltenVK_PPSSPP.dylib\"\n#cp \"${SRCROOT}/libretro_ppsspp/ext/vulkan/iOS/Frameworks/libMoltenVK.dylib\" \"${SRCROOT}/lib/libMoltenVK_PPSSPP.dylib\"\n"; }; + 9383100B2CEF6C7200DF2BBC /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + ); + outputFileListPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "cd \"${SRCROOT}\"\ncd libretro_ppsspp\ntar -xvf ../update.tar\n\n"; + }; 93CD1E252A59AEC500DE2A5C /* Copy Libretro PPSSPP */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; diff --git a/Cores/PPSSPP/update.tar b/Cores/PPSSPP/update.tar new file mode 100644 index 0000000000..28d5a0d641 Binary files /dev/null and b/Cores/PPSSPP/update.tar differ diff --git a/MoltenVK/MoltenVK/include/vk_video/vulkan_video_codec_h264std.h b/MoltenVK/MoltenVK/include/vk_video/vulkan_video_codec_h264std.h index 21c7b667fd..cda59072e1 100644 --- a/MoltenVK/MoltenVK/include/vk_video/vulkan_video_codec_h264std.h +++ b/MoltenVK/MoltenVK/include/vk_video/vulkan_video_codec_h264std.h @@ -14,7 +14,7 @@ #ifdef __cplusplus -extern "C" { +//extern "C" { #endif @@ -304,7 +304,7 @@ typedef struct StdVideoH264PictureParameterSet { #ifdef __cplusplus -} +//} #endif #endif diff --git a/MoltenVK/MoltenVK/include/vulkan/vk_platform.h b/MoltenVK/MoltenVK/include/vulkan/vk_platform.h index ed67a6004a..55eb2d52b7 100644 --- a/MoltenVK/MoltenVK/include/vulkan/vk_platform.h +++ b/MoltenVK/MoltenVK/include/vulkan/vk_platform.h @@ -12,8 +12,8 @@ #define VK_PLATFORM_H_ #ifdef __cplusplus -extern "C" -{ +//extern "C" +//{ #endif // __cplusplus /* @@ -78,7 +78,7 @@ extern "C" #endif // !defined(VK_NO_STDINT_H) #ifdef __cplusplus -} // extern "C" +//} // extern "C" #endif // __cplusplus #endif diff --git a/MoltenVK/MoltenVK/include/vulkan/vulkan_core.h b/MoltenVK/MoltenVK/include/vulkan/vulkan_core.h index a2e7ed3cb7..1a0678ea38 100644 --- a/MoltenVK/MoltenVK/include/vulkan/vulkan_core.h +++ b/MoltenVK/MoltenVK/include/vulkan/vulkan_core.h @@ -14,7 +14,7 @@ #ifdef __cplusplus -extern "C" { +//extern "C" { #endif @@ -17205,7 +17205,7 @@ VKAPI_ATTR void VKAPI_CALL vkCmdDrawMeshTasksIndirectCountEXT( #endif #ifdef __cplusplus -} +//} #endif #endif