From 6dc758a080fdbd2499168422642b9bb8bc6de618 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 21 May 2020 23:23:01 +0200 Subject: [PATCH] Move cheevos-new to cheevos/ --- Makefile.common | 10 +++++----- {cheevos-new => cheevos}/badges.c | 0 {cheevos-new => cheevos}/badges.h | 0 {cheevos-new => cheevos}/cheevos.c | 0 {cheevos-new => cheevos}/cheevos.h | 0 {cheevos-new => cheevos}/coro.h | 0 {cheevos-new => cheevos}/fixup.c | 0 {cheevos-new => cheevos}/fixup.h | 0 {cheevos-new => cheevos}/hash.c | 0 {cheevos-new => cheevos}/hash.h | 0 {cheevos-new => cheevos}/parser.c | 0 {cheevos-new => cheevos}/parser.h | 0 {cheevos-new => cheevos}/util.h | 0 gfx/gfx_widgets.c | 2 +- griffin/griffin.c | 10 +++++----- managers/cheat_manager.c | 2 +- menu/cbs/menu_cbs_get_value.c | 2 +- menu/cbs/menu_cbs_ok.c | 2 +- menu/cbs/menu_cbs_sublabel.c | 2 +- menu/drivers/ozone/ozone_texture.c | 2 +- menu/drivers/stripes.c | 2 +- menu/drivers/xmb.c | 2 +- menu/menu_displaylist.c | 2 +- menu/menu_setting.c | 2 +- menu/widgets/menu_dialog.c | 2 +- network/discord.c | 2 +- retroarch.c | 4 ++-- tasks/task_content.c | 2 +- 28 files changed, 25 insertions(+), 25 deletions(-) rename {cheevos-new => cheevos}/badges.c (100%) rename {cheevos-new => cheevos}/badges.h (100%) rename {cheevos-new => cheevos}/cheevos.c (100%) rename {cheevos-new => cheevos}/cheevos.h (100%) rename {cheevos-new => cheevos}/coro.h (100%) rename {cheevos-new => cheevos}/fixup.c (100%) rename {cheevos-new => cheevos}/fixup.h (100%) rename {cheevos-new => cheevos}/hash.c (100%) rename {cheevos-new => cheevos}/hash.h (100%) rename {cheevos-new => cheevos}/parser.c (100%) rename {cheevos-new => cheevos}/parser.h (100%) rename {cheevos-new => cheevos}/util.h (100%) diff --git a/Makefile.common b/Makefile.common index 89f07121c3..a18a4ec671 100644 --- a/Makefile.common +++ b/Makefile.common @@ -1845,11 +1845,11 @@ ifeq ($(HAVE_NETWORKING), 1) DEFINES += -DHAVE_CHEEVOS INCLUDE_DIRS += -Ideps/rcheevos/include - OBJ += cheevos-new/cheevos.o \ - cheevos-new/badges.o \ - cheevos-new/fixup.o \ - cheevos-new/parser.o \ - cheevos-new/hash.o \ + OBJ += cheevos/cheevos.o \ + cheevos/badges.o \ + cheevos/fixup.o \ + cheevos/parser.o \ + cheevos/hash.o \ $(LIBRETRO_COMM_DIR)/formats/cdfs/cdfs.o \ deps/rcheevos/src/rcheevos/alloc.o \ deps/rcheevos/src/rcheevos/compat.o \ diff --git a/cheevos-new/badges.c b/cheevos/badges.c similarity index 100% rename from cheevos-new/badges.c rename to cheevos/badges.c diff --git a/cheevos-new/badges.h b/cheevos/badges.h similarity index 100% rename from cheevos-new/badges.h rename to cheevos/badges.h diff --git a/cheevos-new/cheevos.c b/cheevos/cheevos.c similarity index 100% rename from cheevos-new/cheevos.c rename to cheevos/cheevos.c diff --git a/cheevos-new/cheevos.h b/cheevos/cheevos.h similarity index 100% rename from cheevos-new/cheevos.h rename to cheevos/cheevos.h diff --git a/cheevos-new/coro.h b/cheevos/coro.h similarity index 100% rename from cheevos-new/coro.h rename to cheevos/coro.h diff --git a/cheevos-new/fixup.c b/cheevos/fixup.c similarity index 100% rename from cheevos-new/fixup.c rename to cheevos/fixup.c diff --git a/cheevos-new/fixup.h b/cheevos/fixup.h similarity index 100% rename from cheevos-new/fixup.h rename to cheevos/fixup.h diff --git a/cheevos-new/hash.c b/cheevos/hash.c similarity index 100% rename from cheevos-new/hash.c rename to cheevos/hash.c diff --git a/cheevos-new/hash.h b/cheevos/hash.h similarity index 100% rename from cheevos-new/hash.h rename to cheevos/hash.h diff --git a/cheevos-new/parser.c b/cheevos/parser.c similarity index 100% rename from cheevos-new/parser.c rename to cheevos/parser.c diff --git a/cheevos-new/parser.h b/cheevos/parser.h similarity index 100% rename from cheevos-new/parser.h rename to cheevos/parser.h diff --git a/cheevos-new/util.h b/cheevos/util.h similarity index 100% rename from cheevos-new/util.h rename to cheevos/util.h diff --git a/gfx/gfx_widgets.c b/gfx/gfx_widgets.c index f34a0ce3ed..7118c76bf5 100644 --- a/gfx/gfx_widgets.c +++ b/gfx/gfx_widgets.c @@ -44,7 +44,7 @@ #include "../tasks/task_content.h" #ifdef HAVE_CHEEVOS -#include "../cheevos-new/badges.h" +#include "../cheevos/badges.h" #endif static bool widgets_inited = false; diff --git a/griffin/griffin.c b/griffin/griffin.c index b7e28112a1..28cc31a289 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -174,11 +174,11 @@ ACHIEVEMENTS #include "../libretro-common/formats/cdfs/cdfs.c" #include "../network/net_http_special.c" -#include "../cheevos-new/cheevos.c" -#include "../cheevos-new/badges.c" -#include "../cheevos-new/fixup.c" -#include "../cheevos-new/hash.c" -#include "../cheevos-new/parser.c" +#include "../cheevos/cheevos.c" +#include "../cheevos/badges.c" +#include "../cheevos/fixup.c" +#include "../cheevos/hash.c" +#include "../cheevos/parser.c" #include "../deps/rcheevos/src/rcheevos/alloc.c" #include "../deps/rcheevos/src/rcheevos/compat.c" diff --git a/managers/cheat_manager.c b/managers/cheat_manager.c index b7209c818e..22851cc067 100644 --- a/managers/cheat_manager.c +++ b/managers/cheat_manager.c @@ -38,7 +38,7 @@ #endif #ifdef HAVE_CHEEVOS -#include "../cheevos-new/cheevos.h" +#include "../cheevos/cheevos.h" #endif #include "cheat_manager.h" diff --git a/menu/cbs/menu_cbs_get_value.c b/menu/cbs/menu_cbs_get_value.c index 9c5fcbe5fc..c1b8d6d293 100644 --- a/menu/cbs/menu_cbs_get_value.c +++ b/menu/cbs/menu_cbs_get_value.c @@ -49,7 +49,7 @@ #endif #ifdef HAVE_CHEEVOS -#include "../../cheevos-new/cheevos.h" +#include "../../cheevos/cheevos.h" #endif #ifndef BIND_ACTION_GET_VALUE diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c index 2bd26efcb1..22ec4b824f 100644 --- a/menu/cbs/menu_cbs_ok.c +++ b/menu/cbs/menu_cbs_ok.c @@ -84,7 +84,7 @@ #endif #ifdef HAVE_CHEEVOS -#include "../../cheevos-new/cheevos.h" +#include "../../cheevos/cheevos.h" #endif #ifdef __WINRT__ diff --git a/menu/cbs/menu_cbs_sublabel.c b/menu/cbs/menu_cbs_sublabel.c index 6c8e8ab826..fb8706a54a 100644 --- a/menu/cbs/menu_cbs_sublabel.c +++ b/menu/cbs/menu_cbs_sublabel.c @@ -26,7 +26,7 @@ #include "../../managers/core_option_manager.h" #ifdef HAVE_CHEEVOS -#include "../../cheevos-new/cheevos.h" +#include "../../cheevos/cheevos.h" #endif #include "../../core_info.h" #include "../../verbosity.h" diff --git a/menu/drivers/ozone/ozone_texture.c b/menu/drivers/ozone/ozone_texture.c index aa6b712e27..15a0d0e2b3 100644 --- a/menu/drivers/ozone/ozone_texture.c +++ b/menu/drivers/ozone/ozone_texture.c @@ -24,7 +24,7 @@ #include #ifdef HAVE_CHEEVOS -#include "../../../cheevos-new/badges.h" +#include "../../../cheevos/badges.h" #endif #include "../../../verbosity.h" diff --git a/menu/drivers/stripes.c b/menu/drivers/stripes.c index 991bf6f334..7b2ecac23d 100644 --- a/menu/drivers/stripes.c +++ b/menu/drivers/stripes.c @@ -59,7 +59,7 @@ #include "../../tasks/tasks_internal.h" #ifdef HAVE_CHEEVOS -#include "../../cheevos-new/badges.h" +#include "../../cheevos/badges.h" #endif #include "../../content.h" diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index c2979b1e2a..04d6b9a1f2 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -56,7 +56,7 @@ #include "../../tasks/tasks_internal.h" -#include "../../cheevos-new/badges.h" +#include "../../cheevos/badges.h" #include "../../content.h" #define XMB_RIBBON_ROWS 64 diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 52fa8005cc..2fc1f61b92 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -39,7 +39,7 @@ #endif #ifdef HAVE_CHEEVOS -#include "../cheevos-new/cheevos.h" +#include "../cheevos/cheevos.h" #endif #ifdef HAVE_NETWORKING diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 30f6239e24..cb989d0d57 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -53,7 +53,7 @@ #endif #ifdef HAVE_CHEEVOS -#include "../cheevos-new/cheevos.h" +#include "../cheevos/cheevos.h" #endif #ifdef HAVE_TRANSLATE diff --git a/menu/widgets/menu_dialog.c b/menu/widgets/menu_dialog.c index 4a3551d3a7..df11a034d1 100644 --- a/menu/widgets/menu_dialog.c +++ b/menu/widgets/menu_dialog.c @@ -24,7 +24,7 @@ #endif #ifdef HAVE_CHEEVOS -#include "../../cheevos-new/cheevos.h" +#include "../../cheevos/cheevos.h" #endif #include "menu_dialog.h" diff --git a/network/discord.c b/network/discord.c index 92f6234378..882da7ae64 100644 --- a/network/discord.c +++ b/network/discord.c @@ -44,7 +44,7 @@ #endif #ifdef HAVE_CHEEVOS -#include "../cheevos-new/cheevos.h" +#include "../cheevos/cheevos.h" #endif #ifdef HAVE_MENU diff --git a/retroarch.c b/retroarch.c index 1942c8a549..46224cb30a 100644 --- a/retroarch.c +++ b/retroarch.c @@ -155,8 +155,8 @@ #include "input/input_remapping.h" #ifdef HAVE_CHEEVOS -#include "cheevos-new/cheevos.h" -#include "cheevos-new/fixup.h" +#include "cheevos/cheevos.h" +#include "cheevos/fixup.h" #endif #ifdef HAVE_TRANSLATE diff --git a/tasks/task_content.c b/tasks/task_content.c index 13ef8d75fc..2120fe5725 100644 --- a/tasks/task_content.c +++ b/tasks/task_content.c @@ -82,7 +82,7 @@ #endif #ifdef HAVE_CHEEVOS -#include "../cheevos-new/cheevos.h" +#include "../cheevos/cheevos.h" #endif #include "task_content.h"