(NGC) Remove sidestep code

Warriors-Blade · Feb 14, 2013 · f0770ee · f0770ee
1 parent 236cae2
commit f0770ee
Show file tree

Hide file tree

Showing 11 changed files with 9 additions and 574 deletions.
diff --git a/Makefile.ngc b/Makefile.ngc
@@ -53,7 +53,7 @@ CFLAGS		+= -DHAVE_FILE_LOGGER
 CFLAGS          += -Iconsole/logger
 endif
 
-CFLAGS += -std=gnu99 -DHAVE_DEFAULT_RETROPAD_INPUT -DHAVE_RMENU -DHAVE_RGUI -DHAVE_THREAD -DRARCH_CONSOLE -DHAVE_LIBRETRO_MANAGEMENT -DHAVE_RARCH_EXEC -DGEKKO -DHAVE_ZLIB -DWANT_RZLIB -DHAVE_RARCH_MAIN_WRAP -DHAVE_GRIFFIN=1 -DHAVE_SCREENSHOTS -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -Dmain=rarch_main -Wno-char-subscripts 
+CFLAGS += -std=gnu99 -DHAVE_DEFAULT_RETROPAD_INPUT -DHAVE_RMENU -DHAVE_RGUI -DHAVE_LIBRETRO_MANAGEMENT -DHAVE_THREAD -DRARCH_CONSOLE -DGEKKO -DHAVE_ZLIB -DWANT_RZLIB -DHAVE_RARCH_MAIN_WRAP -DHAVE_GRIFFIN=1 -DHAVE_SCREENSHOTS -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -Dmain=rarch_main -Wno-char-subscripts 
 
 ifeq ($(DEBUG), 1)
    CFLAGS += -O0 -g

diff --git a/Makefile.ngc.salamander b/Makefile.ngc.salamander
diff --git a/console/griffin/griffin.c b/console/griffin/griffin.c
@@ -37,7 +37,6 @@ CONSOLE EXTENSIONS
 
 #ifdef HW_DOL
 #include "../../ngc/ssaram.c"
-#include "../../ngc/sidestep.c"
 #endif
 
 #ifdef HAVE_DEFAULT_RETROPAD_INPUT

diff --git a/dist-scripts/ngc-cores.sh b/dist-scripts/ngc-cores.sh
@@ -1,11 +1,7 @@
 #!/bin/sh
 
-make -C ../ -f Makefile.ngc.salamander clean || exit 1
 make -C ../ -f Makefile.ngc clean || exit 1
 
-make -C ../ -f Makefile.ngc.salamander || exit 1
-make -C ../ -f Makefile.ngc.salamander pkg || exit 1
-
 for f in *_ngc.a ; do
    name=`echo "$f" | sed 's/\(_libretro\|\)_ngc.a$//'`
    whole_archive=

diff --git a/frontend/frontend_console.c b/frontend/frontend_console.c
@@ -28,7 +28,9 @@
 #include "platform/platform_ps3_exec.c"
 #elif defined(GEKKO)
 #include "platform/platform_gx.c"
+#ifdef HW_RVL
 #include "platform/platform_gx_exec.c"
+#endif
 #elif defined(_XBOX)
 #include "platform/platform_xdk.c"
 #include "platform/platform_xdk_exec.c"

diff --git a/frontend/frontend_console.h b/frontend/frontend_console.h
@@ -18,7 +18,9 @@
 #define _FRONTEND_CONSOLE_H
 
 //optional RetroArch forward declarations
+#ifdef HAVE_RARCH_EXEC
 static void rarch_console_exec(const char *path);
+#endif
 static void verbose_log_init(void);
 
 #ifdef IS_SALAMANDER

diff --git a/frontend/platform/platform_gx.c b/frontend/platform/platform_gx.c
@@ -334,9 +334,9 @@ static void system_init(void)
 
 static void system_exitspawn(void)
 {
-#ifdef IS_SALAMANDER
+#if defined(IS_SALAMANDER)
    rarch_console_exec(default_paths.libretro_path);
-#else
+#elif defined(HW_RVL)
    // try to launch the core directly first, then fallback to salamander
    rarch_console_exec(g_settings.libretro);
    rarch_console_exec(g_extern.fullpath);

diff --git a/frontend/platform/platform_gx_exec.c b/frontend/platform/platform_gx_exec.c
diff --git a/gx/gx_video.c b/gx/gx_video.c
@@ -693,6 +693,8 @@ static void gx_resize(void *data)
    unsigned width = gx->win_width, height = gx->win_height;
    uint64_t lifecycle_mode_state = g_extern.lifecycle_mode_state;
 
+   (void)lifecycle_mode_state;
+
 #ifdef HW_RVL
    VIDEO_SetTrapFilter(lifecycle_mode_state & (1ULL << MODE_VIDEO_SOFT_FILTER_ENABLE));
 #endif