From 82b6ab3ec77c388abb6138e5d7eba09ded7b8a6e Mon Sep 17 00:00:00 2001
From: twinaphex <autechre1024@hotmail.com>
Date: Wed, 22 May 2013 00:29:48 +0200
Subject: [PATCH] (NGC) Build fixes

---
 frontend/frontend_console.c | 2 ++
 frontend/frontend_console.h | 2 --
 frontend/menu/rgui.c        | 4 ++--
 gx/gx_input.c               | 3 +++
 gx/gx_video_inl.h           | 2 ++
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/frontend/frontend_console.c b/frontend/frontend_console.c
index f532304590..6786341ba0 100644
--- a/frontend/frontend_console.c
+++ b/frontend/frontend_console.c
@@ -44,6 +44,7 @@ default_paths_t default_paths;
 
 // Rename core filename executable to a more sane name.
 
+#ifdef HAVE_LIBRETRO_MANAGEMENT
 static bool libretro_install_core(const char *path_prefix,
       const char *core_exe_path)
 {
@@ -76,6 +77,7 @@ static bool libretro_install_core(const char *path_prefix,
 
    return true;
 }
+#endif
 
 #define MAKE_DIR(x, name) { \
    RARCH_LOG("Checking directory name %s [%s]\n", name, x); \
diff --git a/frontend/frontend_console.h b/frontend/frontend_console.h
index 4675d3a3d8..181cdc36bd 100644
--- a/frontend/frontend_console.h
+++ b/frontend/frontend_console.h
@@ -1,7 +1,6 @@
 #ifndef _FRONTEND_CONSOLE_H
 #define _FRONTEND_CONSOLE_H
 
-#if defined(HAVE_LIBRETRO_MANAGEMENT) || defined(IS_SALAMANDER)
 #ifdef GEKKO
 #define SALAMANDER_FILE "boot.dol"
 #define DEFAULT_EXE_EXT ".dol"
@@ -15,6 +14,5 @@
 #define SALAMANDER_FILE "default.xex"
 #define DEFAULT_EXE_EXT ".xex"
 #endif
-#endif
 
 #endif
diff --git a/frontend/menu/rgui.c b/frontend/menu/rgui.c
index b5739701d7..cd82b46157 100644
--- a/frontend/menu/rgui.c
+++ b/frontend/menu/rgui.c
@@ -1028,7 +1028,7 @@ static int rgui_settings_toggle_setting(rgui_handle_t *rgui, unsigned setting, r
       case RGUI_SETTINGS_RESTART_EMULATOR:
          if (action == RGUI_ACTION_OK)
          {
-#ifdef GEKKO
+#if defined(GEKKO) && defined(HW_RVL)
             fill_pathname_join(g_extern.fullpath, default_paths.core_dir, SALAMANDER_FILE,
                   sizeof(g_extern.fullpath));
 #endif
@@ -2555,7 +2555,7 @@ int rgui_iterate(rgui_handle_t *rgui)
 
                // Core selection on non-console just updates directory listing.
                // Will take affect on new ROM load.
-#elif defined(GEKKO)
+#elif defined(GEKKO) && defined(HW_RVL)
                strlcpy(g_settings.libretro, path, sizeof(g_settings.libretro)); // Is this supposed to be here?
                fill_pathname_join(g_extern.fullpath, default_paths.core_dir,
                      SALAMANDER_FILE, sizeof(g_extern.fullpath));
diff --git a/gx/gx_input.c b/gx/gx_input.c
index b05d25c455..252d32951c 100644
--- a/gx/gx_input.c
+++ b/gx/gx_input.c
@@ -130,7 +130,10 @@ const struct platform_bind platform_keys[] = {
 };
 
 static bool g_menu;
+
+#ifdef HW_RVL
 static bool g_quit;
+#endif
 
 static int16_t gx_input_state(void *data, const struct retro_keybind **binds,
       unsigned port, unsigned device,
diff --git a/gx/gx_video_inl.h b/gx/gx_video_inl.h
index 35d34f4fac..d8f3456c22 100644
--- a/gx/gx_video_inl.h
+++ b/gx/gx_video_inl.h
@@ -133,6 +133,7 @@ static GXTexRegion* __GXDefTexRegionCallback(GXTexObj *obj,u8 mapid)
 	__gx->mtxIdxLo = (__gx->mtxIdxLo&~0x3f)|(mtx&0x3f); \
 	__gx->dirtyState |= 0x04000000
 
+#if defined(HW_RVL)
 #define GX_CopyDisp(dest,clear) \
 	u8 clflag; \
 	u32 val; \
@@ -164,5 +165,6 @@ static GXTexRegion* __GXDefTexRegionCallback(GXTexObj *obj,u8 mapid)
 		GX_LOAD_BP_REG(__gx->peCMode0); \
 	} \
 	if(clflag) GX_LOAD_BP_REG(__gx->peCntrl)
+#endif
 
 #define GX_LoadTexObj(obj,mapid) GX_LoadTexObjPreloaded(obj,(__GXDefTexRegionCallback(obj,mapid)),mapid)