From abe4ed607ef67d3c18fe187989928f7437bff66e Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 31 Jan 2015 06:03:04 +0100 Subject: [PATCH 1/5] (MSVC) Add HAVE_NETWORKING --- msvc/msvc-2010/RetroArch-msvc2010.vcxproj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj index 6dabcc8ffa..b726ff814e 100644 --- a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj +++ b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj @@ -100,7 +100,7 @@ Level3 Disabled - WIN32;RARCH_INTERNAL;HAVE_WIN32_D3D9;HAVE_CG;HAVE_GLSL;HAVE_GRIFFIN;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;WANT_MINIZ;HAVE_GRIFFIN;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;WANT_MINIZ;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_BUILTIN_AUTOCONFIG;HAVE_DINPUT;HAVE_WINXINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;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_GLUI;HAVE_LIBRETRODB + WIN32;RARCH_INTERNAL;HAVE_WIN32_D3D9;HAVE_CG;HAVE_GLSL;HAVE_GRIFFIN;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;WANT_MINIZ;HAVE_GRIFFIN;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;WANT_MINIZ;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_BUILTIN_AUTOCONFIG;HAVE_DINPUT;HAVE_WINXINPUT;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_GLUI;HAVE_LIBRETRODB $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\deps\rzlib;$(MSBuildProjectDirectory)\..\..\libretro-sdk\include;%(AdditionalIncludeDirectories) MultiThreadedDebug CompileAsCpp @@ -120,7 +120,7 @@ Level3 Disabled - WIN32;RARCH_INTERNAL;HAVE_WIN32_D3D9;HAVE_CG;HAVE_GLSL;HAVE_GRIFFIN;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;WANT_MINIZ;HAVE_FBO;HAVE_ZLIB;WANT_MINIZ;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_BUILTIN_AUTOCONFIG;HAVE_DINPUT;HAVE_WINXINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;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 + WIN32;RARCH_INTERNAL;HAVE_WIN32_D3D9;HAVE_CG;HAVE_GLSL;HAVE_GRIFFIN;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;WANT_MINIZ;HAVE_FBO;HAVE_ZLIB;WANT_MINIZ;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_BUILTIN_AUTOCONFIG;HAVE_DINPUT;HAVE_WINXINPUT;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 $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\deps\rzlib;$(MSBuildProjectDirectory)\..\..\libretro-sdk\include;%(AdditionalIncludeDirectories) MultiThreadedDebug CompileAsCpp @@ -142,7 +142,7 @@ MaxSpeed true true - WIN32;RARCH_INTERNAL;HAVE_WIN32_D3D9;HAVE_CG;HAVE_GLSL;HAVE_GRIFFIN;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;WANT_MINIZ;HAVE_GRIFFIN;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;WANT_MINIZ;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_BUILTIN_AUTOCONFIG;HAVE_DINPUT;HAVE_WINXINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;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_GLUI;HAVE_LIBRETRODB + WIN32;RARCH_INTERNAL;HAVE_WIN32_D3D9;HAVE_CG;HAVE_GLSL;HAVE_GRIFFIN;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;WANT_MINIZ;HAVE_GRIFFIN;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;WANT_MINIZ;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_BUILTIN_AUTOCONFIG;HAVE_DINPUT;HAVE_WINXINPUT;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_GLUI;HAVE_LIBRETRODB $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\deps\rzlib;$(MSBuildProjectDirectory)\..\..\libretro-sdk\include;%(AdditionalIncludeDirectories) MultiThreaded CompileAsCpp @@ -167,7 +167,7 @@ MaxSpeed true true - WIN32;RARCH_INTERNAL;HAVE_WIN32_D3D9;HAVE_CG;HAVE_GLSL;HAVE_GRIFFIN;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;WANT_MINIZ;HAVE_FBO;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_BUILTIN_AUTOCONFIG;HAVE_DINPUT;HAVE_WINXINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;HAVE_ZLIB;WANT_MINIZ;_CRT_SECURE_NO_WARNINGS;__SSE__;__SSE2__;__x86_64__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU + WIN32;RARCH_INTERNAL;HAVE_WIN32_D3D9;HAVE_CG;HAVE_GLSL;HAVE_GRIFFIN;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;WANT_MINIZ;HAVE_FBO;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_BUILTIN_AUTOCONFIG;HAVE_DINPUT;HAVE_WINXINPUT;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_ZLIB;WANT_MINIZ;_CRT_SECURE_NO_WARNINGS;__SSE__;__SSE2__;__x86_64__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\deps\rzlib;$(MSBuildProjectDirectory)\..\..\libretro-sdk\include;%(AdditionalIncludeDirectories) MultiThreaded CompileAsCpp From b3e24c7410b7d1174dc63aca771d643998303a22 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 31 Jan 2015 06:06:21 +0100 Subject: [PATCH 2/5] Rename Core Manager to Core Updater --- menu/drivers/shared.h | 4 ++-- settings_data.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/menu/drivers/shared.h b/menu/drivers/shared.h index b9af9597b2..43c18710a4 100644 --- a/menu/drivers/shared.h +++ b/menu/drivers/shared.h @@ -50,7 +50,7 @@ static INLINE void get_title(const char *label, const char *dir, if (!strcmp(label, "core_list")) snprintf(title, sizeof_title, "CORE SELECTION %s", dir); else if (!strcmp(label, "core_manager_list")) - snprintf(title, sizeof_title, "CORE MANAGER %s", dir); + snprintf(title, sizeof_title, "CORE UPDATER %s", dir); else if (!strcmp(label, "database_manager_list")) snprintf(title, sizeof_title, "DATABASE SELECTION %s", dir); else if (!strcmp(label, "cursor_manager_list")) @@ -183,7 +183,7 @@ static INLINE void get_title(const char *label, const char *dir, } else if (!strcmp(elem0, "Core Manager Options")) { - strlcpy(title, "CORE MANAGER OPTIONS", sizeof_title); + strlcpy(title, "CORE UPDATER OPTIONS", sizeof_title); if (!strcmp(elem1, "State")) strlcat(title, " - STATE", sizeof_title); } diff --git a/settings_data.c b/settings_data.c index 15a012f330..5d9343d98f 100644 --- a/settings_data.c +++ b/settings_data.c @@ -3438,7 +3438,7 @@ static bool setting_data_append_list_main_menu_options( #ifdef HAVE_NETWORKING CONFIG_ACTION( "core_manager_list", - "Core Update Manager", + "Core Updater", group_info.name, subgroup_info.name); #endif @@ -5601,7 +5601,7 @@ static bool setting_data_append_list_core_manager_options( rarch_setting_group_info_t group_info; rarch_setting_group_info_t subgroup_info; - START_GROUP(group_info, "Core Manager Options"); + START_GROUP(group_info, "Core Updater Options"); START_SUB_GROUP(list, list_info, "State", group_info.name, subgroup_info); From 181c594073aa29fd1b9b0c6b7c2fc9ccede0ad43 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 31 Jan 2015 06:08:56 +0100 Subject: [PATCH 3/5] (Wii) Build with HAVE_NETWORKING and HAVE_NETPLAY options --- Makefile.griffin | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile.griffin b/Makefile.griffin index a69ca91843..458c65d573 100644 --- a/Makefile.griffin +++ b/Makefile.griffin @@ -121,6 +121,8 @@ HAVE_7ZIP := 1 HAVE_RPNG := 1 HAVE_OVERLAY := 1 HAVE_LIBSICKSAXIS := 0 + HAVE_NETWORKING := 1 + HAVE_NETPLAY := 1 HAVE_BUILTIN_AUTOCONFIG := 1 else ifeq ($(platform), psp1) CC = psp-gcc$(EXE_EXT) From 7f3e727967f67d25a9ccf8bce12f15165456c056 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 31 Jan 2015 06:09:50 +0100 Subject: [PATCH 4/5] Update Makefile.griffin --- Makefile.griffin | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Makefile.griffin b/Makefile.griffin index 458c65d573..e2a7c8e9a3 100644 --- a/Makefile.griffin +++ b/Makefile.griffin @@ -186,6 +186,14 @@ ifeq ($(HAVE_BUILTIN_AUTOCONFIG), 1) CFLAGS += -DHAVE_BUILTIN_AUTOCONFIG endif +ifeq ($(HAVE_NETWORKING), 1) +CFLAGS += -DHAVE_NETWORKING +endif + +ifeq ($(HAVE_NETPLAY), 1) +CFLAGS += -DHAVE_NETPLAY +endif + CFLAGS += -std=gnu99 -DSINC_LOWER_QUALITY -DHAVE_RGUI -DHAVE_MENU -DRARCH_CONSOLE -DHAVE_GRIFFIN=1 -Wno-char-subscripts -DRARCH_INTERNAL ifeq ($(HAVE_FILTERS_BUILTIN), 1) From 4e0a6c765d2e6e58ecdf3e81b3e9b2a22779c8d6 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 31 Jan 2015 06:15:51 +0100 Subject: [PATCH 5/5] (Wii) Take out HAVE_NETWORKING and HAVE_NETPLAY -would need suitable headers and netport implementation - look at this for reference - https://code.google.com/p/diiscent/source/browse/trunk/netport/?r=4 --- Makefile.griffin | 2 -- 1 file changed, 2 deletions(-) diff --git a/Makefile.griffin b/Makefile.griffin index e2a7c8e9a3..05241a1882 100644 --- a/Makefile.griffin +++ b/Makefile.griffin @@ -121,8 +121,6 @@ HAVE_7ZIP := 1 HAVE_RPNG := 1 HAVE_OVERLAY := 1 HAVE_LIBSICKSAXIS := 0 - HAVE_NETWORKING := 1 - HAVE_NETPLAY := 1 HAVE_BUILTIN_AUTOCONFIG := 1 else ifeq ($(platform), psp1) CC = psp-gcc$(EXE_EXT)