(Libxenon) No more SDL

This commit is contained in:
TwinAphex51224 2011-12-15 13:54:22 +01:00
parent a360042f77
commit 7c28a62b40
6 changed files with 15 additions and 6 deletions

View File

@ -16,13 +16,13 @@ PPU_TARGET := ssnes-libxenon.elf
PPU_TARGET_ADJUSTED := ssnes-libxenon.elf32 PPU_TARGET_ADJUSTED := ssnes-libxenon.elf32
LDDIRS = -L. -L$(DEVKITXENON)/usr/lib -L$(DEVKITXENON)/xenon/lib/32 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 LIBS = -lsnes -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 = -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 -DSDL -DXENON $(INCDIRS) DEFINES += -maltivec -mhard-float -m32 -mpowerpc64 -mcpu=cell -mtune=cell -fno-pic -g -Wall -DXENON $(INCDIRS)
DEFINES += -u read -u _start -u exc_base DEFINES += -u read -u _start -u exc_base
ifeq ($(DEBUG), 1) ifeq ($(DEBUG), 1)

View File

@ -38,6 +38,7 @@
#define VIDEO_SDL 13 #define VIDEO_SDL 13
#define VIDEO_EXT 14 #define VIDEO_EXT 14
#define VIDEO_WII 24 #define VIDEO_WII 24
#define VIDEO_XENON360 25
//////////////////////// ////////////////////////
#define AUDIO_RSOUND 1 #define AUDIO_RSOUND 1
#define AUDIO_OSS 2 #define AUDIO_OSS 2
@ -66,6 +67,8 @@
#define VIDEO_DEFAULT_DRIVER VIDEO_GL #define VIDEO_DEFAULT_DRIVER VIDEO_GL
#elif defined(GEKKO) #elif defined(GEKKO)
#define VIDEO_DEFAULT_DRIVER VIDEO_WII #define VIDEO_DEFAULT_DRIVER VIDEO_WII
#elif defined(XENON)
#define VIDEO_DEFAULT_DRIVER VIDEO_XENON360
#elif defined(HAVE_XVIDEO) #elif defined(HAVE_XVIDEO)
#define VIDEO_DEFAULT_DRIVER VIDEO_XVIDEO #define VIDEO_DEFAULT_DRIVER VIDEO_XVIDEO
#elif defined(HAVE_SDL) #elif defined(HAVE_SDL)

View File

@ -80,6 +80,9 @@ static const video_driver_t *video_drivers[] = {
#ifdef HAVE_OPENGL #ifdef HAVE_OPENGL
&video_gl, &video_gl,
#endif #endif
#ifdef XENON
&video_xenon360,
#endif
#ifdef HAVE_SDL #ifdef HAVE_SDL
&video_sdl, &video_sdl,
#endif #endif

View File

@ -172,6 +172,7 @@ extern const audio_driver_t audio_ps3;
extern const audio_driver_t audio_wii; extern const audio_driver_t audio_wii;
extern const video_driver_t video_gl; extern const video_driver_t video_gl;
extern const video_driver_t video_wii; 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_xvideo;
extern const video_driver_t video_sdl; extern const video_driver_t video_sdl;
extern const video_driver_t video_ext; extern const video_driver_t video_ext;

View File

@ -50,6 +50,9 @@ static void set_defaults(void)
case VIDEO_WII: case VIDEO_WII:
def_video = "wii"; def_video = "wii";
break; break;
case VIDEO_XENON360:
def_video = "xenon360";
break;
case VIDEO_XVIDEO: case VIDEO_XVIDEO:
def_video = "xvideo"; def_video = "xvideo";
break; break;

View File

@ -26,7 +26,6 @@
#include "driver.h" #include "driver.h"
#include "general.h" #include "general.h"
#include "input/ssnes_sdl_input.h"
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"