From 32aac90e10b5579d89113808860df2c4d2a6ff7c Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 13 Jan 2013 00:42:21 +0100 Subject: [PATCH] (PS3/Wii) Fix builds --- Makefile.ps3 | 19 +++++++++++----- console/griffin/griffin.c | 10 ++++++++ frontend/menu/rmenu.c | 48 +++++++++++++++++++-------------------- frontend/menu/rmenu_gx.c | 38 +++++++++++++++---------------- 4 files changed, 66 insertions(+), 49 deletions(-) diff --git a/Makefile.ps3 b/Makefile.ps3 index 617ebceac1..562e92bdf1 100644 --- a/Makefile.ps3 +++ b/Makefile.ps3 @@ -6,14 +6,17 @@ CELL_BUILD_TOOLS = SNC CELL_GPU_TYPE = RSX CELL_PSGL_VERSION = ultra-opt -DEBUG = 0 -DOWNLOAD_SHADERS = 1 RMENU_IMG_DIR := media/rmenu + +# options +DOWNLOAD_SHADERS = 1 STRIPPING_ENABLE = 0 -HAVE_RGL = 1 -HAVE_LOGGER = 0 -HAVE_FREETYPE = 0 -PERF_TEST = 0 +DEBUG = 0 +HAVE_RGL = 1 +HAVE_LOGGER = 0 +HAVE_FREETYPE = 0 +HAVE_RLAUNCH = 0 +PERF_TEST = 0 CONTENT_ID_FULL = UP0001-SSNE10000_00-0000000000000001 CONTENT_ID = SSNE10000 @@ -65,6 +68,10 @@ ifeq ($(PERF_TEST), 1) DEFINES += -DPERF_TEST endif +ifeq ($(HAVE_RLAUNCH), 1) + DEFINES += -DHAVE_RLAUNCH +endif + ifeq ($(HAVE_RGL), 1) DEFINES += -DHAVE_RGL GL_LIBS := -L. -lrgl_ps3 diff --git a/console/griffin/griffin.c b/console/griffin/griffin.c index 8119172eef..9777896995 100644 --- a/console/griffin/griffin.c +++ b/console/griffin/griffin.c @@ -54,6 +54,16 @@ CONSOLE EXTENSIONS #include "../rarch_zlib.c" #endif +/*============================================================ +RLAUNCH +============================================================ */ + +#ifdef HAVE_RLAUNCH +#include "../../tools/retrolaunch/rl_fnmatch.c" +#include "../../tools/retrolaunch/sha1.c" +#include "../../tools/retrolaunch/cd_detect.c" +#include "../../tools/retrolaunch/parser.c" +#endif /*============================================================ PERFORMANCE diff --git a/frontend/menu/rmenu.c b/frontend/menu/rmenu.c index 1ce8643fd0..de0c2518dd 100644 --- a/frontend/menu/rmenu.c +++ b/frontend/menu/rmenu.c @@ -54,30 +54,30 @@ filebrowser_t *tmpBrowser; unsigned currently_selected_controller_menu = 0; static const struct retro_keybind _rmenu_nav_binds[] = { - { 0, 0, (enum retro_key)0, (1ULL << RETRO_DEVICE_ID_JOYPAD_UP) | (1ULL << RARCH_ANALOG_LEFT_Y_DPAD_UP), 0 }, - { 0, 0, (enum retro_key)0, (1ULL << RETRO_DEVICE_ID_JOYPAD_DOWN) | (1ULL << RARCH_ANALOG_LEFT_Y_DPAD_DOWN), 0 }, - { 0, 0, (enum retro_key)0, (1ULL << RETRO_DEVICE_ID_JOYPAD_LEFT) | (1ULL << RARCH_ANALOG_LEFT_X_DPAD_LEFT), 0 }, - { 0, 0, (enum retro_key)0, (1ULL << RETRO_DEVICE_ID_JOYPAD_RIGHT) | (1ULL << RARCH_ANALOG_LEFT_X_DPAD_RIGHT), 0 }, - { 0, 0, (enum retro_key)0, (1ULL << RARCH_ANALOG_LEFT_Y_DPAD_UP), 0 }, - { 0, 0, (enum retro_key)0, (1ULL << RARCH_ANALOG_LEFT_Y_DPAD_DOWN), 0 }, - { 0, 0, (enum retro_key)0, (1ULL << RARCH_ANALOG_LEFT_X_DPAD_LEFT), 0 }, - { 0, 0, (enum retro_key)0, (1ULL << RARCH_ANALOG_LEFT_X_DPAD_RIGHT), 0 }, - { 0, 0, (enum retro_key)0, (1ULL << RARCH_ANALOG_RIGHT_Y_DPAD_UP), 0 }, - { 0, 0, (enum retro_key)0, (1ULL << RARCH_ANALOG_RIGHT_Y_DPAD_DOWN), 0 }, - { 0, 0, (enum retro_key)0, (1ULL << RARCH_ANALOG_RIGHT_X_DPAD_LEFT), 0 }, - { 0, 0, (enum retro_key)0, (1ULL << RARCH_ANALOG_RIGHT_X_DPAD_RIGHT), 0 }, - { 0, 0, (enum retro_key)0, (1ULL << RETRO_DEVICE_ID_JOYPAD_B), 0 }, - { 0, 0, (enum retro_key)0, (1ULL << RETRO_DEVICE_ID_JOYPAD_A), 0 }, - { 0, 0, (enum retro_key)0, (1ULL << RETRO_DEVICE_ID_JOYPAD_X), 0 }, - { 0, 0, (enum retro_key)0, (1ULL << RETRO_DEVICE_ID_JOYPAD_Y), 0 }, - { 0, 0, (enum retro_key)0, (1ULL << RETRO_DEVICE_ID_JOYPAD_START), 0 }, - { 0, 0, (enum retro_key)0, (1ULL << RETRO_DEVICE_ID_JOYPAD_SELECT), 0 }, - { 0, 0, (enum retro_key)0, (1ULL << RETRO_DEVICE_ID_JOYPAD_L), 0 }, - { 0, 0, (enum retro_key)0, (1ULL << RETRO_DEVICE_ID_JOYPAD_R), 0 }, - { 0, 0, (enum retro_key)0, (1ULL << RETRO_DEVICE_ID_JOYPAD_L2), 0 }, - { 0, 0, (enum retro_key)0, (1ULL << RETRO_DEVICE_ID_JOYPAD_R2), 0 }, - { 0, 0, (enum retro_key)0, (1ULL << RETRO_DEVICE_ID_JOYPAD_L3), 0 }, - { 0, 0, (enum retro_key)0, (1ULL << RETRO_DEVICE_ID_JOYPAD_R3), 0 }, + { 0, 0, NULL, (enum retro_key)0, (1ULL << RETRO_DEVICE_ID_JOYPAD_UP) | (1ULL << RARCH_ANALOG_LEFT_Y_DPAD_UP), 0 }, + { 0, 0, NULL, (enum retro_key)0, (1ULL << RETRO_DEVICE_ID_JOYPAD_DOWN) | (1ULL << RARCH_ANALOG_LEFT_Y_DPAD_DOWN), 0 }, + { 0, 0, NULL, (enum retro_key)0, (1ULL << RETRO_DEVICE_ID_JOYPAD_LEFT) | (1ULL << RARCH_ANALOG_LEFT_X_DPAD_LEFT), 0 }, + { 0, 0, NULL, (enum retro_key)0, (1ULL << RETRO_DEVICE_ID_JOYPAD_RIGHT) | (1ULL << RARCH_ANALOG_LEFT_X_DPAD_RIGHT), 0 }, + { 0, 0, NULL, (enum retro_key)0, (1ULL << RARCH_ANALOG_LEFT_Y_DPAD_UP), 0 }, + { 0, 0, NULL, (enum retro_key)0, (1ULL << RARCH_ANALOG_LEFT_Y_DPAD_DOWN), 0 }, + { 0, 0, NULL, (enum retro_key)0, (1ULL << RARCH_ANALOG_LEFT_X_DPAD_LEFT), 0 }, + { 0, 0, NULL, (enum retro_key)0, (1ULL << RARCH_ANALOG_LEFT_X_DPAD_RIGHT), 0 }, + { 0, 0, NULL, (enum retro_key)0, (1ULL << RARCH_ANALOG_RIGHT_Y_DPAD_UP), 0 }, + { 0, 0, NULL, (enum retro_key)0, (1ULL << RARCH_ANALOG_RIGHT_Y_DPAD_DOWN), 0 }, + { 0, 0, NULL, (enum retro_key)0, (1ULL << RARCH_ANALOG_RIGHT_X_DPAD_LEFT), 0 }, + { 0, 0, NULL, (enum retro_key)0, (1ULL << RARCH_ANALOG_RIGHT_X_DPAD_RIGHT), 0 }, + { 0, 0, NULL, (enum retro_key)0, (1ULL << RETRO_DEVICE_ID_JOYPAD_B), 0 }, + { 0, 0, NULL, (enum retro_key)0, (1ULL << RETRO_DEVICE_ID_JOYPAD_A), 0 }, + { 0, 0, NULL, (enum retro_key)0, (1ULL << RETRO_DEVICE_ID_JOYPAD_X), 0 }, + { 0, 0, NULL, (enum retro_key)0, (1ULL << RETRO_DEVICE_ID_JOYPAD_Y), 0 }, + { 0, 0, NULL, (enum retro_key)0, (1ULL << RETRO_DEVICE_ID_JOYPAD_START), 0 }, + { 0, 0, NULL, (enum retro_key)0, (1ULL << RETRO_DEVICE_ID_JOYPAD_SELECT), 0 }, + { 0, 0, NULL, (enum retro_key)0, (1ULL << RETRO_DEVICE_ID_JOYPAD_L), 0 }, + { 0, 0, NULL, (enum retro_key)0, (1ULL << RETRO_DEVICE_ID_JOYPAD_R), 0 }, + { 0, 0, NULL, (enum retro_key)0, (1ULL << RETRO_DEVICE_ID_JOYPAD_L2), 0 }, + { 0, 0, NULL, (enum retro_key)0, (1ULL << RETRO_DEVICE_ID_JOYPAD_R2), 0 }, + { 0, 0, NULL, (enum retro_key)0, (1ULL << RETRO_DEVICE_ID_JOYPAD_L3), 0 }, + { 0, 0, NULL, (enum retro_key)0, (1ULL << RETRO_DEVICE_ID_JOYPAD_R3), 0 }, }; static const struct retro_keybind *rmenu_nav_binds[] = { diff --git a/frontend/menu/rmenu_gx.c b/frontend/menu/rmenu_gx.c index d66dbab603..543e251cdd 100644 --- a/frontend/menu/rmenu_gx.c +++ b/frontend/menu/rmenu_gx.c @@ -23,27 +23,27 @@ uint16_t menu_framebuf[400 * 240]; static const struct retro_keybind _rmenu_nav_binds[] = { #ifdef HW_RVL - { 0, 0, 0, GX_GC_UP | GX_GC_LSTICK_UP | GX_GC_RSTICK_UP | GX_CLASSIC_UP | GX_CLASSIC_LSTICK_UP | GX_CLASSIC_RSTICK_UP | GX_WIIMOTE_UP | GX_NUNCHUK_UP, 0 }, - { 0, 0, 0, GX_GC_DOWN | GX_GC_LSTICK_DOWN | GX_GC_RSTICK_DOWN | GX_CLASSIC_DOWN | GX_CLASSIC_LSTICK_DOWN | GX_CLASSIC_RSTICK_DOWN | GX_WIIMOTE_DOWN | GX_NUNCHUK_DOWN, 0 }, - { 0, 0, 0, GX_GC_LEFT | GX_GC_LSTICK_LEFT | GX_GC_RSTICK_LEFT | GX_CLASSIC_LEFT | GX_CLASSIC_LSTICK_LEFT | GX_CLASSIC_RSTICK_LEFT | GX_WIIMOTE_LEFT | GX_NUNCHUK_LEFT, 0 }, - { 0, 0, 0, GX_GC_RIGHT | GX_GC_LSTICK_RIGHT | GX_GC_RSTICK_RIGHT | GX_CLASSIC_RIGHT | GX_CLASSIC_LSTICK_RIGHT | GX_CLASSIC_RSTICK_RIGHT | GX_WIIMOTE_RIGHT | GX_NUNCHUK_RIGHT, 0 }, - { 0, 0, 0, GX_GC_A | GX_CLASSIC_A | GX_WIIMOTE_A | GX_WIIMOTE_2, 0 }, - { 0, 0, 0, GX_GC_B | GX_CLASSIC_B | GX_WIIMOTE_B | GX_WIIMOTE_1, 0 }, - { 0, 0, 0, GX_GC_START | GX_CLASSIC_PLUS | GX_WIIMOTE_PLUS, 0 }, - { 0, 0, 0, GX_GC_Z_TRIGGER | GX_CLASSIC_MINUS | GX_WIIMOTE_MINUS, 0 }, - { 0, 0, 0, GX_WIIMOTE_HOME | GX_CLASSIC_HOME, 0 }, + { 0, 0, NULL, 0, GX_GC_UP | GX_GC_LSTICK_UP | GX_GC_RSTICK_UP | GX_CLASSIC_UP | GX_CLASSIC_LSTICK_UP | GX_CLASSIC_RSTICK_UP | GX_WIIMOTE_UP | GX_NUNCHUK_UP, 0 }, + { 0, 0, NULL, 0, GX_GC_DOWN | GX_GC_LSTICK_DOWN | GX_GC_RSTICK_DOWN | GX_CLASSIC_DOWN | GX_CLASSIC_LSTICK_DOWN | GX_CLASSIC_RSTICK_DOWN | GX_WIIMOTE_DOWN | GX_NUNCHUK_DOWN, 0 }, + { 0, 0, NULL, 0, GX_GC_LEFT | GX_GC_LSTICK_LEFT | GX_GC_RSTICK_LEFT | GX_CLASSIC_LEFT | GX_CLASSIC_LSTICK_LEFT | GX_CLASSIC_RSTICK_LEFT | GX_WIIMOTE_LEFT | GX_NUNCHUK_LEFT, 0 }, + { 0, 0, NULL, 0, GX_GC_RIGHT | GX_GC_LSTICK_RIGHT | GX_GC_RSTICK_RIGHT | GX_CLASSIC_RIGHT | GX_CLASSIC_LSTICK_RIGHT | GX_CLASSIC_RSTICK_RIGHT | GX_WIIMOTE_RIGHT | GX_NUNCHUK_RIGHT, 0 }, + { 0, 0, NULL, 0, GX_GC_A | GX_CLASSIC_A | GX_WIIMOTE_A | GX_WIIMOTE_2, 0 }, + { 0, 0, NULL, 0, GX_GC_B | GX_CLASSIC_B | GX_WIIMOTE_B | GX_WIIMOTE_1, 0 }, + { 0, 0, NULL, 0, GX_GC_START | GX_CLASSIC_PLUS | GX_WIIMOTE_PLUS, 0 }, + { 0, 0, NULL, 0, GX_GC_Z_TRIGGER | GX_CLASSIC_MINUS | GX_WIIMOTE_MINUS, 0 }, + { 0, 0, NULL, 0, GX_WIIMOTE_HOME | GX_CLASSIC_HOME, 0 }, #else - { 0, 0, 0, GX_GC_UP | GX_GC_LSTICK_UP | GX_GC_RSTICK_UP, 0 }, - { 0, 0, 0, GX_GC_DOWN | GX_GC_LSTICK_DOWN | GX_GC_RSTICK_DOWN, 0 }, - { 0, 0, 0, GX_GC_LEFT | GX_GC_LSTICK_LEFT | GX_GC_RSTICK_LEFT, 0 }, - { 0, 0, 0, GX_GC_RIGHT | GX_GC_LSTICK_RIGHT | GX_GC_RSTICK_RIGHT, 0 }, - { 0, 0, 0, GX_GC_A, 0 }, - { 0, 0, 0, GX_GC_B, 0 }, - { 0, 0, 0, GX_GC_START, 0 }, - { 0, 0, 0, GX_GC_Z_TRIGGER, 0 }, - { 0, 0, 0, GX_WIIMOTE_HOME, 0 }, + { 0, 0, NULL, 0, GX_GC_UP | GX_GC_LSTICK_UP | GX_GC_RSTICK_UP, 0 }, + { 0, 0, NULL, 0, GX_GC_DOWN | GX_GC_LSTICK_DOWN | GX_GC_RSTICK_DOWN, 0 }, + { 0, 0, NULL, 0, GX_GC_LEFT | GX_GC_LSTICK_LEFT | GX_GC_RSTICK_LEFT, 0 }, + { 0, 0, NULL, 0, GX_GC_RIGHT | GX_GC_LSTICK_RIGHT | GX_GC_RSTICK_RIGHT, 0 }, + { 0, 0, NULL, 0, GX_GC_A, 0 }, + { 0, 0, NULL, 0, GX_GC_B, 0 }, + { 0, 0, NULL, 0, GX_GC_START, 0 }, + { 0, 0, NULL, 0, GX_GC_Z_TRIGGER, 0 }, + { 0, 0, NULL, 0, GX_WIIMOTE_HOME, 0 }, #endif - { 0, 0, 0, GX_QUIT_KEY, 0 }, + { 0, 0, NULL, 0, GX_QUIT_KEY, 0 }, }; static const struct retro_keybind *rmenu_nav_binds[] = {