Gets to link, but fails there.

This commit is contained in:
Themaister 2011-12-10 17:41:16 +01:00
parent 140812d64a
commit dc373fb7d0
4 changed files with 20 additions and 12 deletions

View File

@ -7,20 +7,20 @@
DEBUG = 0
CC = $(DEVKITXENON)/bin/xenon-gcc
STRIP = $(DEVITKXENON)/bin/xenon-strip
CC = xenon-gcc
CXX = xenon-g++
STRIP = xenon-strip
PPU_TARGET := ssnes-libxenon.elf
LDDIRS = -L. -L$(DEVKITXENON)/usr/lib
LDDIRS = -L. -L$(DEVKITXENON)/usr/lib -L$(DEVKITXENON)/xenon/lib/32
INCDIRS = -I. -I$(DEVKITXENON)/usr/include -I$(DEVKITXENON)/usr/include/SDL
OBJ = fifo_buffer.o getopt.o ssnes.o driver.o file.o settings.o message.o rewind.o movie.o audio/sdl.o gfx/gfx_common.o gfx/snes_state.o ups.o bps.o strl.o screenshot.o audio/hermite.o dynamic.o audio/utils.o conf/config_file.o gfx/image.o
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
LIBS = -lsnes -lSDL -lxenon -lm
DEFINES = -std=c99 -DHAVE_SDL_IMAGE=1 -DHAVE_CONFIGFILE=1 -DHAVE_SDL=1 -DPACKAGE_VERSION=\"0.9.2\" -Dmain=ssnes_main
DEFINES += -ffunction-sections -fdata-sections -mno-altivec -mhard-float -mcpu=cell -mtune=cell -m32 -fno-pic -mpowerpc64 -g -Wall -DSDL -DXENON $(INCDIRS)
DEFINES = -std=gnu99 -DHAVE_CONFIGFILE=1 -DHAVE_SDL=1 -DPACKAGE_VERSION=\"0.9.2\" -DHAVE_GETOPT_LONG=1
DEFINES += -maltivec -mhard-float -m32 -mpowerpc64 -mcpu=cell -mtune=cell -fno-pic -g -Wall -DSDL -DXENON $(INCDIRS)
ifeq ($(DEBUG), 1)
OPTIMIZE_LV := -O0 -g
@ -29,11 +29,10 @@ else
endif
CFLAGS := $(OPTIMIZE_LV) $(DEFINES)
LDFLAGS := -g -Wl,--gc-sections
LDFLAGS := -m32 -mpowerpc64 -u read -u _start -u exc_base -fno-pic -mhard-float
$(PPU_TARGET): $(OBJ)
$(CC) -o $@ $(OBJ) $(LDFLAGS) $(LDDIRS) $(LIBS)
$(CXX) -o $@ $(OBJ) $(LDFLAGS) $(LDDIRS) $(LIBS)
$(STRIP) $(PPU_TARGET)
%.o: %.c config.h

4
file.c
View File

@ -947,6 +947,10 @@ bool path_is_directory(const char *path)
return PathIsDirectoryW(buf) == FILE_ATTRIBUTE_DIRECTORY;
#elif defined(__CELLOS_LV2__)
return false; // STUB
#elif defined(XENON)
// Dummy
(void)path;
return false;
#else
struct stat buf;
if (stat(path, &buf) < 0)

View File

@ -401,6 +401,9 @@ static inline void ssnes_sleep(unsigned msec)
sys_timer_usleep(1000 * msec);
#elif defined(_WIN32)
Sleep(msec);
#elif defined(XENON)
// Dummy
(void)msec;
#else
struct timespec tv = {
.tv_sec = msec / 1000,

View File

@ -230,7 +230,7 @@ bool sdlwrap_key_pressed(int key)
// 1.2 specific workaround for tiling WMs. In 1.3 we call GetSize directly, so we don't need to rely on
// proper event handling (I hope).
#if !defined(__APPLE__) && !defined(_WIN32) && !SDL_MODERN
#if !defined(__APPLE__) && !defined(_WIN32) && !SDL_MODERN && !defined(XENON)
static void sdlwrap_get_window_size(unsigned *width, unsigned *height)
{
SDL_SysWMinfo info;
@ -308,7 +308,7 @@ void sdlwrap_check_window(bool *quit,
}
}
#if !defined(__APPLE__) && !defined(_WIN32)
#if !defined(__APPLE__) && !defined(_WIN32) && !defined(XENON)
// Hack to workaround limitations in tiling WMs ...
if (!*resize && !g_fullscreen)
{
@ -326,6 +326,7 @@ void sdlwrap_check_window(bool *quit,
#endif
}
#ifndef XENON
bool sdlwrap_get_wm_info(SDL_SysWMinfo *info)
{
#if SDL_MODERN
@ -337,6 +338,7 @@ bool sdlwrap_get_wm_info(SDL_SysWMinfo *info)
return SDL_GetWMInfo(info) == 1;
#endif
}
#endif
bool sdlwrap_window_has_focus(void)
{