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