From d39bad7b59cfcea94e46836c1e464b14469de732 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 14 Feb 2013 21:24:54 +0100 Subject: [PATCH] (NGC) Undefine HAVE_LIBRETRO_MANAGEMENT for Gamecube --- Makefile.ngc | 2 +- frontend/frontend_console.c | 4 ++-- frontend/frontend_console.h | 2 -- frontend/menu/rgui.c | 34 ++++++++++++++++++++++++++++++---- frontend/menu/rgui.h | 2 ++ frontend/menu/rmenu_gx.c | 4 ++++ 6 files changed, 39 insertions(+), 9 deletions(-) diff --git a/Makefile.ngc b/Makefile.ngc index 42270901d8..69e28c51f7 100644 --- 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_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 +CFLAGS += -std=gnu99 -DHAVE_DEFAULT_RETROPAD_INPUT -DHAVE_RMENU -DHAVE_RGUI -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/frontend/frontend_console.c b/frontend/frontend_console.c index 0c3baa8694..dc818f4eb7 100644 --- a/frontend/frontend_console.c +++ b/frontend/frontend_console.c @@ -113,8 +113,6 @@ static void verbose_log_init(void) RARCH_LOG("Turning on verbose logging...\n"); } -#ifdef HAVE_LIBRETRO_MANAGEMENT - // Transforms a library id to a name suitable as a pathname. static void get_libretro_core_name(char *name, size_t size) { @@ -143,6 +141,8 @@ static void get_libretro_core_name(char *name, size_t size) } } +#ifdef HAVE_LIBRETRO_MANAGEMENT + // If a CORE executable of name CORE.extension exists, rename filename // to a more sane name. static bool install_libretro_core(const char *core_exe_path, const char *tmp_path, const char *extension) diff --git a/frontend/frontend_console.h b/frontend/frontend_console.h index 8b4e4aa309..2b6362ffee 100644 --- a/frontend/frontend_console.h +++ b/frontend/frontend_console.h @@ -30,8 +30,6 @@ static void find_first_libretro_core(char *first_file, const char * ext); #endif -#ifdef HAVE_LIBRETRO_MANAGEMENT static void get_libretro_core_name(char *name, size_t size); -#endif #endif diff --git a/frontend/menu/rgui.c b/frontend/menu/rgui.c index b60bd191f9..ed035fa0d8 100644 --- a/frontend/menu/rgui.c +++ b/frontend/menu/rgui.c @@ -380,9 +380,12 @@ static void render_text(rgui_handle_t *rgui) rgui_file_type_t menu_type = 0; rgui_list_back(rgui->path_stack, &dir, &menu_type, NULL); +#ifdef HAVE_LIBRETRO_MANAGEMENT if (menu_type == RGUI_SETTINGS_CORE) snprintf(title, sizeof(title), "CORE SELECTION"); - else if (rgui_is_controller_menu(menu_type) || rgui_is_viewport_menu(menu_type) || menu_type == RGUI_SETTINGS) + else +#endif + if (rgui_is_controller_menu(menu_type) || rgui_is_viewport_menu(menu_type) || menu_type == RGUI_SETTINGS) snprintf(title, sizeof(title), "SETTINGS: %s", dir); else snprintf(title, sizeof(title), "FILE BROWSER: %s", dir); @@ -481,7 +484,9 @@ static void render_text(rgui_handle_t *rgui) snprintf(type_str, sizeof(type_str), (g_extern.lifecycle_mode_state & (1ULL << MODE_FPS_DRAW)) ? "ON" : "OFF"); break; case RGUI_SETTINGS_CUSTOM_VIEWPORT: +#ifdef HAVE_LIBRETRO_MANAGEMENT case RGUI_SETTINGS_CORE: +#endif case RGUI_SETTINGS_CONTROLLER_1: case RGUI_SETTINGS_CONTROLLER_2: case RGUI_SETTINGS_CONTROLLER_3: @@ -926,7 +931,9 @@ static void rgui_settings_populate_entries(rgui_handle_t *rgui) RGUI_MENU_ITEM("Audio Resampler", RGUI_SETTINGS_RESAMPLER_TYPE); RGUI_MENU_ITEM("SRAM Saves in \"sram\" Dir", RGUI_SETTINGS_SRAM_DIR); RGUI_MENU_ITEM("State Saves in \"state\" Dir", RGUI_SETTINGS_STATE_DIR); +#ifdef HAVE_LIBRETRO_MANAGEMENT RGUI_MENU_ITEM("Core", RGUI_SETTINGS_CORE); +#endif RGUI_MENU_ITEM("Controller #1 Config", RGUI_SETTINGS_CONTROLLER_1); RGUI_MENU_ITEM("Controller #2 Config", RGUI_SETTINGS_CONTROLLER_2); RGUI_MENU_ITEM("Controller #3 Config", RGUI_SETTINGS_CONTROLLER_3); @@ -1087,8 +1094,10 @@ int rgui_settings_iterate(rgui_handle_t *rgui, rgui_action_t action) rgui_file_type_t type = 0; const char *label = 0; rgui_list_at(rgui->folder_buf, rgui->directory_ptr, &label, &type, NULL); +#ifdef HAVE_LIBRETRO_MANAGEMENT if (type == RGUI_SETTINGS_CORE) label = default_paths.core_dir; +#endif const char *dir = 0; rgui_file_type_t menu_type = 0; size_t directory_ptr = 0; @@ -1124,7 +1133,12 @@ int rgui_settings_iterate(rgui_handle_t *rgui, rgui_action_t action) case RGUI_ACTION_RIGHT: case RGUI_ACTION_OK: case RGUI_ACTION_START: - if ((rgui_is_controller_menu(type) || type == RGUI_SETTINGS_CORE) && action == RGUI_ACTION_OK) + if ((rgui_is_controller_menu(type) +#ifdef HAVE_LIBRETRO_MANAGEMENT + || type == RGUI_SETTINGS_CORE +#endif + ) + && action == RGUI_ACTION_OK) { rgui_list_push(rgui->path_stack, label, type, rgui->directory_ptr); rgui->directory_ptr = 0; @@ -1160,7 +1174,11 @@ int rgui_settings_iterate(rgui_handle_t *rgui, rgui_action_t action) rgui_list_back(rgui->path_stack, &dir, &menu_type, &directory_ptr); - if (rgui->need_refresh && !(menu_type == RGUI_FILE_DIRECTORY || menu_type == RGUI_FILE_DEVICE || menu_type == RGUI_SETTINGS_CORE)) + if (rgui->need_refresh && !(menu_type == RGUI_FILE_DIRECTORY || menu_type == RGUI_FILE_DEVICE +#ifdef HAVE_LIBRETRO_MANAGEMENT + || menu_type == RGUI_SETTINGS_CORE +#endif + )) { rgui->need_refresh = false; if (rgui_is_controller_menu(menu_type)) @@ -1262,6 +1280,7 @@ int rgui_iterate(rgui_handle_t *rgui, rgui_action_t action) } else { +#ifdef HAVE_LIBRETRO_MANAGEMENT if (menu_type == RGUI_SETTINGS_CORE) { strlcpy(g_settings.libretro, path, sizeof(g_settings.libretro)); @@ -1277,6 +1296,7 @@ int rgui_iterate(rgui_handle_t *rgui, rgui_action_t action) g_extern.lifecycle_mode_state |= (1ULL << MODE_EXITSPAWN); } else +#endif { snprintf(rgui->path_buf, sizeof(rgui->path_buf), "%s/%s", dir, path); @@ -1299,6 +1319,7 @@ int rgui_iterate(rgui_handle_t *rgui, rgui_action_t action) break; case RGUI_ACTION_SETTINGS: +#ifdef HAVE_LIBRETRO_MANAGEMENT if (menu_type == RGUI_SETTINGS_CORE) { rgui->directory_ptr = directory_ptr; @@ -1306,6 +1327,7 @@ int rgui_iterate(rgui_handle_t *rgui, rgui_action_t action) rgui_list_pop(rgui->path_stack); } else +#endif { rgui_list_push(rgui->path_stack, "", RGUI_SETTINGS, rgui->directory_ptr); rgui->directory_ptr = 0; @@ -1323,7 +1345,11 @@ int rgui_iterate(rgui_handle_t *rgui, rgui_action_t action) // refresh values in case the stack changed rgui_list_back(rgui->path_stack, &dir, &menu_type, &directory_ptr); - if (rgui->need_refresh && (menu_type == RGUI_FILE_DIRECTORY || menu_type == RGUI_FILE_DEVICE || menu_type == RGUI_SETTINGS_CORE)) + if (rgui->need_refresh && (menu_type == RGUI_FILE_DIRECTORY || menu_type == RGUI_FILE_DEVICE +#ifdef HAVE_LIBRETRO_MANAGEMENT + || menu_type == RGUI_SETTINGS_CORE +#endif + )) { rgui->need_refresh = false; rgui_list_clear(rgui->folder_buf); diff --git a/frontend/menu/rgui.h b/frontend/menu/rgui.h index e6be443ad6..f187d41c2b 100644 --- a/frontend/menu/rgui.h +++ b/frontend/menu/rgui.h @@ -58,7 +58,9 @@ typedef enum RGUI_SETTINGS_ZIP_EXTRACT, RGUI_SETTINGS_SRAM_DIR, RGUI_SETTINGS_STATE_DIR, +#ifdef HAVE_LIBRETRO_MANAGEMENT RGUI_SETTINGS_CORE, +#endif RGUI_SETTINGS_CONTROLLER_1, RGUI_SETTINGS_CONTROLLER_2, RGUI_SETTINGS_CONTROLLER_3, diff --git a/frontend/menu/rmenu_gx.c b/frontend/menu/rmenu_gx.c index b2fa934d93..57601058a3 100644 --- a/frontend/menu/rmenu_gx.c +++ b/frontend/menu/rmenu_gx.c @@ -68,7 +68,11 @@ enum static bool folder_cb(const char *directory, rgui_file_enum_cb_t file_cb, void *userdata, void *ctx) { +#ifdef HAVE_LIBRETRO_MANAGEMENT bool core_chooser = (userdata) ? *(rgui_file_type_t *)userdata == RGUI_SETTINGS_CORE : false; +#else + bool core_chooser = false; +#endif if (!*directory) {