mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-28 08:37:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile.win32
View File

@ -6,7 +6,7 @@ CXX = g++
HAVE_SRC = 1 HAVE_SRC = 1
HAVE_SDL = 1 HAVE_SDL = 1
libsnes = -lsnes libsnes ?= -lsnes
LIBS = LIBS =
DEFINES = -I. -DHAVE_SRC -DHAVE_SDL DEFINES = -I. -DHAVE_SRC -DHAVE_SDL
@ -14,6 +14,7 @@ LDFLAGS = -L.
SRC_LIBS = -lsamplerate-0 SRC_LIBS = -lsamplerate-0
SDL_LIBS = -lSDLmain -lSDL SDL_LIBS = -lSDLmain -lSDL
SDL_CFLAGS = -ISDL
ifeq ($(HAVE_SRC), 1) ifeq ($(HAVE_SRC), 1)
LIBS += $(SRC_LIBS) LIBS += $(SRC_LIBS)
@ -38,13 +39,6 @@ $(TARGET): $(OBJ)
%.o: %.c %.o: %.c
$(CC) $(CFLAGS) $(DEFINES) -c -o $@ $< $(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: clean:
rm -f *.o rm -f *.o
rm -f audio/*.o rm -f audio/*.o

6
audio/sdl.c
View File

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

6
gfx/gl.c
View File

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

4
gfx/shader_glsl.c
View File

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

4
input/sdl.c
View File

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

2
input/sdl_input.h → input/ssnes_sdl_input.h
View File

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