From 35f2058a1647de48572e7a689735db080ca3abf4 Mon Sep 17 00:00:00 2001
From: Isaac <62234577+IsaacBrumby@users.noreply.github.com>
Date: Wed, 16 Feb 2022 15:04:18 +1000
Subject: [PATCH 1/2] Update crash_handler.c

---
 src/pc/crash_handler.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pc/crash_handler.c b/src/pc/crash_handler.c
index 385de3f8..ddf4b47b 100644
--- a/src/pc/crash_handler.c
+++ b/src/pc/crash_handler.c
@@ -1,8 +1,8 @@
 // Adapted from PeachyPeach's sm64pc-omm
 
 #if defined(_WIN32)
+#ifdef HAVE_SDL2
 #include <SDL2/SDL.h>
-
 #include <stdio.h>
 #include <windows.h>
 #include <dbghelp.h>
@@ -492,3 +492,4 @@ __attribute__((constructor)) static void init_crash_handler() {
 }
 
 #endif
+#endif

From 49219252c97037c82bb04d48930f1005d8544432 Mon Sep 17 00:00:00 2001
From: Isaac <62234577+IsaacBrumby@users.noreply.github.com>
Date: Wed, 16 Feb 2022 15:04:51 +1000
Subject: [PATCH 2/2] Update controller_bind_mapping.c

---
 src/pc/controller/controller_bind_mapping.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/pc/controller/controller_bind_mapping.c b/src/pc/controller/controller_bind_mapping.c
index 02c0c4d2..b1da32e2 100644
--- a/src/pc/controller/controller_bind_mapping.c
+++ b/src/pc/controller/controller_bind_mapping.c
@@ -1,8 +1,11 @@
 #ifdef HAVE_SDL2
 #include <SDL2/SDL.h>
-#else
+#else 
+#ifdef HAVE_SDL
+
 #include <SDL/SDL.h>
 #endif
+#endif
 
 #include "controller_bind_mapping.h"
 #include "controller_api.h"