From 3722826e0a470c96309496f560cce6407a6b0ce8 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 9 May 2016 17:43:38 +0200 Subject: [PATCH] Rename netplay/ to network/ --- Makefile.common | 2 +- command_event.c | 2 +- core_impl.c | 2 +- griffin/griffin.c | 8 ++++---- {netplay => network}/netplay.c | 0 {netplay => network}/netplay.h | 0 {netplay => network}/netplay_common.c | 0 {netplay => network}/netplay_net.c | 0 {netplay => network}/netplay_private.h | 0 {netplay => network}/netplay_spectate.c | 0 runloop.c | 2 +- 11 files changed, 8 insertions(+), 8 deletions(-) rename {netplay => network}/netplay.c (100%) rename {netplay => network}/netplay.h (100%) rename {netplay => network}/netplay_common.c (100%) rename {netplay => network}/netplay_net.c (100%) rename {netplay => network}/netplay_private.h (100%) rename {netplay => network}/netplay_spectate.c (100%) diff --git a/Makefile.common b/Makefile.common index 590d463b70..55355dc46e 100644 --- a/Makefile.common +++ b/Makefile.common @@ -974,7 +974,7 @@ ifeq ($(HAVE_NETWORKING), 1) ifeq ($(HAVE_NETPLAY), 1) DEFINES += -DHAVE_NETPLAY -DHAVE_NETWORK_CMD -DHAVE_NETWORK_GAMEPAD - OBJ += netplay/netplay_net.o netplay/netplay_spectate.o netplay/netplay_common.o netplay/netplay.o + OBJ += network/netplay_net.o network/netplay_spectate.o network/netplay_common.o network/netplay.o endif # Retro Achievements (also depends on threads) diff --git a/command_event.c b/command_event.c index bda2c88936..db0f9d2378 100644 --- a/command_event.c +++ b/command_event.c @@ -59,7 +59,7 @@ #endif #ifdef HAVE_NETPLAY -#include "netplay/netplay.h" +#include "network/netplay.h" #endif #ifdef HAVE_NETWORKING diff --git a/core_impl.c b/core_impl.c index f494381b5e..46941813cc 100644 --- a/core_impl.c +++ b/core_impl.c @@ -36,7 +36,7 @@ #include "audio/audio_driver.h" #ifdef HAVE_NETPLAY -#include "netplay/netplay.h" +#include "network/netplay.h" #endif static struct retro_core_t core; diff --git a/griffin/griffin.c b/griffin/griffin.c index 88d7530623..a8bbd49e97 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -785,10 +785,10 @@ THREAD NETPLAY ============================================================ */ #ifdef HAVE_NETPLAY -#include "../netplay/netplay_net.c" -#include "../netplay/netplay_spectate.c" -#include "../netplay/netplay_common.c" -#include "../netplay/netplay.c" +#include "../network/netplay_net.c" +#include "../network/netplay_spectate.c" +#include "../network/netplay_common.c" +#include "../network/netplay.c" #include "../libretro-common/net/net_compat.c" #include "../libretro-common/net/net_socket.c" #include "../libretro-common/net/net_http.c" diff --git a/netplay/netplay.c b/network/netplay.c similarity index 100% rename from netplay/netplay.c rename to network/netplay.c diff --git a/netplay/netplay.h b/network/netplay.h similarity index 100% rename from netplay/netplay.h rename to network/netplay.h diff --git a/netplay/netplay_common.c b/network/netplay_common.c similarity index 100% rename from netplay/netplay_common.c rename to network/netplay_common.c diff --git a/netplay/netplay_net.c b/network/netplay_net.c similarity index 100% rename from netplay/netplay_net.c rename to network/netplay_net.c diff --git a/netplay/netplay_private.h b/network/netplay_private.h similarity index 100% rename from netplay/netplay_private.h rename to network/netplay_private.h diff --git a/netplay/netplay_spectate.c b/network/netplay_spectate.c similarity index 100% rename from netplay/netplay_spectate.c rename to network/netplay_spectate.c diff --git a/runloop.c b/runloop.c index 1afee7ec94..a61dc2f21a 100644 --- a/runloop.c +++ b/runloop.c @@ -63,7 +63,7 @@ #endif #ifdef HAVE_NETPLAY -#include "netplay/netplay.h" +#include "network/netplay.h" #endif #include "verbosity.h"