Merge branch 'unstable' of github.com:djoslin0/sm64ex-coop into unstable

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"

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