Partially revert 1eb1cc5e5b: it broke the Windows build.

Go back to using SDL2 in front of SDL2 header includes.
This commit is contained in:
C.W. Betts 2021-05-24 16:20:36 -06:00
commit 14d199b004
10 changed files with 12 additions and 12 deletions

View file

@ -1,5 +1,5 @@
#include "wx-app.h" #include "wx-app.h"
#include <SDL.h> #include <SDL2/SDL.h>
extern "C" extern "C"
{ {

View file

@ -1,5 +1,5 @@
#define _WIN32_WINNT 0x0501 #define _WIN32_WINNT 0x0501
#include <SDL.h> #include <SDL2/SDL.h>
#include "video.h" #include "video.h"
#include "wx-sdl2-video.h" #include "wx-sdl2-video.h"
#include "wx-utils.h" #include "wx-utils.h"

View file

@ -1,4 +1,4 @@
#include <SDL.h> #include <SDL2/SDL.h>
#include "video.h" #include "video.h"
#include "wx-sdl2-video.h" #include "wx-sdl2-video.h"
#include "wx-utils.h" #include "wx-utils.h"

View file

@ -1,6 +1,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <math.h> #include <math.h>
#include <SDL.h> #include <SDL2/SDL.h>
#include "ibm.h" #include "ibm.h"
#include "device.h" #include "device.h"
#include "gameport.h" #include "gameport.h"

View file

@ -1,4 +1,4 @@
#include <SDL.h> #include <SDL2/SDL.h>
#include <string.h> #include <string.h>
#include "plat-mouse.h" #include "plat-mouse.h"

View file

@ -1,4 +1,4 @@
#include <SDL.h> #include <SDL2/SDL.h>
#include "video.h" #include "video.h"
#include "wx-sdl2.h" #include "wx-sdl2.h"
#include "wx-sdl2-video.h" #include "wx-sdl2-video.h"

View file

@ -1,8 +1,8 @@
#include <SDL.h> #include <SDL2/SDL.h>
#define BITMAP WINDOWS_BITMAP #define BITMAP WINDOWS_BITMAP
#include <SDL_opengl.h> #include <SDL2/SDL_opengl.h>
#if SDL_VERSION_ATLEAST(2, 0, 4) #if SDL_VERSION_ATLEAST(2, 0, 4)
#include <SDL_opengl_glext.h> #include <SDL2/SDL_opengl_glext.h>
#endif #endif
#undef BITMAP #undef BITMAP
#include "wx-sdl2-glw.h" #include "wx-sdl2-glw.h"

View file

@ -1,4 +1,4 @@
#include <SDL.h> #include <SDL2/SDL.h>
#include <stdint.h> #include <stdint.h>
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>

View file

@ -1,4 +1,4 @@
#include <SDL.h> #include <SDL2/SDL.h>
#include <stdint.h> #include <stdint.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>

View file

@ -1,6 +1,6 @@
#include "wx-sdl2.h" #include "wx-sdl2.h"
#include <SDL.h> #include <SDL2/SDL.h>
#include <wx/defs.h> #include <wx/defs.h>
#ifdef __WINDOWS__ #ifdef __WINDOWS__