Hri7566
/
sm64coopdx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
MysterD 2022-02-17 18:27:19 -08:00
parent f5df2917b8 8e962341cb
commit 0a54b7ebed
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/pc/controller/controller_bind_mapping.c
View File

@ -1,8 +1,11 @@
#ifdef HAVE_SDL2 #ifdef HAVE_SDL2
#include <SDL2/SDL.h> #include <SDL2/SDL.h>
#else #else
#ifdef HAVE_SDL
#include <SDL/SDL.h> #include <SDL/SDL.h>
#endif #endif
#endif
#include "controller_bind_mapping.h" #include "controller_bind_mapping.h"
#include "controller_api.h" #include "controller_api.h"

3
src/pc/crash_handler.c
View File

@ -1,8 +1,8 @@
// Adapted from PeachyPeach's sm64pc-omm // Adapted from PeachyPeach's sm64pc-omm
#if defined(_WIN32) #if defined(_WIN32)
#ifdef HAVE_SDL2
#include <SDL2/SDL.h> #include <SDL2/SDL.h>
#include <stdio.h> #include <stdio.h>
#include <windows.h> #include <windows.h>
#include <dbghelp.h> #include <dbghelp.h>
@ -492,3 +492,4 @@ __attribute__((constructor)) static void init_crash_handler() {
} }
#endif #endif
#endif