From ce557d98e496359f1096cce8a3a597cd02e2c532 Mon Sep 17 00:00:00 2001
From: arch1t3cht <arch1t3cht@gmail.com>
Date: Sat, 2 Dec 2023 17:21:11 +0100
Subject: [PATCH 1/2] Use crash_writer_minidump on Windows

This was done in Aegisub/Aegisub.
---
 src/meson.build | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/meson.build b/src/meson.build
index 368c1d7ba..8b597cae0 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -54,7 +54,6 @@ aegisub_src = files(
     'command/vis_tool.cpp',
     'compat.cpp',
     'context.cpp',
-    'crash_writer.cpp',
     'dialog_about.cpp',
     'dialog_attachments.cpp',
     'dialog_automation.cpp',
@@ -171,7 +170,12 @@ if host_machine.system() == 'darwin'
     )
 elif host_machine.system() == 'windows'
     aegisub_src += files(
+<<<<<<< Updated upstream
         'avisynth_wrap.cpp',
+||||||| Stash base
+=======
+        'crash_writer_minidump.cpp',
+>>>>>>> Stashed changes
         'font_file_lister_gdi.cpp',
         # 'libass_gdi_fontselect.cpp',
         'video_provider_avs.cpp',
@@ -217,6 +221,12 @@ elif host_machine.system() == 'windows'
     aegisub_src += windows.compile_resources('res/strings.rc')
 endif
 
+if host_machine.system() != 'windows'
+    aegisub_src += files(
+        'crash_writer.cpp'
+    )
+endif
+
 if conf.has('WITH_FONTCONFIG')
     aegisub_src += files('font_file_lister_fontconfig.cpp')
 endif

From df9d442102c55a8d5d02ff28bea7da7b5cbfb10c Mon Sep 17 00:00:00 2001
From: arch1t3cht <arch1t3cht@gmail.com>
Date: Sat, 2 Dec 2023 17:26:00 +0100
Subject: [PATCH 2/2] Fix AviSynth paths for portable build (again)

---
 packages/win_installer/portable/create-portable.ps1 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/win_installer/portable/create-portable.ps1 b/packages/win_installer/portable/create-portable.ps1
index 83c956e95..0a23ceb22 100644
--- a/packages/win_installer/portable/create-portable.ps1
+++ b/packages/win_installer/portable/create-portable.ps1
@@ -56,9 +56,9 @@ Copy-New-Item $InstallerDepsDir\dictionaries\en_US.aff  $PortableOutputDir\dicti
 Copy-New-Item $InstallerDepsDir\dictionaries\en_US.dic  $PortableOutputDir\dictionaries
 Write-Output 'Copying - codecs'
 Write-Output 'Copying - codecs\Avisynth'
-Copy-New-Item $InstallerDepsDir\AvisynthPlus64\x64\system\DevIL.dll  $PortableOutputDir
-Copy-New-Item $InstallerDepsDir\AvisynthPlus64\x64\AviSynth.dll  $PortableOutputDir
-Copy-New-Item $InstallerDepsDir\AvisynthPlus64\x64\plugins\DirectShowSource.dll  $PortableOutputDir
+Copy-New-Item $InstallerDepsDir\AvisynthPlus64\x64\Output\system\DevIL.dll  $PortableOutputDir
+Copy-New-Item $InstallerDepsDir\AvisynthPlus64\x64\Output\AviSynth.dll  $PortableOutputDir
+Copy-New-Item $InstallerDepsDir\AvisynthPlus64\x64\Output\plugins\DirectShowSource.dll  $PortableOutputDir
 Write-Output 'Copying - codecs\VSFilter'
 Copy-New-Item $InstallerDepsDir\VSFilter\x64\VSFilter.dll  $PortableOutputDir\csri
 Write-Output 'Copying - runtimes\MS-CRT'