diff --git a/config.def.h b/config.def.h index d7f5cc54d5..ba2e89a2ff 100644 --- a/config.def.h +++ b/config.def.h @@ -35,6 +35,7 @@ enum VIDEO_GL = 0, VIDEO_XVIDEO, VIDEO_SDL, + VIDEO_SDL2, VIDEO_EXT, VIDEO_WII, VIDEO_XENON360, @@ -56,6 +57,7 @@ enum AUDIO_SL, AUDIO_JACK, AUDIO_SDL, + AUDIO_SDL2, AUDIO_XAUDIO, AUDIO_PULSE, AUDIO_EXT, @@ -73,6 +75,7 @@ enum INPUT_ANDROID, INPUT_SDL, + INPUT_SDL2, INPUT_X, INPUT_WAYLAND, INPUT_DINPUT, @@ -127,6 +130,8 @@ enum #define VIDEO_DEFAULT_DRIVER VIDEO_XVIDEO #elif defined(HAVE_SDL) #define VIDEO_DEFAULT_DRIVER VIDEO_SDL +#elif defined(HAVE_SDL2) +#define VIDEO_DEFAULT_DRIVER VIDEO_SDL2 #elif defined(HAVE_DYLIB) && !defined(ANDROID) #define VIDEO_DEFAULT_DRIVER VIDEO_EXT #else @@ -163,6 +168,8 @@ enum #define AUDIO_DEFAULT_DRIVER AUDIO_RWEBAUDIO #elif defined(HAVE_SDL) #define AUDIO_DEFAULT_DRIVER AUDIO_SDL +#elif defined(HAVE_SDL2) +#define AUDIO_DEFAULT_DRIVER AUDIO_SDL2 #elif defined(HAVE_XAUDIO) #define AUDIO_DEFAULT_DRIVER AUDIO_XAUDIO #elif defined(HAVE_RSOUND) @@ -211,6 +218,8 @@ enum #define INPUT_DEFAULT_DRIVER INPUT_QNX #elif defined(HAVE_SDL) #define INPUT_DEFAULT_DRIVER INPUT_SDL +#elif defined(HAVE_SDL2) +#define INPUT_DEFAULT_DRIVER INPUT_SDL2 #else #define INPUT_DEFAULT_DRIVER INPUT_NULL #endif diff --git a/settings.c b/settings.c index e7d26784ce..e6a4bcb145 100644 --- a/settings.c +++ b/settings.c @@ -55,6 +55,8 @@ const char *config_get_default_audio(void) return "opensl"; case AUDIO_SDL: return "sdl"; + case AUDIO_SDL2: + return "sdl2"; case AUDIO_DSOUND: return "dsound"; case AUDIO_XAUDIO: @@ -114,6 +116,8 @@ const char *config_get_default_video(void) return "xvideo"; case VIDEO_SDL: return "sdl"; + case VIDEO_SDL2: + return "sdl2"; case VIDEO_EXT: return "ext"; case VIDEO_VG: @@ -141,6 +145,8 @@ const char *config_get_default_input(void) return "psp"; case INPUT_SDL: return "sdl"; + case INPUT_SDL2: + return "sdl2"; case INPUT_DINPUT: return "dinput"; case INPUT_X: