From 14d199b0041ae294bcc706ac39b1542be5e4e13f Mon Sep 17 00:00:00 2001
From: "C.W. Betts" <computers57@hotmail.com>
Date: Mon, 24 May 2021 16:20:36 -0600
Subject: [PATCH] Partially revert 1eb1cc5e5b4c1fc7266c90347325ebbbadd34b50: it
 broke the Windows build. Go back to using SDL2 in front of SDL2 header
 includes.

---
 src/wx-main.cc               | 2 +-
 src/wx-sdl2-display-win.c    | 2 +-
 src/wx-sdl2-display.c        | 2 +-
 src/wx-sdl2-joystick.c       | 2 +-
 src/wx-sdl2-mouse.c          | 2 +-
 src/wx-sdl2-status.c         | 2 +-
 src/wx-sdl2-video-gl3.c      | 6 +++---
 src/wx-sdl2-video-renderer.c | 2 +-
 src/wx-sdl2-video.c          | 2 +-
 src/wx-sdl2.c                | 2 +-
 10 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/wx-main.cc b/src/wx-main.cc
index 2f17e28..53a9371 100644
--- a/src/wx-main.cc
+++ b/src/wx-main.cc
@@ -1,5 +1,5 @@
 #include "wx-app.h"
-#include <SDL.h>
+#include <SDL2/SDL.h>
 
 extern "C"
 {
diff --git a/src/wx-sdl2-display-win.c b/src/wx-sdl2-display-win.c
index 9d56517..ba2bdb6 100644
--- a/src/wx-sdl2-display-win.c
+++ b/src/wx-sdl2-display-win.c
@@ -1,5 +1,5 @@
 #define  _WIN32_WINNT 0x0501
-#include <SDL.h>
+#include <SDL2/SDL.h>
 #include "video.h"
 #include "wx-sdl2-video.h"
 #include "wx-utils.h"
diff --git a/src/wx-sdl2-display.c b/src/wx-sdl2-display.c
index 1bc458a..ac8c23e 100644
--- a/src/wx-sdl2-display.c
+++ b/src/wx-sdl2-display.c
@@ -1,4 +1,4 @@
-#include <SDL.h>
+#include <SDL2/SDL.h>
 #include "video.h"
 #include "wx-sdl2-video.h"
 #include "wx-utils.h"
diff --git a/src/wx-sdl2-joystick.c b/src/wx-sdl2-joystick.c
index f6bef48..8aa487b 100644
--- a/src/wx-sdl2-joystick.c
+++ b/src/wx-sdl2-joystick.c
@@ -1,6 +1,6 @@
 #include <stdlib.h>
 #include <math.h>
-#include <SDL.h>
+#include <SDL2/SDL.h>
 #include "ibm.h"
 #include "device.h"
 #include "gameport.h"
diff --git a/src/wx-sdl2-mouse.c b/src/wx-sdl2-mouse.c
index 4fbc3c3..a9326cf 100644
--- a/src/wx-sdl2-mouse.c
+++ b/src/wx-sdl2-mouse.c
@@ -1,4 +1,4 @@
-#include <SDL.h>
+#include <SDL2/SDL.h>
 #include <string.h>
 #include "plat-mouse.h"
 
diff --git a/src/wx-sdl2-status.c b/src/wx-sdl2-status.c
index 2feea96..71c01ac 100644
--- a/src/wx-sdl2-status.c
+++ b/src/wx-sdl2-status.c
@@ -1,4 +1,4 @@
-#include <SDL.h>
+#include <SDL2/SDL.h>
 #include "video.h"
 #include "wx-sdl2.h"
 #include "wx-sdl2-video.h"
diff --git a/src/wx-sdl2-video-gl3.c b/src/wx-sdl2-video-gl3.c
index 14907cb..3e4330c 100644
--- a/src/wx-sdl2-video-gl3.c
+++ b/src/wx-sdl2-video-gl3.c
@@ -1,8 +1,8 @@
-#include <SDL.h>
+#include <SDL2/SDL.h>
 #define BITMAP WINDOWS_BITMAP
-#include <SDL_opengl.h>
+#include <SDL2/SDL_opengl.h>
 #if SDL_VERSION_ATLEAST(2, 0, 4)
-#include <SDL_opengl_glext.h>
+#include <SDL2/SDL_opengl_glext.h>
 #endif
 #undef BITMAP
 #include "wx-sdl2-glw.h"
diff --git a/src/wx-sdl2-video-renderer.c b/src/wx-sdl2-video-renderer.c
index acbfbf8..c06d64c 100644
--- a/src/wx-sdl2-video-renderer.c
+++ b/src/wx-sdl2-video-renderer.c
@@ -1,4 +1,4 @@
-#include <SDL.h>
+#include <SDL2/SDL.h>
 #include <stdint.h>
 #include <string.h>
 #include <stdio.h>
diff --git a/src/wx-sdl2-video.c b/src/wx-sdl2-video.c
index f229202..f6551b0 100644
--- a/src/wx-sdl2-video.c
+++ b/src/wx-sdl2-video.c
@@ -1,4 +1,4 @@
-#include <SDL.h>
+#include <SDL2/SDL.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/wx-sdl2.c b/src/wx-sdl2.c
index 084a527..172a50e 100644
--- a/src/wx-sdl2.c
+++ b/src/wx-sdl2.c
@@ -1,6 +1,6 @@
 #include "wx-sdl2.h"
 
-#include <SDL.h>
+#include <SDL2/SDL.h>
 #include <wx/defs.h>
 
 #ifdef __WINDOWS__