stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-04-20 09:11:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make SDL2 compile on a normal setup

Browse source
This commit is contained in:
RedEnchilada 2015-12-06 16:00:22 -06:00
parent 30d2b8cb4f
commit 4721c180c4
7 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/hardware/r_opengl/r_opengl.h
View file

@ -26,7 +26,7 @@
#pragma warning(disable : 4214 4244)
#endif
#include "SDL_opengl.h" //Alam_GBC: Simple, yes?
#include <SDL2/SDL_opengl.h> //Alam_GBC: Simple, yes?
#ifdef _MSC_VER
#pragma warning(default : 4214 4244)

4
src/sdl/IMG_xpm.c
View file

@ -50,7 +50,7 @@
#include <string.h>
#include <ctype.h>
//#include "SDL_image.h"
#include <SDL2/SDL_image.h>
#ifdef LOAD_XPM
@ -499,7 +499,7 @@ SDL_Surface *IMG_LoadXPM_RW(SDL_RWops *src)
}
#endif
static inline SDL_Surface *IMG_ReadXPMFromArray(const char **xpm)
extern DECLSPEC SDL_Surface *IMG_ReadXPMFromArray(char **xpm)
{
return NULL;
}

4
src/sdl/hwsym_sdl.c
View file

@ -31,7 +31,7 @@
#ifdef HAVE_SDL
#include "SDL.h"
#include <SDL2/SDL.h>
#ifdef _MSC_VER
#pragma warning(default : 4214 4244)
@ -42,7 +42,7 @@
#endif
#if SDL_VERSION_ATLEAST(1,2,6) && !defined (NOLOADSO)
#include "SDL_loadso.h" // 1.2.6+
#include <SDL2/SDL_loadso.h> // 1.2.6+
#elif !defined (NOLOADSO)
#define NOLOADSO
#endif

4
src/sdl/i_system.c
View file

@ -81,7 +81,7 @@ void __set_fpscr(long); // in libgcc / kernel's startup.s?
#ifdef HAVE_SDL
#include "SDL.h"
#include <SDL2/SDL.h>
#ifdef HAVE_TTF
#include "i_ttf.h"
@ -92,7 +92,7 @@ void __set_fpscr(long); // in libgcc / kernel's startup.s?
#endif
#if SDL_VERSION_ATLEAST(1,2,7) && !defined (DC)
#include "SDL_cpuinfo.h" // 1.2.7 or greater
#include <SDL2/SDL_cpuinfo.h> // 1.2.7 or greater
#define HAVE_SDLCPUINFO
#endif

4
src/sdl/i_video.c
View file

@ -27,7 +27,7 @@
#ifdef HAVE_SDL
#include "SDL.h"
#include <SDL2/SDL.h>
#ifdef _MSC_VER
#pragma warning(default : 4214 4244)
@ -56,7 +56,7 @@
#include "../doomdef.h"
#if defined (_WIN32)
#include "SDL_syswm.h"
#include <SDL2/SDL_syswm.h>
#endif
#include "../doomstat.h"

4
src/sdl/mixer_sound.c
View file

@ -15,12 +15,12 @@
#ifdef _MSC_VER
#pragma warning(disable : 4214 4244)
#endif
#include "SDL.h"
#include <SDL2/SDL.h>
#ifdef _MSC_VER
#pragma warning(default : 4214 4244)
#endif
#include "SDL_mixer.h"
#include <SDL2/SDL_mixer.h>
/* This is the version number macro for the current SDL_mixer version: */
#ifndef SDL_MIXER_COMPILEDVERSION

2
src/sdl/ogl_sdl.c
View file

@ -23,7 +23,7 @@
#ifdef HAVE_SDL
#include "SDL.h"
#include <SDL2/SDL.h>
#include "sdlmain.h"