diff --git a/Makefile.common b/Makefile.common index 369ee893da..39d701ac95 100644 --- a/Makefile.common +++ b/Makefile.common @@ -1105,14 +1105,11 @@ ifeq ($(HAVE_NETWORKING), 1) endif # Netplay - - ifeq ($(HAVE_NETPLAY), 1) - DEFINES += -DHAVE_NETPLAY -DHAVE_NETWORK_CMD - OBJ += network/netplay/netplay_net.o \ - network/netplay/netplay_spectate.o \ - network/netplay/netplay_common.o \ - network/netplay/netplay.o - endif + DEFINES += -DHAVE_NETWORK_CMD + OBJ += network/netplay/netplay_net.o \ + network/netplay/netplay_spectate.o \ + network/netplay/netplay_common.o \ + network/netplay/netplay.o # Retro Achievements (also depends on threads) diff --git a/Makefile.griffin b/Makefile.griffin index c900e0009c..b9570a042c 100644 --- a/Makefile.griffin +++ b/Makefile.griffin @@ -244,7 +244,6 @@ else ifeq ($(platform), vita) HAVE_7ZIP := 1 HAVE_VITA2D := 1 HAVE_NETWORKING := 1 - HAVE_NETPLAY := 1 HAVE_OVERLAY := 1 HAVE_MATERIALUI := 1 HAVE_XMB := 1 @@ -345,10 +344,6 @@ ifeq ($(HAVE_NETWORKING), 1) CFLAGS += -DHAVE_NETWORKING endif -ifeq ($(HAVE_NETPLAY), 1) -CFLAGS += -DHAVE_NETPLAY -endif - ifeq ($(RARCH_CONSOLE), 1) CFLAGS += -DRARCH_CONSOLE endif diff --git a/Makefile.ps3 b/Makefile.ps3 index c76da65eae..1272b7d346 100644 --- a/Makefile.ps3 +++ b/Makefile.ps3 @@ -106,7 +106,7 @@ PPU_LDLIBS = $(FONT_LIBS) $(GL_LIBS) $(WHOLE_START) -lretro_ps3 $(WHOLE_END) -l PPU_RANLIB = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ranlib.exe -DEFINES += -DHAVE_THREADS -DRARCH_CONSOLE -DHAVE_OPENGL -DHAVE_HEADSET -DHAVE_LANGEXTRA -DHAVE_OPENGLES -DHAVE_OPENGLES1 -DHAVE_PSGL -DHAVE_CG -DHAVE_CG_RUNTIME_COMPILER -DHAVE_FBO -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_RSOUND -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DHAVE_7Z -DWANT_ZLIB -DSINC_LOWER_QUALITY -D__CELLOS_LV2__ -DHAVE_NETPLAY=1 -DHAVE_NETWORKING=1 -DHAVE_SOCKET_LEGACY=1 -DHAVE_MOUSE -DHAVE_GRIFFIN=1 -DHAVE_MULTIMAN=1 -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) -DHAVE_FILTERS_BUILTIN -DHAVE_BUILTIN_AUTOCONFIG +DEFINES += -DHAVE_THREADS -DRARCH_CONSOLE -DHAVE_OPENGL -DHAVE_HEADSET -DHAVE_LANGEXTRA -DHAVE_OPENGLES -DHAVE_OPENGLES1 -DHAVE_PSGL -DHAVE_CG -DHAVE_CG_RUNTIME_COMPILER -DHAVE_FBO -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_RSOUND -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DHAVE_7Z -DWANT_ZLIB -DSINC_LOWER_QUALITY -D__CELLOS_LV2__ -DHAVE_NETWORKING=1 -DHAVE_SOCKET_LEGACY=1 -DHAVE_MOUSE -DHAVE_GRIFFIN=1 -DHAVE_MULTIMAN=1 -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) -DHAVE_FILTERS_BUILTIN -DHAVE_BUILTIN_AUTOCONFIG #DEFINES += -DHAVE_IMAGEVIEWER diff --git a/Makefile.ps3.cobra b/Makefile.ps3.cobra index a35132b85b..2a0d0e6d19 100644 --- a/Makefile.ps3.cobra +++ b/Makefile.ps3.cobra @@ -104,7 +104,7 @@ PPU_LDLIBS = $(FONT_LIBS) $(GL_LIBS) $(WHOLE_START) -lretro_ps3 $(WHOLE_END) -l PPU_RANLIB = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ranlib.exe -DEFINES += -DHAVE_THREADS -DRARCH_CONSOLE -DHAVE_OPENGL -DHAVE_OVERLAY -DHAVE_HEADSET -DHAVE_OPENGLES -DHAVE_OPENGLES1 -DHAVE_PSGL -DHAVE_CG -DHAVE_CG_RUNTIME_COMPILER -DHAVE_FBO -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_RSOUND -DHAVE_ZLIB -DHAVE_RPNG -DWANT_ZLIB -DSINC_LOWER_QUALITY -D__CELLOS_LV2__ -DHAVE_NETPLAY=1 -DHAVE_SOCKET_LEGACY=1 -DHAVE_MOUSE -DHAVE_GRIFFIN=1 -DHAVE_MULTIMAN=0 -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) +DEFINES += -DHAVE_THREADS -DRARCH_CONSOLE -DHAVE_OPENGL -DHAVE_OVERLAY -DHAVE_HEADSET -DHAVE_OPENGLES -DHAVE_OPENGLES1 -DHAVE_PSGL -DHAVE_CG -DHAVE_CG_RUNTIME_COMPILER -DHAVE_FBO -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_RSOUND -DHAVE_ZLIB -DHAVE_RPNG -DWANT_ZLIB -DSINC_LOWER_QUALITY -D__CELLOS_LV2__ -DHAVE_NETWORKING=1 -DHAVE_SOCKET_LEGACY=1 -DHAVE_MOUSE -DHAVE_GRIFFIN=1 -DHAVE_MULTIMAN=0 -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) ifeq ($(DEBUG), 1) PPU_OPTIMIZE_LV := -O0 -g diff --git a/Makefile.psl1ght b/Makefile.psl1ght index aec9fe76b5..f570901a16 100644 --- a/Makefile.psl1ght +++ b/Makefile.psl1ght @@ -89,7 +89,7 @@ ifeq ($(HAVE_FILE_LOGGER), 1) CFLAGS += -DHAVE_FILE_LOGGER endif -SHARED_FLAGS := -DRARCH_CONSOLE -DHAVE_OPENGL -DHAVE_OVERLAY -DHAVE_HEADSET -DHAVE_OPENGLES -DHAVE_OPENGLES1 -DHAVE_PSGL -DHAVE_CG -DHAVE_CG_RUNTIME_COMPILER -DHAVE_GCMGL -DHAVE_FBO -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_MOUSE -DHAVE_ZLIB -DHAVE_RPNG -DWANT_ZLIB -DHAVE_GRIFFIN=1 -DHAVE_NETPLAY=1 -DHAVE_SOCKET_LEGACY=1 -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) -Wno-char-subscripts +SHARED_FLAGS := -DRARCH_CONSOLE -DHAVE_OPENGL -DHAVE_OVERLAY -DHAVE_HEADSET -DHAVE_OPENGLES -DHAVE_OPENGLES1 -DHAVE_PSGL -DHAVE_CG -DHAVE_CG_RUNTIME_COMPILER -DHAVE_GCMGL -DHAVE_FBO -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_MOUSE -DHAVE_ZLIB -DHAVE_RPNG -DWANT_ZLIB -DHAVE_GRIFFIN=1 -DHAVE_NETWORKING=1 -DHAVE_SOCKET_LEGACY=1 -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) -Wno-char-subscripts CFLAGS += -std=gnu99 $(SHARED_FLAGS) CXXFLAGS += $(SHARED_FLAGS) diff --git a/Makefile.win b/Makefile.win index a4663b5976..df7f2502dc 100644 --- a/Makefile.win +++ b/Makefile.win @@ -7,7 +7,6 @@ HAVE_OPENGL = 1 HAVE_FBO = 1 HAVE_DYLIB = 1 HAVE_D3D9 = 1 -HAVE_NETPLAY = 1 HAVE_NETWORKING = 1 HAVE_STDIN_CMD = 1 HAVE_COMMAND = 1 diff --git a/audio/audio_driver.c b/audio/audio_driver.c index efb2e55a73..675b091b51 100644 --- a/audio/audio_driver.c +++ b/audio/audio_driver.c @@ -870,7 +870,7 @@ bool audio_driver_deinit(void) bool audio_driver_set_callback(const void *data) { const struct retro_audio_callback *cb = (const struct retro_audio_callback*)data; -#ifdef HAVE_NETPLAY +#ifdef HAVE_NETWORKING global_t *global = global_get_ptr(); if (global->netplay.enable) return false; diff --git a/command.c b/command.c index ae6e100855..64b5f6c2d4 100644 --- a/command.c +++ b/command.c @@ -51,12 +51,9 @@ #include "menu/widgets/menu_dialog.h" #endif -#ifdef HAVE_NETPLAY -#include "network/netplay/netplay.h" -#endif - #ifdef HAVE_NETWORKING #include +#include "network/netplay/netplay.h" #endif #include "command.h" @@ -102,7 +99,7 @@ struct command size_t stdin_buf_ptr; #endif -#if defined(HAVE_NETWORK_CMD) && defined(HAVE_NETPLAY) +#if defined(HAVE_NETWORKING) && defined(HAVE_NETWORK_CMD) int net_fd; #endif @@ -116,17 +113,17 @@ enum cmd_source_t CMD_NETWORK }; -#if defined(HAVE_STDIN_CMD) || defined(HAVE_NETWORK_CMD) && defined(HAVE_NETPLAY) +#if defined(HAVE_STDIN_CMD) || defined(HAVE_NETWORK_CMD) && defined(HAVE_NETWORKING) static enum cmd_source_t lastcmd_source; #endif -#if defined(HAVE_NETWORK_CMD) && defined(HAVE_NETPLAY) +#if defined(HAVE_NETWORKING) && defined(HAVE_NETWORK_CMD) static int lastcmd_net_fd; static struct sockaddr_storage lastcmd_net_source; static socklen_t lastcmd_net_source_len; #endif #ifdef HAVE_CHEEVOS -#if defined(HAVE_STDIN_CMD) || defined(HAVE_NETWORK_CMD) && defined(HAVE_NETPLAY) +#if defined(HAVE_STDIN_CMD) || defined(HAVE_NETWORK_CMD) && defined(HAVE_NETWORKING) static bool command_reply(const char * data, size_t len) { #ifdef HAVE_STDIN_CMD @@ -136,7 +133,7 @@ static bool command_reply(const char * data, size_t len) return true; } #endif -#if defined(HAVE_NETWORK_CMD) && defined(HAVE_NETPLAY) +#if defined(HAVE_NETWORKING) && defined(HAVE_NETWORK_CMD) if (lastcmd_source == CMD_NETWORK) { sendto(lastcmd_net_fd, data, len, 0, @@ -384,7 +381,7 @@ static void command_parse_msg(command_t *handle, char *buf, enum cmd_source_t so lastcmd_source = CMD_NONE; } -#if defined(HAVE_NETWORK_CMD) && defined(HAVE_NETPLAY) +#if defined(HAVE_NETWORKING) && defined(HAVE_NETWORK_CMD) static bool command_network_init(command_t *handle, uint16_t port) { int fd; @@ -579,7 +576,7 @@ static void command_network_poll(command_t *handle) static bool command_stdin_init(command_t *handle) { #ifndef _WIN32 -#ifdef HAVE_NETPLAY +#ifdef HAVE_NETWORKING if (!socket_nonblock(STDIN_FILENO)) return false; #endif @@ -610,7 +607,7 @@ bool command_network_new( if (!handle) return false; -#if defined(HAVE_NETWORK_CMD) && defined(HAVE_NETPLAY) +#if defined(HAVE_NETWORKING) && defined(HAVE_NETWORK_CMD) handle->net_fd = -1; if (network_enable && !command_network_init(handle, port)) goto error; @@ -624,7 +621,7 @@ bool command_network_new( return true; -#if (defined(HAVE_NETWORK_CMD) && defined(HAVE_NETPLAY)) || defined(HAVE_STDIN_CMD) +#if (defined(HAVE_NETWORK_CMD) && defined(HAVE_NETWORKING)) || defined(HAVE_STDIN_CMD) error: command_free(handle); return false; @@ -792,7 +789,7 @@ bool command_poll(command_t *handle) { memset(handle->state, 0, sizeof(handle->state)); -#if defined(HAVE_NETWORK_CMD) && defined(HAVE_NETPLAY) +#if defined(HAVE_NETWORKING) && defined(HAVE_NETWORK_CMD) command_network_poll(handle); #endif @@ -824,7 +821,7 @@ bool command_set(command_handle_t *handle) bool command_free(command_t *handle) { -#if defined(HAVE_NETWORK_CMD) && defined(HAVE_NETPLAY) +#if defined(HAVE_NETWORKING) && defined(HAVE_NETWORK_CMD) if (handle && handle->net_fd >= 0) socket_close(handle->net_fd); #endif @@ -1191,7 +1188,7 @@ static void command_event_deinit_core(bool reinit) static void command_event_init_cheats(void) { bool allow_cheats = true; -#ifdef HAVE_NETPLAY +#ifdef HAVE_NETWORKING allow_cheats &= !netplay_driver_ctl( RARCH_NETPLAY_CTL_IS_DATA_INITED, NULL); #endif @@ -1211,7 +1208,7 @@ static void command_event_load_auto_state(void) settings_t *settings = config_get_ptr(); global_t *global = global_get_ptr(); -#ifdef HAVE_NETPLAY +#ifdef HAVE_NETWORKING if (global->netplay.enable && !global->netplay.is_spectate) return; #endif @@ -1315,7 +1312,7 @@ static bool event_init_content(void) if (content_does_not_need_content()) { -#ifdef HAVE_NETPLAY +#ifdef HAVE_NETWORKING global_t *global = global_get_ptr(); if (global->netplay.enable) RARCH_ERR("sorry, unimplemented: cores that don't demand content cannot participate in netplay\n"); @@ -1670,7 +1667,7 @@ static void command_event_load_state(const char *path, char *s, size_t len) return; } -#ifdef HAVE_NETPLAY +#ifdef HAVE_NETWORKING netplay_driver_ctl(RARCH_NETPLAY_CTL_LOAD_SAVESTATE, NULL); #endif @@ -1701,7 +1698,7 @@ static void command_event_undo_load_state(char *s, size_t len) return; } -#ifdef HAVE_NETPLAY +#ifdef HAVE_NETWORKING netplay_driver_ctl(RARCH_NETPLAY_CTL_LOAD_SAVESTATE, NULL); #endif @@ -2024,7 +2021,7 @@ bool command_event(enum event_command cmd, void *data) cheat_manager_apply_cheats(); break; case CMD_EVENT_REWIND_DEINIT: -#ifdef HAVE_NETPLAY +#ifdef HAVE_NETWORKING if (netplay_driver_ctl(RARCH_NETPLAY_CTL_IS_DATA_INITED, NULL)) return false; #endif @@ -2040,7 +2037,7 @@ bool command_event(enum event_command cmd, void *data) if (settings->cheevos.hardcore_mode_enable) return false; #endif -#ifdef HAVE_NETPLAY +#ifdef HAVE_NETWORKING if (!netplay_driver_ctl(RARCH_NETPLAY_CTL_IS_DATA_INITED, NULL)) #endif state_manager_event_init(); @@ -2397,7 +2394,7 @@ bool command_event(enum event_command cmd, void *data) bsv_movie_ctl(BSV_MOVIE_CTL_INIT, NULL); break; case CMD_EVENT_NETPLAY_DEINIT: -#ifdef HAVE_NETPLAY +#ifdef HAVE_NETWORKING deinit_netplay(); #endif break; @@ -2413,13 +2410,13 @@ bool command_event(enum event_command cmd, void *data) break; case CMD_EVENT_NETPLAY_INIT: command_event(CMD_EVENT_NETPLAY_DEINIT, NULL); -#ifdef HAVE_NETPLAY +#ifdef HAVE_NETWORKING if (!init_netplay()) return false; #endif break; case CMD_EVENT_NETPLAY_FLIP_PLAYERS: -#ifdef HAVE_NETPLAY +#ifdef HAVE_NETWORKING netplay_driver_ctl(RARCH_NETPLAY_CTL_FLIP_PLAYERS, NULL); #endif break; diff --git a/command.h b/command.h index 82a69977e4..0b5843059f 100644 --- a/command.h +++ b/command.h @@ -214,7 +214,7 @@ enum event_command }; #ifdef HAVE_COMMAND -#if defined(HAVE_NETWORK_CMD) && defined(HAVE_NETPLAY) +#if defined(HAVE_NETWORKING) && defined(HAVE_NETWORK_CMD) bool command_network_send(const char *cmd_); #endif #endif diff --git a/config.features.h b/config.features.h index cb6f2d9ce5..ed14ae8c94 100644 --- a/config.features.h +++ b/config.features.h @@ -272,7 +272,7 @@ static const bool _freetype_supp = true; static const bool _freetype_supp = false; #endif -#ifdef HAVE_NETPLAY +#ifdef HAVE_NETWORKING static const bool _netplay_supp = true; #else static const bool _netplay_supp = false; diff --git a/configuration.c b/configuration.c index de1f18d9e3..3147e2f203 100644 --- a/configuration.c +++ b/configuration.c @@ -586,7 +586,7 @@ static int populate_settings_path(settings_t *settings, struct config_path_setti SETTING_PATH("audio_dsp_plugin", settings->path.audio_dsp_plugin, false, NULL, true); SETTING_PATH("core_updater_buildbot_url", settings->network.buildbot_url, false, NULL, true); SETTING_PATH("core_updater_buildbot_assets_url", settings->network.buildbot_assets_url, false, NULL, true); -#ifdef HAVE_NETPLAY +#ifdef HAVE_NETWORKING SETTING_PATH("netplay_ip_address", global->netplay.server, false, NULL, true); #endif SETTING_PATH("recording_output_directory", @@ -801,7 +801,7 @@ static int populate_settings_bool(settings_t *settings, struct config_bool_setti #ifdef HAVE_NETWORKGAMEPAD SETTING_BOOL("network_remote_enable", &settings->network_remote_enable, false, false /* TODO */, false); #endif -#ifdef HAVE_NETPLAY +#ifdef HAVE_NETWORKING SETTING_BOOL("netplay_spectator_mode_enable",&global->netplay.is_spectate, false, false /* TODO */, false); SETTING_BOOL("netplay_mode", &global->netplay.is_client, false, false /* TODO */, false); #endif @@ -867,7 +867,7 @@ static int populate_settings_int(settings_t *settings, struct config_int_setting { unsigned count = 0; struct config_int_setting *tmp = NULL; -#ifdef HAVE_NETPLAY +#ifdef HAVE_NETWORKING global_t *global = global_get_ptr(); #endif @@ -931,7 +931,7 @@ static int populate_settings_int(settings_t *settings, struct config_int_setting SETTING_INT("video_rotation", &settings->video.rotation, true, ORIENTATION_NORMAL, false); SETTING_INT("aspect_ratio_index", &settings->video.aspect_ratio_idx, true, aspect_ratio_idx, false); SETTING_INT("state_slot", (unsigned*)&settings->state_slot, false, 0 /* TODO */, false); -#ifdef HAVE_NETPLAY +#ifdef HAVE_NETWORKING SETTING_INT("netplay_ip_port", &global->netplay.port, false, 0 /* TODO */, false); SETTING_INT("netplay_delay_frames", &global->netplay.sync_frames, false, 16, false); SETTING_INT("netplay_check_frames", &global->netplay.check_frames, false, 0, false); @@ -1688,7 +1688,7 @@ static bool config_load_file(const char *path, bool set_defaults, struct config_array_setting *array_settings = NULL; struct config_path_setting *path_settings = NULL; char *override_username = NULL; -#ifdef HAVE_NETPLAY +#ifdef HAVE_NETWORKING char *override_netplay_ip_address = NULL; #endif global_t *global = global_get_ptr(); @@ -1753,7 +1753,7 @@ static bool config_load_file(const char *path, bool set_defaults, if (rarch_ctl(RARCH_CTL_HAS_SET_USERNAME, NULL)) override_username = strdup(settings->username); -#ifdef HAVE_NETPLAY +#ifdef HAVE_NETWORKING if (retroarch_override_setting_is_set(RARCH_OVERRIDE_SETTING_NETPLAY_IP_ADDRESS)) override_netplay_ip_address = strdup(global->netplay.server); #endif @@ -1794,7 +1794,7 @@ static bool config_load_file(const char *path, bool set_defaults, rarch_ctl(RARCH_CTL_UNSET_IPS_PREF, NULL); } -#ifdef HAVE_NETPLAY +#ifdef HAVE_NETWORKING if (!retroarch_override_setting_is_set(RARCH_OVERRIDE_SETTING_NETPLAY_MODE)) CONFIG_GET_BOOL_BASE(conf, global, netplay.is_spectate, "netplay_spectator_mode_enable"); @@ -1844,7 +1844,7 @@ static bool config_load_file(const char *path, bool set_defaults, *int_settings[i].ptr = tmp; } -#ifdef HAVE_NETPLAY +#ifdef HAVE_NETWORKING if (!retroarch_override_setting_is_set(RARCH_OVERRIDE_SETTING_NETPLAY_DELAY_FRAMES)) CONFIG_GET_INT_BASE(conf, global, netplay.sync_frames, "netplay_delay_frames"); if (!retroarch_override_setting_is_set(RARCH_OVERRIDE_SETTING_NETPLAY_CHECK_FRAMES)) @@ -1941,7 +1941,7 @@ static bool config_load_file(const char *path, bool set_defaults, free(override_username); } -#ifdef HAVE_NETPLAY +#ifdef HAVE_NETWORKING if (retroarch_override_setting_is_set(RARCH_OVERRIDE_SETTING_NETPLAY_IP_ADDRESS)) { strlcpy(global->netplay.server, override_netplay_ip_address, sizeof(global->netplay.server)); @@ -2196,7 +2196,7 @@ bool config_load_override(void) const char *game_name = NULL; bool should_append = false; rarch_system_info_t *system = NULL; -#ifdef HAVE_NETPLAY +#ifdef HAVE_NETWORKING global_t *global = global_get_ptr(); #endif @@ -2273,7 +2273,7 @@ bool config_load_override(void) return false; /* Re-load the configuration with any overrides that might have been found */ -#ifdef HAVE_NETPLAY +#ifdef HAVE_NETWORKING if (global && global->netplay.enable) { RARCH_WARN("[overrides] can't use overrides in conjunction with netplay, disabling overrides.\n"); diff --git a/core_impl.c b/core_impl.c index 8c7daa8e0f..7c94811b0d 100644 --- a/core_impl.c +++ b/core_impl.c @@ -30,7 +30,7 @@ #include "config.h" #endif -#ifdef HAVE_NETPLAY +#ifdef HAVE_NETWORKING #include "network/netplay/netplay.h" #endif @@ -99,7 +99,7 @@ static bool core_init_libretro_cbs(void *data) core_set_default_callbacks(cbs); -#ifdef HAVE_NETPLAY +#ifdef HAVE_NETWORKING if (!netplay_driver_ctl(RARCH_NETPLAY_CTL_IS_DATA_INITED, NULL)) return true; diff --git a/cores/internal_cores.h b/cores/internal_cores.h index 221f358d06..94fe4ef939 100644 --- a/cores/internal_cores.h +++ b/cores/internal_cores.h @@ -21,6 +21,10 @@ #include #include +#ifdef HAVE_CONFIG_H +#include "../config.h" +#endif + void libretro_dummy_retro_init(void); void libretro_dummy_retro_deinit(void); @@ -184,7 +188,7 @@ size_t libretro_imageviewer_retro_get_memory_size(unsigned id); #endif -#if defined(HAVE_NETWORKGAMEPAD) && defined(HAVE_NETPLAY) +#if defined(HAVE_NETWORKGAMEPAD) && defined(HAVE_NETWORKING) /* Internal networked retropad core. */ void libretro_netretropad_retro_init(void); diff --git a/defines/ps3_defines.h b/defines/ps3_defines.h index 7168a2caa3..8c93c0a6cd 100644 --- a/defines/ps3_defines.h +++ b/defines/ps3_defines.h @@ -564,7 +564,7 @@ extern int audioAddData(uint32_t portNum, float *data, uint32_t frames, float vo NET PROTOTYPES ============================================================ */ -#if defined(HAVE_NETPLAY) +#if defined(HAVE_NETWORKING) #ifdef __PSL1GHT__ #include diff --git a/dynamic.c b/dynamic.c index 5e102ab252..8284d2feac 100644 --- a/dynamic.c +++ b/dynamic.c @@ -81,7 +81,7 @@ static dylib_t lib_handle; #define SYMBOL_IMAGEVIEWER(x) current_core->x = libretro_imageviewer_##x #endif -#if defined(HAVE_NETWORKGAMEPAD) && defined(HAVE_NETPLAY) +#if defined(HAVE_NETWORKING) && defined(HAVE_NETWORKGAMEPAD) #define SYMBOL_NETRETROPAD(x) current_core->x = libretro_netretropad_##x #endif @@ -521,7 +521,7 @@ static void load_symbols(enum rarch_core_type type, struct retro_core_t *current #endif break; case CORE_TYPE_NETRETROPAD: -#if defined(HAVE_NETWORKGAMEPAD) && defined(HAVE_NETPLAY) +#if defined(HAVE_NETWORKING) && defined(HAVE_NETWORKGAMEPAD) SYMBOL_NETRETROPAD(retro_init); SYMBOL_NETRETROPAD(retro_deinit); diff --git a/griffin/griffin.c b/griffin/griffin.c index 6bb4bfc8ce..1f82198a78 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -119,7 +119,7 @@ CONFIG FILE ACHIEVEMENTS ============================================================ */ #if defined(HAVE_CHEEVOS) && defined(HAVE_THREADS) -#if !defined(HAVE_NETPLAY) +#if !defined(HAVE_NETWORKING) #include "../libretro-common/net/net_http.c" #endif @@ -856,7 +856,7 @@ THREAD /*============================================================ NETPLAY ============================================================ */ -#ifdef HAVE_NETPLAY +#ifdef HAVE_NETWORKING #include "../network/netplay/netplay_net.c" #include "../network/netplay/netplay_spectate.c" #include "../network/netplay/netplay_common.c" diff --git a/input/input_remote.c b/input/input_remote.c index 1ea9d685d5..61eab5e813 100644 --- a/input/input_remote.c +++ b/input/input_remote.c @@ -58,7 +58,7 @@ struct remote_message struct input_remote { -#if defined(HAVE_NETWORKGAMEPAD) && defined(HAVE_NETPLAY) +#if defined(HAVE_NETWORKING) && defined(HAVE_NETWORKGAMEPAD) int net_fd[MAX_USERS]; #endif @@ -80,7 +80,7 @@ static input_remote_state_t *input_remote_get_state_ptr(void) return &remote_st_ptr; } -#if defined(HAVE_NETWORKGAMEPAD) && defined(HAVE_NETPLAY) +#if defined(HAVE_NETWORKING) && defined(HAVE_NETWORKGAMEPAD) static bool input_remote_init_network(input_remote_t *handle, uint16_t port, unsigned user) { @@ -124,7 +124,7 @@ error: input_remote_t *input_remote_new(uint16_t port) { unsigned user; -#if defined(HAVE_NETWORKGAMEPAD) && defined(HAVE_NETPLAY) +#if defined(HAVE_NETWORKING) && defined(HAVE_NETWORKGAMEPAD) settings_t *settings = config_get_ptr(); #endif input_remote_t *handle = (input_remote_t*) @@ -135,7 +135,7 @@ input_remote_t *input_remote_new(uint16_t port) (void)port; -#if defined(HAVE_NETWORKGAMEPAD) && defined(HAVE_NETPLAY) +#if defined(HAVE_NETWORKING) && defined(HAVE_NETWORKGAMEPAD) for(user = 0; user < settings->input.max_users; user ++) { handle->net_fd[user] = -1; @@ -147,7 +147,7 @@ input_remote_t *input_remote_new(uint16_t port) return handle; -#if defined(HAVE_NETWORKGAMEPAD) && defined(HAVE_NETPLAY) +#if defined(HAVE_NETWORKING) && defined(HAVE_NETWORKGAMEPAD) error: input_remote_free(handle); return NULL; @@ -157,7 +157,7 @@ error: void input_remote_free(input_remote_t *handle) { unsigned user; -#if defined(HAVE_NETWORKGAMEPAD) && defined(HAVE_NETPLAY) +#if defined(HAVE_NETWORKING) && defined(HAVE_NETWORKGAMEPAD) settings_t *settings = config_get_ptr(); for(user = 0; user < settings->input.max_users; user ++) @@ -167,7 +167,7 @@ void input_remote_free(input_remote_t *handle) free(handle); } -#if defined(HAVE_NETWORKGAMEPAD) && defined(HAVE_NETPLAY) +#if defined(HAVE_NETWORKING) && defined(HAVE_NETWORKGAMEPAD) static void input_remote_parse_packet(struct remote_message *msg, unsigned user) { input_remote_state_t *ol_state = input_remote_get_state_ptr(); @@ -240,7 +240,7 @@ void input_remote_poll(input_remote_t *handle) { if (settings->network_remote_enable_user[user]) { -#if defined(HAVE_NETWORKGAMEPAD) && defined(HAVE_NETPLAY) +#if defined(HAVE_NETWORKING) && defined(HAVE_NETWORKGAMEPAD) struct remote_message msg; ssize_t ret; fd_set fds; diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c index 61b56d3d8d..cedfe8a5ee 100644 --- a/menu/cbs/menu_cbs_ok.c +++ b/menu/cbs/menu_cbs_ok.c @@ -50,7 +50,7 @@ #include "../../lakka.h" #include "../../wifi/wifi_driver.h" -#ifdef HAVE_NETPLAY +#ifdef HAVE_NETWORKING #include "../../network/netplay/netplay.h" #endif @@ -3273,7 +3273,7 @@ static int action_ok_video_resolution(const char *path, static int action_ok_netplay_enable_host(const char *path, const char *label, unsigned type, size_t idx, size_t entry_idx) { -#ifdef HAVE_NETPLAY +#ifdef HAVE_NETWORKING bool netplay_was_on = false; global_t *global = global_get_ptr(); @@ -3327,7 +3327,7 @@ static int action_ok_netplay_enable_host(const char *path, static int action_ok_netplay_enable_client(const char *path, const char *label, unsigned type, size_t idx, size_t entry_idx) { -#ifdef HAVE_NETPLAY +#ifdef HAVE_NETWORKING bool netplay_was_on = false; global_t *global = global_get_ptr(); @@ -3380,7 +3380,7 @@ static int action_ok_netplay_enable_client(const char *path, static int action_ok_netplay_disconnect(const char *path, const char *label, unsigned type, size_t idx, size_t entry_idx) { -#ifdef HAVE_NETPLAY +#ifdef HAVE_NETWORKING netplay_driver_ctl(RARCH_NETPLAY_CTL_DISCONNECT, NULL); return generic_action_ok_command(CMD_EVENT_RESUME); diff --git a/menu/drivers/materialui.c b/menu/drivers/materialui.c index a92aa26a72..91bea9f9c3 100644 --- a/menu/drivers/materialui.c +++ b/menu/drivers/materialui.c @@ -1651,8 +1651,7 @@ static int mui_list_push(void *data, void *userdata, #endif entry.enum_idx = MENU_ENUM_LABEL_ONLINE_UPDATER; menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry); -#endif -#if defined(HAVE_NETPLAY) + entry.enum_idx = MENU_ENUM_LABEL_NETPLAY; menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry); #endif diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index 2d486b5c58..9a366cfbb7 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -3358,8 +3358,7 @@ static int xmb_list_push(void *data, void *userdata, #if defined(HAVE_NETWORKING) entry.enum_idx = MENU_ENUM_LABEL_ONLINE_UPDATER; menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry); -#endif -#if defined(HAVE_NETPLAY) + entry.enum_idx = MENU_ENUM_LABEL_NETPLAY; menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry); #endif diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index a7e7922b7e..9f7735f0e5 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -414,7 +414,7 @@ static int menu_displaylist_parse_core_info(menu_displaylist_info_t *info) return 0; } -#ifdef HAVE_NETPLAY +#ifdef HAVE_NETWORKING #ifndef HAVE_SOCKET_LEGACY #include @@ -1503,7 +1503,7 @@ static int menu_displaylist_parse_shader_options(menu_displaylist_info_t *info) static int menu_displaylist_parse_netplay( menu_displaylist_info_t *info) { -#ifdef HAVE_NETPLAY +#ifdef HAVE_NETWORKING menu_entries_append_enum(info->list, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETPLAY_ENABLE_HOST), msg_hash_to_str(MENU_ENUM_LABEL_NETPLAY_ENABLE_HOST), @@ -2753,7 +2753,7 @@ static int menu_displaylist_parse_information_list( MENU_ENUM_LABEL_CORE_INFORMATION, MENU_SETTING_ACTION, 0, 0); -#ifdef HAVE_NETPLAY +#ifdef HAVE_NETWORKING #ifndef HAVE_SOCKET_LEGACY menu_entries_append_enum(info->list, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETWORK_INFORMATION), @@ -4275,7 +4275,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) menu_displaylist_parse_settings_enum(menu, info, MENU_ENUM_LABEL_ADD_CONTENT_LIST, PARSE_ACTION, false); -#if defined(HAVE_NETPLAY) +#ifdef HAVE_NETWORKING menu_displaylist_parse_settings_enum(menu, info, MENU_ENUM_LABEL_NETPLAY, PARSE_ACTION, false); @@ -5582,7 +5582,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) info->need_push = true; break; case DISPLAYLIST_NETWORK_INFO: -#ifdef HAVE_NETPLAY +#ifdef HAVE_NETWORKING #ifndef HAVE_SOCKET_LEGACY menu_displaylist_parse_network_info(info); #endif diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 92179d411c..11df264913 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -1644,7 +1644,7 @@ void general_write_handler(void *data) } break; case MENU_ENUM_LABEL_NETPLAY_IP_ADDRESS: -#ifdef HAVE_NETPLAY +#ifdef HAVE_NETWORKING { bool val = (!string_is_empty(setting->value.target.string)); if (val) @@ -1655,20 +1655,20 @@ void general_write_handler(void *data) #endif break; case MENU_ENUM_LABEL_NETPLAY_MODE: -#ifdef HAVE_NETPLAY +#ifdef HAVE_NETWORKING if (!global->netplay.is_client) *global->netplay.server = '\0'; retroarch_override_setting_set(RARCH_OVERRIDE_SETTING_NETPLAY_MODE); #endif break; case MENU_ENUM_LABEL_NETPLAY_SPECTATOR_MODE_ENABLE: -#ifdef HAVE_NETPLAY +#ifdef HAVE_NETWORKING if (global->netplay.is_spectate) *global->netplay.server = '\0'; #endif break; case MENU_ENUM_LABEL_NETPLAY_DELAY_FRAMES: -#ifdef HAVE_NETPLAY +#ifdef HAVE_NETWORKING { bool val = (global->netplay.sync_frames > 0); @@ -1680,7 +1680,7 @@ void general_write_handler(void *data) #endif break; case MENU_ENUM_LABEL_NETPLAY_CHECK_FRAMES: -#ifdef HAVE_NETPLAY +#ifdef HAVE_NETWORKING { bool val = (global->netplay.check_frames > 0); @@ -2113,7 +2113,7 @@ static bool setting_append_list( menu_settings_list_current_add_enum_idx(list, list_info, MENU_ENUM_LABEL_START_VIDEO_PROCESSOR); #endif -#if defined(HAVE_NETPLAY) && defined(HAVE_NETWORKGAMEPAD) +#if defined(HAVE_NETWORKING) && defined(HAVE_NETWORKGAMEPAD) CONFIG_ACTION( list, list_info, msg_hash_to_str(MENU_ENUM_LABEL_START_NET_RETROPAD), @@ -2187,7 +2187,7 @@ static bool setting_append_list( parent_group); menu_settings_list_current_add_enum_idx(list, list_info, MENU_ENUM_LABEL_ADD_CONTENT_LIST); -#if defined(HAVE_NETPLAY) +#if defined(HAVE_NETWORKING) CONFIG_ACTION( list, list_info, msg_hash_to_str(MENU_ENUM_LABEL_NETPLAY), @@ -5771,7 +5771,7 @@ static bool setting_append_list( START_SUB_GROUP(list, list_info, "Netplay", &group_info, &subgroup_info, parent_group); { -#ifdef HAVE_NETPLAY +#if defined(HAVE_NETWORKING) #if defined(HAVE_NETWORK_CMD) unsigned user; #endif diff --git a/paths.c b/paths.c index f3b8054f42..d69d4fba7a 100644 --- a/paths.c +++ b/paths.c @@ -25,7 +25,7 @@ #include "config.h" #endif -#ifdef HAVE_NETPLAY +#ifdef HAVE_NETWORKING #include "network/netplay/netplay.h" #endif @@ -390,7 +390,7 @@ void path_init_savefile(void) { bool should_sram_be_used = rarch_ctl(RARCH_CTL_IS_SRAM_USED, NULL) && !rarch_ctl(RARCH_CTL_IS_SRAM_SAVE_DISABLED, NULL); -#ifdef HAVE_NETPLAY +#ifdef HAVE_NETWORKING global_t *global = global_get_ptr(); should_sram_be_used = should_sram_be_used && diff --git a/pkg/android/phoenix/jni/Android.mk b/pkg/android/phoenix/jni/Android.mk index 118275c4d3..f6897c0397 100644 --- a/pkg/android/phoenix/jni/Android.mk +++ b/pkg/android/phoenix/jni/Android.mk @@ -57,7 +57,7 @@ else GLES_LIB := -lGLESv2 endif -DEFINES += -DRARCH_MOBILE -DHAVE_GRIFFIN -DHAVE_LANGEXTRA -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_FBO -DHAVE_OVERLAY -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DGLSL_DEBUG -DHAVE_DYLIB -DHAVE_EGL -DHAVE_GLSL -DHAVE_MENU -DHAVE_RGUI -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DINLINE=inline -DHAVE_THREADS -D__LIBRETRO__ -DHAVE_RSOUND -DHAVE_NETPLAY -DHAVE_NETWORKGAMEPAD -DHAVE_NETWORKING -DRARCH_INTERNAL -DHAVE_FILTERS_BUILTIN -DHAVE_MATERIALUI -DHAVE_XMB -DHAVE_SHADERPIPELINE -DHAVE_LIBRETRODB -DHAVE_STB_FONT -DHAVE_IMAGEVIEWER -DHAVE_UPDATE_ASSETS +DEFINES += -DRARCH_MOBILE -DHAVE_GRIFFIN -DHAVE_LANGEXTRA -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_FBO -DHAVE_OVERLAY -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DGLSL_DEBUG -DHAVE_DYLIB -DHAVE_EGL -DHAVE_GLSL -DHAVE_MENU -DHAVE_RGUI -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DINLINE=inline -DHAVE_THREADS -D__LIBRETRO__ -DHAVE_RSOUND -DHAVE_NETWORKGAMEPAD -DHAVE_NETWORKING -DRARCH_INTERNAL -DHAVE_FILTERS_BUILTIN -DHAVE_MATERIALUI -DHAVE_XMB -DHAVE_SHADERPIPELINE -DHAVE_LIBRETRODB -DHAVE_STB_FONT -DHAVE_IMAGEVIEWER -DHAVE_UPDATE_ASSETS DEFINES += -DWANT_IFADDRS ifeq ($(HAVE_VULKAN),1) diff --git a/pkg/apple/RetroArch.xcodeproj/project.pbxproj b/pkg/apple/RetroArch.xcodeproj/project.pbxproj index 1622d8312a..3a860fa2c7 100644 --- a/pkg/apple/RetroArch.xcodeproj/project.pbxproj +++ b/pkg/apple/RetroArch.xcodeproj/project.pbxproj @@ -407,7 +407,6 @@ "-DHAVE_COCOA", "-DHAVE_MAIN", "-DSINC_LOWER_QUALITY", - "-DHAVE_NETPLAY", "-DHAVE_NETWORKGAMEPAD", "-DHAVE_NETWORKING", "-DRARCH_INTERNAL", @@ -474,7 +473,6 @@ "-DHAVE_COCOA", "-DHAVE_MAIN", "-DSINC_LOWER_QUALITY", - "-DHAVE_NETPLAY", "-DHAVE_NETWORKGAMEPAD", "-DHAVE_NETWORKING", "-DRARCH_INTERNAL", @@ -543,7 +541,6 @@ "-DHAVE_COCOA", "-DHAVE_MAIN", "-DSINC_LOWER_QUALITY", - "-DHAVE_NETPLAY", "-DHAVE_NETWORKGAMEPAD", "-DHAVE_NETWORKING", "-DRARCH_INTERNAL", @@ -609,7 +606,6 @@ "-DHAVE_COCOA", "-DHAVE_MAIN", "-DSINC_LOWER_QUALITY", - "-DHAVE_NETPLAY", "-DHAVE_NETWORKGAMEPAD", "-DHAVE_NETWORKING", "-DRARCH_INTERNAL", diff --git a/pkg/apple/RetroArch_PPC.xcodeproj/project.pbxproj b/pkg/apple/RetroArch_PPC.xcodeproj/project.pbxproj index 896163e10d..9d28ebe720 100644 --- a/pkg/apple/RetroArch_PPC.xcodeproj/project.pbxproj +++ b/pkg/apple/RetroArch_PPC.xcodeproj/project.pbxproj @@ -305,7 +305,6 @@ "-DHAVE_COCOA", "-DHAVE_MAIN", "-DSINC_LOWER_QUALITY", - "-DHAVE_NETPLAY", "-DHAVE_NETWORKGAMEPAD", "-DHAVE_NETWORKING", "-DRARCH_INTERNAL", @@ -379,7 +378,6 @@ "-DHAVE_COCOA", "-DHAVE_MAIN", "-DSINC_LOWER_QUALITY", - "-DHAVE_NETPLAY", "-DHAVE_NETWORKGAMEPAD", "-DHAVE_NETWORKING", "-DRARCH_INTERNAL", diff --git a/pkg/apple/RetroArch_iOS.xcodeproj/project.pbxproj b/pkg/apple/RetroArch_iOS.xcodeproj/project.pbxproj index 4e6dc6b02c..8cf712817e 100644 --- a/pkg/apple/RetroArch_iOS.xcodeproj/project.pbxproj +++ b/pkg/apple/RetroArch_iOS.xcodeproj/project.pbxproj @@ -515,7 +515,6 @@ LIBRARY_SEARCH_PATHS = ""; ONLY_ACTIVE_ARCH = NO; OTHER_CFLAGS = ( - "-DHAVE_NETPLAY", "-DHAVE_NETWORKGAMEPAD", "-DHAVE_CORETEXT", "-DHAVE_HID", @@ -593,7 +592,6 @@ OTHER_CFLAGS = ( "-DNS_BLOCK_ASSERTIONS=1", "-DNDEBUG", - "-DHAVE_NETPLAY", "-DHAVE_NETWORKGAMEPAD", "-DHAVE_CORETEXT", "-DHAVE_HID", @@ -642,7 +640,6 @@ "OTHER_CFLAGS[arch=*]" = ( "-DNS_BLOCK_ASSERTIONS=1", "-DNDEBUG", - "-DHAVE_NETPLAY", "-DHAVE_NETWORKGAMEPAD", "-DHAVE_CORETEXT", "-DHAVE_HID", @@ -720,7 +717,6 @@ LIBRARY_SEARCH_PATHS = ""; ONLY_ACTIVE_ARCH = NO; OTHER_CFLAGS = ( - "-DHAVE_NETPLAY", "-DHAVE_NETWORKGAMEPAD", "-DHAVE_CORETEXT", "-DHAVE_HID", @@ -794,7 +790,6 @@ OTHER_CFLAGS = ( "-DNS_BLOCK_ASSERTIONS=1", "-DNDEBUG", - "-DHAVE_NETPLAY", "-DHAVE_NETWORKGAMEPAD", "-DHAVE_CORETEXT", "-DHAVE_HID", @@ -840,7 +835,6 @@ "OTHER_CFLAGS[arch=*]" = ( "-DNS_BLOCK_ASSERTIONS=1", "-DNDEBUG", - "-DHAVE_NETPLAY", "-DHAVE_NETWORKGAMEPAD", "-DHAVE_CORETEXT", "-DHAVE_HID", @@ -918,7 +912,6 @@ IPHONEOS_DEPLOYMENT_TARGET = 6.0; ONLY_ACTIVE_ARCH = NO; OTHER_CFLAGS = ( - "-DHAVE_NETPLAY", "-DHAVE_NETWORKGAMEPAD", "-DHAVE_CORETEXT", "-DHAVE_HID", @@ -986,7 +979,6 @@ OTHER_CFLAGS = ( "-DNS_BLOCK_ASSERTIONS=1", "-DNDEBUG", - "-DHAVE_NETPLAY", "-DHAVE_NETWORKGAMEPAD", "-DHAVE_CORETEXT", "-DHAVE_HID", @@ -1055,7 +1047,6 @@ LIBRARY_SEARCH_PATHS = ""; ONLY_ACTIVE_ARCH = NO; OTHER_CFLAGS = ( - "-DHAVE_NETPLAY", "-DHAVE_NETWORKGAMEPAD", "-DHAVE_CORETEXT", "-DHAVE_HID", @@ -1132,7 +1123,6 @@ OTHER_CFLAGS = ( "-DNS_BLOCK_ASSERTIONS=1", "-DNDEBUG", - "-DHAVE_NETPLAY", "-DHAVE_NETWORKGAMEPAD", "-DHAVE_CORETEXT", "-DHAVE_HID", @@ -1181,7 +1171,6 @@ "OTHER_CFLAGS[arch=*]" = ( "-DNS_BLOCK_ASSERTIONS=1", "-DNDEBUG", - "-DHAVE_NETPLAY", "-DHAVE_NETWORKGAMEPAD", "-DHAVE_CORETEXT", "-DHAVE_HID", diff --git a/pkg/apple/RetroArch_iOS10.xcodeproj/project.pbxproj b/pkg/apple/RetroArch_iOS10.xcodeproj/project.pbxproj index 64798be1d2..a11e9b1679 100644 --- a/pkg/apple/RetroArch_iOS10.xcodeproj/project.pbxproj +++ b/pkg/apple/RetroArch_iOS10.xcodeproj/project.pbxproj @@ -630,7 +630,6 @@ LIBRARY_SEARCH_PATHS = ""; ONLY_ACTIVE_ARCH = NO; OTHER_CFLAGS = ( - "-DHAVE_NETPLAY", "-DHAVE_NETWORKGAMEPAD", "-DHAVE_CORETEXT", "-DHAVE_HID", @@ -708,7 +707,6 @@ OTHER_CFLAGS = ( "-DNS_BLOCK_ASSERTIONS=1", "-DNDEBUG", - "-DHAVE_NETPLAY", "-DHAVE_NETWORKGAMEPAD", "-DHAVE_CORETEXT", "-DHAVE_HID", @@ -757,7 +755,6 @@ "OTHER_CFLAGS[arch=*]" = ( "-DNS_BLOCK_ASSERTIONS=1", "-DNDEBUG", - "-DHAVE_NETPLAY", "-DHAVE_NETWORKGAMEPAD", "-DHAVE_CORETEXT", "-DHAVE_HID", @@ -835,7 +832,6 @@ LIBRARY_SEARCH_PATHS = ""; ONLY_ACTIVE_ARCH = NO; OTHER_CFLAGS = ( - "-DHAVE_NETPLAY", "-DHAVE_NETWORKGAMEPAD", "-DHAVE_CORETEXT", "-DHAVE_HID", @@ -909,7 +905,6 @@ OTHER_CFLAGS = ( "-DNS_BLOCK_ASSERTIONS=1", "-DNDEBUG", - "-DHAVE_NETPLAY", "-DHAVE_NETWORKGAMEPAD", "-DHAVE_CORETEXT", "-DHAVE_HID", @@ -955,7 +950,6 @@ "OTHER_CFLAGS[arch=*]" = ( "-DNS_BLOCK_ASSERTIONS=1", "-DNDEBUG", - "-DHAVE_NETPLAY", "-DHAVE_NETWORKGAMEPAD", "-DHAVE_CORETEXT", "-DHAVE_HID", @@ -1028,7 +1022,6 @@ LIBRARY_SEARCH_PATHS = ""; ONLY_ACTIVE_ARCH = NO; OTHER_CFLAGS = ( - "-DHAVE_NETPLAY", "-DHAVE_NETWORKGAMEPAD", "-DHAVE_CORETEXT", "-DHAVE_HID", @@ -1105,7 +1098,6 @@ OTHER_CFLAGS = ( "-DNS_BLOCK_ASSERTIONS=1", "-DNDEBUG", - "-DHAVE_NETPLAY", "-DHAVE_NETWORKGAMEPAD", "-DHAVE_CORETEXT", "-DHAVE_HID", @@ -1154,7 +1146,6 @@ "OTHER_CFLAGS[arch=*]" = ( "-DNS_BLOCK_ASSERTIONS=1", "-DNDEBUG", - "-DHAVE_NETPLAY", "-DHAVE_NETWORKGAMEPAD", "-DHAVE_CORETEXT", "-DHAVE_HID", @@ -1236,7 +1227,6 @@ IPHONEOS_DEPLOYMENT_TARGET = 6.0; ONLY_ACTIVE_ARCH = NO; OTHER_CFLAGS = ( - "-DHAVE_NETPLAY", "-DHAVE_NETWORKGAMEPAD", "-DHAVE_CORETEXT", "-DHAVE_HID", @@ -1304,7 +1294,6 @@ OTHER_CFLAGS = ( "-DNS_BLOCK_ASSERTIONS=1", "-DNDEBUG", - "-DHAVE_NETPLAY", "-DHAVE_NETWORKGAMEPAD", "-DHAVE_CORETEXT", "-DHAVE_HID", @@ -1373,7 +1362,6 @@ LIBRARY_SEARCH_PATHS = ""; ONLY_ACTIVE_ARCH = NO; OTHER_CFLAGS = ( - "-DHAVE_NETPLAY", "-DHAVE_NETWORKGAMEPAD", "-DHAVE_CORETEXT", "-DHAVE_HID", @@ -1450,7 +1438,6 @@ OTHER_CFLAGS = ( "-DNS_BLOCK_ASSERTIONS=1", "-DNDEBUG", - "-DHAVE_NETPLAY", "-DHAVE_NETWORKGAMEPAD", "-DHAVE_CORETEXT", "-DHAVE_HID", @@ -1499,7 +1486,6 @@ "OTHER_CFLAGS[arch=*]" = ( "-DNS_BLOCK_ASSERTIONS=1", "-DNDEBUG", - "-DHAVE_NETPLAY", "-DHAVE_NETWORKGAMEPAD", "-DHAVE_CORETEXT", "-DHAVE_HID", diff --git a/pkg/apple/iOS/Makefile b/pkg/apple/iOS/Makefile index 11a2ce6782..a54a8b293d 100644 --- a/pkg/apple/iOS/Makefile +++ b/pkg/apple/iOS/Makefile @@ -17,7 +17,7 @@ ${APPLICATION_NAME}_FILES = $(SRC_DIR)/griffin/griffin.c \ $(SRC_DIR)/audio/drivers_resampler/sinc_neon.S \ $(SRC_DIR)/audio/drivers_resampler/cc_resampler_neon.S -COMMON_FLAGS := -DIOS -DHAVE_GRIFFIN -DHAVE_CORELOCATION -DHAVE_NETPLAY -DHAVE_RGUI -DHAVE_MENU -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_FBO -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DHAVE_GLSL -DINLINE=inline -DHAVE_THREADS -D__LIBRETRO__ -DRARCH_MOBILE -std=gnu99 -DHAVE_COREAUDIO -DHAVE_FBO -DHAVE_OVERLAY -DHAVE_ZLIB -DWANT_ZLIB -DSINC_LOWER_QUALITY -DRARCH_INTERNAL -DHAVE_FILTERS_BUILTIN -DHAVE_XMB -D_LZMA_UINT32_IS_ULONG -DHAVE_STRL +COMMON_FLAGS := -DIOS -DHAVE_GRIFFIN -DHAVE_CORELOCATION -DHAVE_NETWORKING -DHAVE_RGUI -DHAVE_MENU -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_FBO -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DHAVE_GLSL -DINLINE=inline -DHAVE_THREADS -D__LIBRETRO__ -DRARCH_MOBILE -std=gnu99 -DHAVE_COREAUDIO -DHAVE_FBO -DHAVE_OVERLAY -DHAVE_ZLIB -DWANT_ZLIB -DSINC_LOWER_QUALITY -DRARCH_INTERNAL -DHAVE_FILTERS_BUILTIN -DHAVE_XMB -D_LZMA_UINT32_IS_ULONG -DHAVE_STRL COMMON_FLAGS += -DHAVE_AVFOUNDATION COMMON_IOS_FLAGS := -Wno-deprecated-declarations -Wno-error COMMON_IOS_OBJCFLAGS := -fobjc-arc diff --git a/pkg/msvc/RetroArch-360/RetroArch-360.vcxproj b/pkg/msvc/RetroArch-360/RetroArch-360.vcxproj index 56b84ce6d6..2d547b62d1 100644 --- a/pkg/msvc/RetroArch-360/RetroArch-360.vcxproj +++ b/pkg/msvc/RetroArch-360/RetroArch-360.vcxproj @@ -113,7 +113,7 @@ true false MultiThreadedDebug - _DEBUG;_XBOX;DONT_HAVE_STATE_TRACKER;HAVE_XINPUT2;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;RARCH_CONSOLE;HAVE_XUI;HAVE_MENU;HAVE_NETPLAY;HAVE_NETWORKING;HAVE_NETWORKING;HAVE_SOCKET_LEGACY;HAVE_ZLIB;HAVE_RARCH_EXEC;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_HLSL;HAVE_D3D9;HAVE_D3D;RARCH_INTERNAL;MSB_FIRST;_XBOX360;WANT_ZLIB;SINC_LOWER_QUALITY;HAVE_XAUDIO;HAVE_RPNG;HAVE_RJPEG;HAVE_THREADS;HAVE_BUILTIN_AUTOCONFIG;HAVE_FILTERS_BUILTIN + _DEBUG;_XBOX;DONT_HAVE_STATE_TRACKER;HAVE_XINPUT2;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;RARCH_CONSOLE;HAVE_XUI;HAVE_MENU;HAVE_NETWORKING;HAVE_NETWORKING;HAVE_SOCKET_LEGACY;HAVE_ZLIB;HAVE_RARCH_EXEC;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_HLSL;HAVE_D3D9;HAVE_D3D;RARCH_INTERNAL;MSB_FIRST;_XBOX360;WANT_ZLIB;SINC_LOWER_QUALITY;HAVE_XAUDIO;HAVE_RPNG;HAVE_RJPEG;HAVE_THREADS;HAVE_BUILTIN_AUTOCONFIG;HAVE_FILTERS_BUILTIN Callcap $(SolutionDir)\..\..\deps\zlib;$(SolutionDir)\..\..\libretro-common\include;$(SolutionDir)\..\..\;%(AdditionalIncludeDirectories) @@ -279,7 +279,7 @@ false false MultiThreaded - NDEBUG;_XBOX;%(PreprocessorDefinitions);DONT_HAVE_STATE_TRACKER;HAVE_XINPUT2;_CRT_SECURE_NO_WARNINGS;RARCH_CONSOLE=1;HAVE_NETPLAY;HAVE_NETWORKING;HAVE_SOCKET_LEGACY;HAVE_ZLIB;HAVE_RARCH_EXEC;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_HLSL;HAVE_D3D9;HAVE_D3D;RARCH_INTERNAL;MSB_FIRST;_XBOX360;WANT_ZLIB;SINC_LOWER_QUALITY;HAVE_XUI;HAVE_MENU;HAVE_XAUDIO;HAVE_RPNG;HAVE_RJPEG;HAVE_THREADS;HAVE_BUILTIN_AUTOCONFIG;HAVE_FILTERS_BUILTIN + NDEBUG;_XBOX;%(PreprocessorDefinitions);DONT_HAVE_STATE_TRACKER;HAVE_XINPUT2;_CRT_SECURE_NO_WARNINGS;RARCH_CONSOLE=1;HAVE_NETWORKING;HAVE_SOCKET_LEGACY;HAVE_ZLIB;HAVE_RARCH_EXEC;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_HLSL;HAVE_D3D9;HAVE_D3D;RARCH_INTERNAL;MSB_FIRST;_XBOX360;WANT_ZLIB;SINC_LOWER_QUALITY;HAVE_XUI;HAVE_MENU;HAVE_XAUDIO;HAVE_RPNG;HAVE_RJPEG;HAVE_THREADS;HAVE_BUILTIN_AUTOCONFIG;HAVE_FILTERS_BUILTIN $(SolutionDir)\..\..\deps\zlib;$(SolutionDir)\..\..\libretro-common\include;$(SolutionDir)\..\..\;%(AdditionalIncludeDirectories) @@ -321,7 +321,7 @@ false false MultiThreaded - NDEBUG;_XBOX;LTCG;%(PreprocessorDefinitions);DONT_HAVE_STATE_TRACKER;HAVE_XINPUT2;_CRT_SECURE_NO_WARNINGS;RARCH_CONSOLE;HAVE_XUI;HAVE_MENU;HAVE_NETPLAY;HAVE_NETWORKING;HAVE_SOCKET_LEGACY;HAVE_ZLIB;HAVE_RARCH_EXEC;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_HLSL;HAVE_D3D9;HAVE_D3D;RARCH_INTERNAL;MSB_FIRST;_XBOX360;WANT_ZLIB;SINC_LOWER_QUALITY;HAVE_XAUDIO;HAVE_RPNG;HAVE_RJPEG;HAVE_THREADS;HAVE_BUILTIN_AUTOCONFIG;HAVE_FILTERS_BUILTIN + NDEBUG;_XBOX;LTCG;%(PreprocessorDefinitions);DONT_HAVE_STATE_TRACKER;HAVE_XINPUT2;_CRT_SECURE_NO_WARNINGS;RARCH_CONSOLE;HAVE_XUI;HAVE_MENU;HAVE_NETWORKING;HAVE_SOCKET_LEGACY;HAVE_ZLIB;HAVE_RARCH_EXEC;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_HLSL;HAVE_D3D9;HAVE_D3D;RARCH_INTERNAL;MSB_FIRST;_XBOX360;WANT_ZLIB;SINC_LOWER_QUALITY;HAVE_XAUDIO;HAVE_RPNG;HAVE_RJPEG;HAVE_THREADS;HAVE_BUILTIN_AUTOCONFIG;HAVE_FILTERS_BUILTIN $(SolutionDir)\..\..\deps\zlib;$(SolutionDir)\..\..\libretro-common\include;$(SolutionDir)\..\..\;%(AdditionalIncludeDirectories) diff --git a/pkg/msvc/msvc-2003/RetroArch-msvc2003.vcproj b/pkg/msvc/msvc-2003/RetroArch-msvc2003.vcproj index c991f6dcf1..e670c85a24 100644 --- a/pkg/msvc/msvc-2003/RetroArch-msvc2003.vcproj +++ b/pkg/msvc/msvc-2003/RetroArch-msvc2003.vcproj @@ -21,7 +21,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=""$(SolutionDir)\..\..\libretro-common\include";"$(SolutionDir)\..\..\libretro-common\include\compat\msvc";"$(SolutionDir)\..\..\gfx\include"" - PreprocessorDefinitions="_WIN32;RARCH_INTERNAL;HAVE_D3D;HAVE_D3D9;HAVE_GLSL;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_BUILTIN_AUTOCONFIG;HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_RTHREADS;HAVE_DYNAMIC;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT;__STDC_CONSTANT_MACROS" + PreprocessorDefinitions="_WIN32;RARCH_INTERNAL;HAVE_D3D;HAVE_D3D9;HAVE_GLSL;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_BUILTIN_AUTOCONFIG;HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_RTHREADS;HAVE_DYNAMIC;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT;__STDC_CONSTANT_MACROS" MinimalRebuild="TRUE" BasicRuntimeChecks="3" RuntimeLibrary="5" @@ -69,7 +69,7 @@ Level3 Disabled - WIN32;RARCH_INTERNAL;HAVE_D3D;HAVE_D3D9;HAVE_GLSL;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_BUILTIN_AUTOCONFIG;HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT + WIN32;RARCH_INTERNAL;HAVE_D3D;HAVE_D3D9;HAVE_GLSL;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_BUILTIN_AUTOCONFIG;HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\gfx\include;%(AdditionalIncludeDirectories) MultiThreadedDebug CompileAsCpp @@ -201,7 +201,7 @@ Level3 Disabled - WIN32;RARCH_INTERNAL;HAVE_D3D;HAVE_D3D9;HAVE_CG;HAVE_GLSL;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_FBO;WANT_ZLIB;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_BUILTIN_AUTOCONFIG;HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT + WIN32;RARCH_INTERNAL;HAVE_D3D;HAVE_D3D9;HAVE_CG;HAVE_GLSL;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_FBO;WANT_ZLIB;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_BUILTIN_AUTOCONFIG;HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\gfx\include;%(AdditionalIncludeDirectories) MultiThreadedDebug CompileAsCpp @@ -221,7 +221,7 @@ Level3 Disabled - WIN32;RARCH_INTERNAL;HAVE_D3D;HAVE_D3D9;HAVE_GLSL;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_BUILTIN_AUTOCONFIG;HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_SECURE_NO_WARNINGS;__SSE__;__SSE2__;__x86_64__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT + WIN32;RARCH_INTERNAL;HAVE_D3D;HAVE_D3D9;HAVE_GLSL;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_BUILTIN_AUTOCONFIG;HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_SECURE_NO_WARNINGS;__SSE__;__SSE2__;__x86_64__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\gfx\inc;%(AdditionalIncludeDirectories) MultiThreadedDebug CompileAsCpp @@ -240,7 +240,7 @@ Level3 Disabled - WIN32;RARCH_INTERNAL;HAVE_D3D;HAVE_D3D9;HAVE_CG;HAVE_GLSL;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_FBO;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;WANT_ZLIB;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_BUILTIN_AUTOCONFIG;HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_SECURE_NO_WARNINGS;__SSE__;__SSE2__;__x86_64__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT + WIN32;RARCH_INTERNAL;HAVE_D3D;HAVE_D3D9;HAVE_CG;HAVE_GLSL;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_FBO;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;WANT_ZLIB;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_BUILTIN_AUTOCONFIG;HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_SECURE_NO_WARNINGS;__SSE__;__SSE2__;__x86_64__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\gfx\inc;%(AdditionalIncludeDirectories) MultiThreadedDebug CompileAsCpp @@ -262,7 +262,7 @@ MaxSpeed true true - WIN32;RARCH_INTERNAL;HAVE_D3D;HAVE_D3D9;HAVE_GLSL;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_BUILTIN_AUTOCONFIG;HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_MENU;HAVE_RGUI;HAVE_GL_SYNC;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT + WIN32;RARCH_INTERNAL;HAVE_D3D;HAVE_D3D9;HAVE_GLSL;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_BUILTIN_AUTOCONFIG;HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_MENU;HAVE_RGUI;HAVE_GL_SYNC;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\gfx\include;%(AdditionalIncludeDirectories) MultiThreaded CompileAsCpp @@ -286,7 +286,7 @@ MaxSpeed true true - WIN32;RARCH_INTERNAL;HAVE_D3D;HAVE_D3D9;HAVE_CG;HAVE_GLSL;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_FBO;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;WANT_ZLIB;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_BUILTIN_AUTOCONFIG;HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_MENU;HAVE_RGUI;HAVE_GL_SYNC;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT + WIN32;RARCH_INTERNAL;HAVE_D3D;HAVE_D3D9;HAVE_CG;HAVE_GLSL;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_FBO;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;WANT_ZLIB;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_BUILTIN_AUTOCONFIG;HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_MENU;HAVE_RGUI;HAVE_GL_SYNC;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\gfx\include;%(AdditionalIncludeDirectories) MultiThreaded CompileAsCpp @@ -311,7 +311,7 @@ MaxSpeed true true - WIN32;RARCH_INTERNAL;HAVE_D3D;HAVE_D3D9;HAVE_GLSL;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_BUILTIN_AUTOCONFIG;HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;_CRT_SECURE_NO_WARNINGS;__SSE__;__SSE2__;__x86_64__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT + WIN32;RARCH_INTERNAL;HAVE_D3D;HAVE_D3D9;HAVE_GLSL;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_BUILTIN_AUTOCONFIG;HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;_CRT_SECURE_NO_WARNINGS;__SSE__;__SSE2__;__x86_64__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\gfx\inc;%(AdditionalIncludeDirectories) MultiThreaded CompileAsCpp @@ -335,7 +335,7 @@ MaxSpeed true true - WIN32;RARCH_INTERNAL;HAVE_D3D;HAVE_D3D9;HAVE_CG;HAVE_GLSL;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_FBO;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_BUILTIN_AUTOCONFIG;HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;WANT_ZLIB;_CRT_SECURE_NO_WARNINGS;__SSE__;__SSE2__;__x86_64__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT + WIN32;RARCH_INTERNAL;HAVE_D3D;HAVE_D3D9;HAVE_CG;HAVE_GLSL;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_FBO;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_BUILTIN_AUTOCONFIG;HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;WANT_ZLIB;_CRT_SECURE_NO_WARNINGS;__SSE__;__SSE2__;__x86_64__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\gfx\inc;%(AdditionalIncludeDirectories) MultiThreaded CompileAsCpp @@ -362,4 +362,4 @@ - \ No newline at end of file + diff --git a/qb/config.libs.sh b/qb/config.libs.sh index b99108a153..8f5896e49e 100644 --- a/qb/config.libs.sh +++ b/qb/config.libs.sh @@ -174,12 +174,9 @@ if [ "$HAVE_NETWORKING" = 'yes' ]; then fi HAVE_NETWORK_CMD=yes HAVE_NETWORKGAMEPAD=yes - - [ "$HAVE_NETPLAY" != 'no' ] && HAVE_NETPLAY='yes' else echo "Warning: All networking features have been disabled." HAVE_NETWORK_CMD='no' - HAVE_NETPLAY='no' HAVE_NETWORKGAMEPAD='no' fi diff --git a/qb/config.params.sh b/qb/config.params.sh index 4e57866dac..a5d1d57481 100644 --- a/qb/config.params.sh +++ b/qb/config.params.sh @@ -27,7 +27,6 @@ HAVE_DYLIB=auto # Dynamic loading support HAVE_NETWORKING=auto # Networking features (recommended) HAVE_NETWORKGAMEPAD=auto # Networked game pad (plus baked-in core) C89_NETWORKGAMEPAD=no -HAVE_NETPLAY=auto # Netplay support (requires networking) HAVE_D3D9=yes # Direct3D 9 support HAVE_OPENGL=auto # OpenGL support HAVE_MALI_FBDEV=no # Mali fbdev context support diff --git a/retroarch.c b/retroarch.c index 1cfcd8632a..4a7f3a8044 100644 --- a/retroarch.c +++ b/retroarch.c @@ -327,7 +327,7 @@ static void retroarch_print_help(const char *arg0) " Note: 'noload-save' implies that " "save files *WILL BE OVERWRITTEN*."); -#ifdef HAVE_NETPLAY +#ifdef HAVE_NETWORKING puts(" -H, --host Host netplay as user 1."); puts(" -C, --connect=HOST Connect to netplay server as user 2."); puts(" --port=PORT Port used to netplay. Default is 55435."); @@ -338,7 +338,7 @@ static void retroarch_print_help(const char *arg0) #endif puts(" --nick=NICK Picks a username (for use with netplay). " "Not mandatory."); -#if defined(HAVE_NETWORK_CMD) && defined(HAVE_NETPLAY) +#if defined(HAVE_NETWORK_CMD) && defined(HAVE_NETWORKING) puts(" --command Sends a command over UDP to an already " "running program process."); puts(" Available commands are listed if command is invalid."); @@ -371,7 +371,7 @@ static void retroarch_print_help(const char *arg0) #define DYNAMIC_ARG #endif -#ifdef HAVE_NETPLAY +#ifdef HAVE_NETWORKING #define NETPLAY_ARG "HC:F:" #else #define NETPLAY_ARG @@ -415,18 +415,18 @@ static void retroarch_parse_input(int argc, char *argv[]) { "bsvplay", 1, NULL, 'P' }, { "bsvrecord", 1, NULL, 'R' }, { "sram-mode", 1, NULL, 'M' }, -#ifdef HAVE_NETPLAY +#ifdef HAVE_NETWORKING { "host", 0, NULL, 'H' }, { "connect", 1, NULL, 'C' }, { "frames", 1, NULL, 'F' }, { "check-frames", 1, NULL, RA_OPT_CHECK_FRAMES }, { "port", 1, NULL, RA_OPT_PORT }, { "spectate", 0, NULL, RA_OPT_SPECTATE }, -#endif - { "nick", 1, NULL, RA_OPT_NICK }, -#if defined(HAVE_NETWORK_CMD) && defined(HAVE_NETPLAY) +#if defined(HAVE_NETWORK_CMD) { "command", 1, NULL, RA_OPT_COMMAND }, #endif +#endif + { "nick", 1, NULL, RA_OPT_NICK }, { "ups", 1, NULL, 'U' }, { "bps", 1, NULL, RA_OPT_BPS }, { "ips", 1, NULL, RA_OPT_IPS }, @@ -666,7 +666,7 @@ static void retroarch_parse_input(int argc, char *argv[]) } break; -#ifdef HAVE_NETPLAY +#ifdef HAVE_NETWORKING case 'H': retroarch_override_setting_set( RARCH_OVERRIDE_SETTING_NETPLAY_IP_ADDRESS); @@ -724,7 +724,7 @@ static void retroarch_parse_input(int argc, char *argv[]) explicit_menu = true; break; -#ifdef HAVE_NETPLAY +#ifdef HAVE_NETWORKING case RA_OPT_CHECK_FRAMES: retroarch_override_setting_set( RARCH_OVERRIDE_SETTING_NETPLAY_CHECK_FRAMES); @@ -743,14 +743,7 @@ static void retroarch_parse_input(int argc, char *argv[]) global->netplay.is_spectate = true; break; -#endif - case RA_OPT_NICK: - rarch_ctl(RARCH_CTL_USERNAME_SET, NULL); - strlcpy(settings->username, optarg, - sizeof(settings->username)); - break; - -#if defined(HAVE_NETWORK_CMD) && defined(HAVE_NETPLAY) +#if defined(HAVE_NETWORK_CMD) case RA_OPT_COMMAND: if (command_network_send((const char*)optarg)) exit(0); @@ -759,6 +752,13 @@ static void retroarch_parse_input(int argc, char *argv[]) break; #endif +#endif + case RA_OPT_NICK: + rarch_ctl(RARCH_CTL_USERNAME_SET, NULL); + strlcpy(settings->username, optarg, + sizeof(settings->username)); + break; + case RA_OPT_APPENDCONFIG: path_set(RARCH_PATH_CONFIG_APPEND, optarg); break; diff --git a/runloop.c b/runloop.c index 0c48b80856..3bbb8d02a3 100644 --- a/runloop.c +++ b/runloop.c @@ -47,7 +47,7 @@ #include "menu/widgets/menu_dialog.h" #endif -#ifdef HAVE_NETPLAY +#ifdef HAVE_NETWORKING #include "network/netplay/netplay.h" #endif @@ -482,7 +482,7 @@ static bool runloop_check_state(event_cmd_state_t *cmd) else if (runloop_cmd_press(cmd, RARCH_VOLUME_DOWN)) command_event(CMD_EVENT_VOLUME_DOWN, NULL); -#ifdef HAVE_NETPLAY +#ifdef HAVE_NETWORKING tmp = runloop_cmd_triggered(cmd, RARCH_NETPLAY_FLIP); netplay_driver_ctl(RARCH_NETPLAY_CTL_FLIP_PLAYERS, &tmp); tmp = runloop_cmd_triggered(cmd, RARCH_FULLSCREEN_TOGGLE_KEY); @@ -681,7 +681,7 @@ bool runloop_ctl(enum runloop_ctl_state state, void *data) { const struct retro_frame_time_callback *info = (const struct retro_frame_time_callback*)data; -#ifdef HAVE_NETPLAY +#ifdef HAVE_NETWORKING global_t *global = global_get_ptr(); /* retro_run() will be called in very strange and @@ -1307,7 +1307,7 @@ int runloop_iterate(unsigned *sleep_ms) menu_event(cmd.state[0], cmd.state[2]), sleep_ms); -#ifdef HAVE_NETPLAY +#ifdef HAVE_NETWORKING /* FIXME: This is an ugly way to tell Netplay this... */ netplay_driver_ctl(RARCH_NETPLAY_CTL_PAUSE, NULL); #endif @@ -1323,7 +1323,7 @@ int runloop_iterate(unsigned *sleep_ms) { /* RetroArch has been paused. */ core_poll(); -#ifdef HAVE_NETPLAY +#ifdef HAVE_NETWORKING /* FIXME: This is an ugly way to tell Netplay this... */ netplay_driver_ctl(RARCH_NETPLAY_CTL_PAUSE, NULL); #endif @@ -1335,7 +1335,7 @@ int runloop_iterate(unsigned *sleep_ms) autosave_lock(); #endif -#ifdef HAVE_NETPLAY +#ifdef HAVE_NETWORKING if (!netplay_driver_ctl(RARCH_NETPLAY_CTL_PRE_FRAME, NULL)) { /* Paused due to Netplay */ @@ -1384,7 +1384,7 @@ int runloop_iterate(unsigned *sleep_ms) if (bsv_movie_ctl(BSV_MOVIE_CTL_IS_INITED, NULL)) bsv_movie_ctl(BSV_MOVIE_CTL_SET_FRAME_END, NULL); -#ifdef HAVE_NETPLAY +#ifdef HAVE_NETWORKING netplay_driver_ctl(RARCH_NETPLAY_CTL_POST_FRAME, NULL); #endif diff --git a/runloop.h b/runloop.h index 5f78e90fc5..0b9b74a154 100644 --- a/runloop.h +++ b/runloop.h @@ -153,7 +153,7 @@ typedef struct global char remapfile[PATH_MAX_LENGTH]; } name; -#ifdef HAVE_NETPLAY +#ifdef HAVE_NETWORKING /* Netplay. */ struct { diff --git a/tasks/task_content.c b/tasks/task_content.c index b8da40945d..b395ed6b81 100644 --- a/tasks/task_content.c +++ b/tasks/task_content.c @@ -1049,7 +1049,7 @@ bool task_push_content_load_default( #if defined(HAVE_VIDEO_PROCESSOR) case CONTENT_MODE_LOAD_NOTHING_WITH_VIDEO_PROCESSOR_CORE_FROM_MENU: #endif -#if defined(HAVE_NETPLAY) && defined(HAVE_NETWORKGAMEPAD) +#if defined(HAVE_NETWORKING) && defined(HAVE_NETWORKGAMEPAD) case CONTENT_MODE_LOAD_NOTHING_WITH_NET_RETROPAD_CORE_FROM_MENU: #endif case CONTENT_MODE_LOAD_NOTHING_WITH_CURRENT_CORE_FROM_MENU: @@ -1209,7 +1209,7 @@ bool task_push_content_load_default( retroarch_set_current_core_type(type, true); break; case CONTENT_MODE_LOAD_NOTHING_WITH_NET_RETROPAD_CORE_FROM_MENU: -#if defined(HAVE_NETPLAY) && defined(HAVE_NETWORKGAMEPAD) +#if defined(HAVE_NETWORKING) && defined(HAVE_NETWORKGAMEPAD) retroarch_set_current_core_type(CORE_TYPE_NETRETROPAD, true); break; #endif @@ -1227,7 +1227,7 @@ bool task_push_content_load_default( { case CONTENT_MODE_LOAD_NOTHING_WITH_DUMMY_CORE: case CONTENT_MODE_LOAD_FROM_CLI: -#if defined(HAVE_NETPLAY) && defined(HAVE_NETWORKGAMEPAD) +#if defined(HAVE_NETWORKING) && defined(HAVE_NETWORKGAMEPAD) case CONTENT_MODE_LOAD_NOTHING_WITH_NET_RETROPAD_CORE_FROM_MENU: #endif #ifdef HAVE_VIDEO_PROCESSOR