Move menu_popu.c to menu/widgets

This commit is contained in:
twinaphex 2016-09-11 21:03:31 +02:00
parent 6b66377ed6
commit 056cc8ece8
10 changed files with 23 additions and 16 deletions

View File

@ -510,7 +510,7 @@ ifeq ($(HAVE_MENU_COMMON), 1)
menu/menu_navigation.o \
menu/menu_setting.o \
menu/menu_shader.o \
menu/menu_popup.o \
menu/widgets/menu_popup.o \
menu/menu_cbs.o \
menu/cbs/menu_cbs_ok.o \
menu/cbs/menu_cbs_cancel.o \

View File

@ -48,7 +48,7 @@
#include "menu/menu_content.h"
#include "menu/menu_display.h"
#include "menu/menu_shader.h"
#include "menu/menu_popup.h"
#include "menu/widgets/menu_popup.h"
#endif
#ifdef HAVE_NETPLAY
@ -1897,7 +1897,11 @@ bool command_event(enum event_command cmd, void *data)
info_find.path = config_get_active_core_path();
if (!core_info_load(&info_find))
{
#ifdef HAVE_DYNAMIC
return false;
#endif
}
}
#endif
}

View File

@ -890,10 +890,10 @@ MENU
#include "../menu/menu_input.c"
#include "../menu/menu_entry.c"
#include "../menu/menu_entries.c"
#include "../menu/menu_popup.c"
#include "../menu/menu_setting.c"
#include "../menu/menu_cbs.c"
#include "../menu/menu_content.c"
#include "../menu/widgets/menu_popup.c"
#include "../menu/cbs/menu_cbs_ok.c"
#include "../menu/cbs/menu_cbs_cancel.c"
#include "../menu/cbs/menu_cbs_select.c"

View File

@ -31,7 +31,7 @@
#include "../menu_setting.h"
#include "../menu_shader.h"
#include "../menu_navigation.h"
#include "../menu_popup.h"
#include "../widgets/menu_popup.h"
#include "../menu_content.h"
#include "../../core.h"

View File

@ -25,7 +25,7 @@
#include "../menu_displaylist.h"
#include "../menu_navigation.h"
#include "../menu_entries.h"
#include "../menu_popup.h"
#include "../widgets/menu_popup.h"
#include "../../configuration.h"
#include "../../performance_counters.h"

View File

@ -44,7 +44,7 @@
#include "menu_content.h"
#include "menu_driver.h"
#include "menu_navigation.h"
#include "menu_popup.h"
#include "widgets/menu_popup.h"
#include "menu_cbs.h"
#include "../configuration.h"

View File

@ -29,7 +29,7 @@
#include "menu_cbs.h"
#include "menu_display.h"
#include "menu_navigation.h"
#include "menu_popup.h"
#include "widgets/menu_popup.h"
#include "menu_shader.h"
#include "../config.def.h"

View File

@ -17,22 +17,23 @@
#include <features/features_cpu.h>
#ifdef HAVE_CONFIG_H
#include "../config.h"
#include "../../config.h"
#endif
#ifdef HAVE_CHEEVOS
#include "../cheevos.h"
#include "../../cheevos.h"
#endif
#include "menu_display.h"
#include "menu_driver.h"
#include "menu_popup.h"
#include "../retroarch.h"
#include "../configuration.h"
#include "../menu_display.h"
#include "../menu_driver.h"
#include "../input/input_autodetect.h"
#include "../input/input_config.h"
#include "../../retroarch.h"
#include "../../configuration.h"
#include "../../input/input_autodetect.h"
#include "../../input/input_config.h"
static bool menu_popup_pending_push = false;
static bool menu_popup_active = false;

View File

@ -24,6 +24,8 @@
#include <retro_common_api.h>
#include "../../msg_hash.h"
enum menu_popup_type
{
MENU_POPUP_NONE = 0,

View File

@ -44,7 +44,7 @@
#ifdef HAVE_MENU
#include "menu/menu_display.h"
#include "menu/menu_driver.h"
#include "menu/menu_popup.h"
#include "menu/widgets/menu_popup.h"
#endif
#ifdef HAVE_NETPLAY