Merge remote-tracking branch 'origin/master' into dev

core/deps/breakpad

@@ -1 +1 @@
-Subproject commit 4c3d5fce1a4fef4decfbfeaf20f3746ecd209775
+Subproject commit 1ab24bcc817ebe629bf77daa53529d02361cb1e9

shell/apple/generate_xcode_project.command

@@ -22,11 +22,12 @@ if [[ -z "${VULKAN_SDK}" ]]; then
     if [ $v == "y" ]; then
         curl https://sdk.lunarg.com/sdk/download/latest/mac/vulkan-sdk.dmg -o vulkan-sdk.dmg
         hdiutil attach ./vulkan-sdk.dmg
-        /Volumes/vulkansdk-macos-*/InstallVulkan.app/Contents/MacOS/InstallVulkan --root $HOME/VulkanSDK --accept-licenses --default-answer --confirm-command install
-        hdiutil detach /Volumes/vulkansdk-macos-*
+        /Volumes/VulkanSDK/InstallVulkan.app/Contents/MacOS/InstallVulkan --root $HOME/VulkanSDK --accept-licenses --default-answer --confirm-command install
+        hdiutil detach /Volumes/VulkanSDK
         rm ./vulkan-sdk.dmg
         echo "export VULKAN_SDK=$HOME/VulkanSDK/macOS" >> ~/.zshrc
-        echo "VULKAN_SDK is now set in .zshrc (Will be effective after you restart the shell)"
+        echo "VULKAN_SDK is now set in .zshrc"
+        source ~/.zshrc
     fi
 fi
 

shell/linux/make-appimage.sh

@@ -89,8 +89,10 @@ mkdir -p "$OUTDIR/usr/bin" "$OUTDIR/usr/lib" "$OUTDIR/usr/lib/pulseaudio" "$OUTD
 echo "Building checkrt"
 mkdir -p "$OUTDIR/tmp"
 pushd "$OUTDIR/tmp"
-git clone https://github.com/darealshinji/AppImageKit-checkrt
-cd AppImageKit-checkrt/src
+git clone https://github.com/darealshinji/linuxdeploy-plugin-checkrt
+cd linuxdeploy-plugin-checkrt
+git checkout ec6237791c5aeb4cbc1fa00a092d1f7befa58988
+cd src
 make
 cp -a checkrt ../../../usr/optional
 cd ../../..