Use the more portable "SDL.h" include convention for SDL.

This commit is contained in:
Themaister 2011-01-07 18:11:06 +01:00
parent 2a4995c21f
commit 35124dc288
6 changed files with 13 additions and 19 deletions

View File

@ -6,7 +6,7 @@ CXX = g++
HAVE_SRC = 1
HAVE_SDL = 1
libsnes = -lsnes
libsnes ?= -lsnes
LIBS =
DEFINES = -I. -DHAVE_SRC -DHAVE_SDL
@ -14,6 +14,7 @@ LDFLAGS = -L.
SRC_LIBS = -lsamplerate-0
SDL_LIBS = -lSDLmain -lSDL
SDL_CFLAGS = -ISDL
ifeq ($(HAVE_SRC), 1)
LIBS += $(SRC_LIBS)
@ -38,13 +39,6 @@ $(TARGET): $(OBJ)
%.o: %.c
$(CC) $(CFLAGS) $(DEFINES) -c -o $@ $<
install: $(TARGET)
install -m755 $(TARGET) $(DESTDIR)$(PREFIX)/bin
install -m644 ssnes.cfg $(DESTDIR)/etc/ssnes.cfg
uninstall: $(TARGET)
rm -rf $(DESTDIR)/$(PREFIX)/bin/$(TARGET)
clean:
rm -f *.o
rm -f audio/*.o

View File

@ -23,9 +23,9 @@
#include <stdint.h>
#include <string.h>
#include <SDL/SDL.h>
#include <SDL/SDL_audio.h>
#include <SDL/SDL_thread.h>
#include "SDL.h"
#include "SDL_audio.h"
#include "SDL_thread.h"
#include "general.h"
#include "buffer.h"

View File

@ -30,9 +30,9 @@
#endif
#define NO_SDL_GLEXT
#include <SDL/SDL.h>
#include <SDL/SDL_opengl.h>
#include "input/sdl_input.h"
#include "SDL.h"
#include "SDL_opengl.h"
#include "input/ssnes_sdl_input.h"
#define GL_GLEXT_PROTOTYPES
#include <GL/glext.h>

View File

@ -25,8 +25,8 @@
#define NO_SDL_GLEXT
#include <GL/gl.h>
#include <SDL/SDL.h>
#include <SDL/SDL_opengl.h>
#include "SDL.h"
#include "SDL_opengl.h"
#include <stdlib.h>
#include <libxml/parser.h>
#include <libxml/tree.h>

View File

@ -17,13 +17,13 @@
#include "driver.h"
#include <SDL/SDL.h>
#include "SDL.h"
#include <stdbool.h>
#include "general.h"
#include <stdint.h>
#include <stdlib.h>
#include <libsnes.hpp>
#include "sdl_input.h"
#include "ssnes_sdl_input.h"
static void* sdl_input_init(void)
{

View File

@ -18,7 +18,7 @@
#ifndef __SSNES_SDL_INPUT_H
#define __SSNES_SDL_INPUT_H
#include <SDL/SDL.h>
#include "SDL.h"
typedef struct sdl_input
{
SDL_Joystick *joysticks[2];