From 056cc8ece8e025d79c29dc771a0cb96c528e7ef9 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 11 Sep 2016 21:03:31 +0200 Subject: [PATCH] Move menu_popu.c to menu/widgets --- Makefile.common | 2 +- command.c | 6 +++++- griffin/griffin.c | 2 +- menu/cbs/menu_cbs_ok.c | 2 +- menu/drivers/menu_generic.c | 2 +- menu/menu_displaylist.c | 2 +- menu/menu_driver.c | 2 +- menu/{ => widgets}/menu_popup.c | 17 +++++++++-------- menu/{ => widgets}/menu_popup.h | 2 ++ runloop.c | 2 +- 10 files changed, 23 insertions(+), 16 deletions(-) rename menu/{ => widgets}/menu_popup.c (97%) rename menu/{ => widgets}/menu_popup.h (98%) diff --git a/Makefile.common b/Makefile.common index 83498869c0..25286b2e61 100644 --- a/Makefile.common +++ b/Makefile.common @@ -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 \ diff --git a/command.c b/command.c index 8054de5ec8..3af331896b 100644 --- a/command.c +++ b/command.c @@ -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 } diff --git a/griffin/griffin.c b/griffin/griffin.c index a3508ccd5c..e38f6657b0 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -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" diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c index 55067866b5..a6acfe2f46 100644 --- a/menu/cbs/menu_cbs_ok.c +++ b/menu/cbs/menu_cbs_ok.c @@ -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" diff --git a/menu/drivers/menu_generic.c b/menu/drivers/menu_generic.c index 1e8a08bcd1..1dbd5a1fdc 100644 --- a/menu/drivers/menu_generic.c +++ b/menu/drivers/menu_generic.c @@ -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" diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 130b230c64..95f2549667 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -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" diff --git a/menu/menu_driver.c b/menu/menu_driver.c index 17f26cd316..75ed0853bd 100644 --- a/menu/menu_driver.c +++ b/menu/menu_driver.c @@ -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" diff --git a/menu/menu_popup.c b/menu/widgets/menu_popup.c similarity index 97% rename from menu/menu_popup.c rename to menu/widgets/menu_popup.c index 431a8f547b..9c0f376fc3 100644 --- a/menu/menu_popup.c +++ b/menu/widgets/menu_popup.c @@ -17,22 +17,23 @@ #include #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; diff --git a/menu/menu_popup.h b/menu/widgets/menu_popup.h similarity index 98% rename from menu/menu_popup.h rename to menu/widgets/menu_popup.h index f766332975..06f254783e 100644 --- a/menu/menu_popup.h +++ b/menu/widgets/menu_popup.h @@ -24,6 +24,8 @@ #include +#include "../../msg_hash.h" + enum menu_popup_type { MENU_POPUP_NONE = 0, diff --git a/runloop.c b/runloop.c index 24264bf3c4..71b5e84798 100644 --- a/runloop.c +++ b/runloop.c @@ -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