From 7c28a62b40724d5307c0463eeea1f09b768aa0fe Mon Sep 17 00:00:00 2001
From: TwinAphex51224 <twinaphex1@gmail.com>
Date: Thu, 15 Dec 2011 13:54:22 +0100
Subject: [PATCH] (Libxenon) No more SDL

---
 Makefile.xenon         | 10 +++++-----
 config.def.h           |  3 +++
 driver.c               |  3 +++
 driver.h               |  1 +
 settings.c             |  3 +++
 xenon/xenon360_video.c |  1 -
 6 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/Makefile.xenon b/Makefile.xenon
index 6da3659384..c4c781f8e2 100644
--- a/Makefile.xenon
+++ b/Makefile.xenon
@@ -16,13 +16,13 @@ PPU_TARGET := ssnes-libxenon.elf
 PPU_TARGET_ADJUSTED := ssnes-libxenon.elf32
 
 LDDIRS = -L. -L$(DEVKITXENON)/usr/lib -L$(DEVKITXENON)/xenon/lib/32
-INCDIRS = -I. -I$(DEVKITXENON)/usr/include -I$(DEVKITXENON)/usr/include/SDL
+INCDIRS = -I. -I$(DEVKITXENON)/usr/include
 
-OBJ = fifo_buffer.o ssnes.o driver.o file.o settings.o message.o rewind.o movie.o input/sdl.o audio/sdl.o gfx/sdl.o gfx/sdlwrap.o gfx/gfx_common.o ups.o bps.o strl.o screenshot.o audio/hermite.o dynamic.o audio/utils.o conf/config_file.o xenon/cond.o xenon/main.o xenon/xenon360_audio.o xenon/xenon360_input.o xenon/xenon360_video.o
+OBJ = fifo_buffer.o ssnes.o driver.o file.o settings.o message.o rewind.o movie.o gfx/gfx_common.o ups.o bps.o strl.o screenshot.o audio/hermite.o dynamic.o audio/utils.o conf/config_file.o xenon/main.o xenon/xenon360_audio.o xenon/xenon360_input.o xenon/xenon360_video.o
 
-LIBS = -lsnes -lSDL -lxenon -lm -lc
-DEFINES = -std=gnu99 -DHAVE_CONFIGFILE=1 -DHAVE_SDL=1 -DPACKAGE_VERSION=\"0.9.3\" -DHAVE_GETOPT_LONG=1 -Dmain=ssnes_main
-DEFINES += -maltivec -mhard-float -m32 -mpowerpc64 -mcpu=cell -mtune=cell -fno-pic -g -Wall -DSDL -DXENON $(INCDIRS)
+LIBS = -lsnes -lxenon -lm -lc
+DEFINES = -std=gnu99 -DHAVE_CONFIGFILE=1 -DPACKAGE_VERSION=\"0.9.3\" -DHAVE_GETOPT_LONG=1 -Dmain=ssnes_main
+DEFINES += -maltivec -mhard-float -m32 -mpowerpc64 -mcpu=cell -mtune=cell -fno-pic -g -Wall -DXENON $(INCDIRS)
 DEFINES += -u read -u _start -u exc_base
 
 ifeq ($(DEBUG), 1)
diff --git a/config.def.h b/config.def.h
index 82119bb755..1d0d664288 100644
--- a/config.def.h
+++ b/config.def.h
@@ -38,6 +38,7 @@
 #define VIDEO_SDL 13
 #define VIDEO_EXT 14
 #define VIDEO_WII 24
+#define VIDEO_XENON360 25
 ////////////////////////
 #define AUDIO_RSOUND 1
 #define AUDIO_OSS 2
@@ -66,6 +67,8 @@
 #define VIDEO_DEFAULT_DRIVER VIDEO_GL
 #elif defined(GEKKO)
 #define VIDEO_DEFAULT_DRIVER VIDEO_WII
+#elif defined(XENON)
+#define VIDEO_DEFAULT_DRIVER VIDEO_XENON360
 #elif defined(HAVE_XVIDEO)
 #define VIDEO_DEFAULT_DRIVER VIDEO_XVIDEO
 #elif defined(HAVE_SDL)
diff --git a/driver.c b/driver.c
index bdc230cc99..20f53d0034 100644
--- a/driver.c
+++ b/driver.c
@@ -80,6 +80,9 @@ static const video_driver_t *video_drivers[] = {
 #ifdef HAVE_OPENGL
    &video_gl,
 #endif
+#ifdef XENON
+   &video_xenon360,
+#endif
 #ifdef HAVE_SDL
    &video_sdl,
 #endif
diff --git a/driver.h b/driver.h
index b9f9e685d0..f35bafb35d 100644
--- a/driver.h
+++ b/driver.h
@@ -172,6 +172,7 @@ extern const audio_driver_t audio_ps3;
 extern const audio_driver_t audio_wii;
 extern const video_driver_t video_gl;
 extern const video_driver_t video_wii;
+extern const video_driver_t video_xenon360;
 extern const video_driver_t video_xvideo;
 extern const video_driver_t video_sdl;
 extern const video_driver_t video_ext;
diff --git a/settings.c b/settings.c
index 9a66d4937c..3d5e8e9cde 100644
--- a/settings.c
+++ b/settings.c
@@ -50,6 +50,9 @@ static void set_defaults(void)
       case VIDEO_WII:
          def_video = "wii";
          break;
+      case VIDEO_XENON360:
+         def_video = "xenon360";
+         break;
       case VIDEO_XVIDEO:
          def_video = "xvideo";
          break;
diff --git a/xenon/xenon360_video.c b/xenon/xenon360_video.c
index 062e562f4c..5ec640931a 100644
--- a/xenon/xenon360_video.c
+++ b/xenon/xenon360_video.c
@@ -26,7 +26,6 @@
 
 #include "driver.h"
 #include "general.h"
-#include "input/ssnes_sdl_input.h"
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"