From dfa22e5532c37dede40f698375b393e2ee979856 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Wed, 28 Oct 2026 13:35:52 +0100 Subject: [PATCH] Build the built-in relay server in every build system Add aemu_postoffice's relay server to the Visual Studio, UWP, legacy Android and libretro builds, next to the client. In the Visual Studio projects its objects get their own names, since Common already has Log.cpp and the client's enet.c. aemu_postoffice now leaves out pthread.h where it isn't used, which MSVC doesn't have. Co-Authored-By: Claude Opus 5.5 --- Common/Common.vcxproj | 57 +++++++++++++++++++++++++ Common/Common.vcxproj.filters | 51 ++++++++++++++++++++++ UWP/CommonUWP/CommonUWP.vcxproj | 33 ++++++++++++++ UWP/CommonUWP/CommonUWP.vcxproj.filters | 51 ++++++++++++++++++++++ android/jni/Android.mk | 8 ++++ ext/aemu_postoffice | 2 +- libretro/Makefile.common | 11 +++++ 7 files changed, 212 insertions(+), 1 deletion(-) diff --git a/Common/Common.vcxproj b/Common/Common.vcxproj index f922675333..7442925798 100644 --- a/Common/Common.vcxproj +++ b/Common/Common.vcxproj @@ -294,6 +294,15 @@ + + + + + + + + + @@ -638,6 +647,54 @@ _CRTDBG_MAP_ALLOC _CRTDBG_MAP_ALLOC + + _CRTDBG_MAP_ALLOC + _CRTDBG_MAP_ALLOC + _CRTDBG_MAP_ALLOC + $(IntDir)aemu_server_%(Filename).obj + + + _CRTDBG_MAP_ALLOC + _CRTDBG_MAP_ALLOC + _CRTDBG_MAP_ALLOC + $(IntDir)aemu_server_%(Filename).obj + + + _CRTDBG_MAP_ALLOC + _CRTDBG_MAP_ALLOC + _CRTDBG_MAP_ALLOC + $(IntDir)aemu_server_%(Filename).obj + + + _CRTDBG_MAP_ALLOC + _CRTDBG_MAP_ALLOC + _CRTDBG_MAP_ALLOC + $(IntDir)aemu_server_%(Filename).obj + + + _CRTDBG_MAP_ALLOC + _CRTDBG_MAP_ALLOC + _CRTDBG_MAP_ALLOC + $(IntDir)aemu_server_%(Filename).obj + + + _CRTDBG_MAP_ALLOC + _CRTDBG_MAP_ALLOC + _CRTDBG_MAP_ALLOC + $(IntDir)aemu_server_%(Filename).obj + + + _CRTDBG_MAP_ALLOC + _CRTDBG_MAP_ALLOC + _CRTDBG_MAP_ALLOC + $(IntDir)aemu_server_%(Filename).obj + + + _CRTDBG_MAP_ALLOC + _CRTDBG_MAP_ALLOC + _CRTDBG_MAP_ALLOC + $(IntDir)aemu_server_%(Filename).obj + diff --git a/Common/Common.vcxproj.filters b/Common/Common.vcxproj.filters index 26c4ae712e..204ca4f9f9 100644 --- a/Common/Common.vcxproj.filters +++ b/Common/Common.vcxproj.filters @@ -746,6 +746,33 @@ ext\aemu_postoffice + + ext\aemu_postoffice + + + ext\aemu_postoffice + + + ext\aemu_postoffice + + + ext\aemu_postoffice + + + ext\aemu_postoffice + + + ext\aemu_postoffice + + + ext\aemu_postoffice + + + ext\aemu_postoffice + + + ext\aemu_postoffice + UI @@ -1462,6 +1489,30 @@ ext\aemu_postoffice + + ext\aemu_postoffice + + + ext\aemu_postoffice + + + ext\aemu_postoffice + + + ext\aemu_postoffice + + + ext\aemu_postoffice + + + ext\aemu_postoffice + + + ext\aemu_postoffice + + + ext\aemu_postoffice + UI diff --git a/UWP/CommonUWP/CommonUWP.vcxproj b/UWP/CommonUWP/CommonUWP.vcxproj index 65d8a97e43..d0dc6cd25a 100644 --- a/UWP/CommonUWP/CommonUWP.vcxproj +++ b/UWP/CommonUWP/CommonUWP.vcxproj @@ -247,6 +247,15 @@ + + + + + + + + + @@ -438,6 +447,30 @@ + + $(IntDir)aemu_server_%(Filename).obj + + + $(IntDir)aemu_server_%(Filename).obj + + + $(IntDir)aemu_server_%(Filename).obj + + + $(IntDir)aemu_server_%(Filename).obj + + + $(IntDir)aemu_server_%(Filename).obj + + + $(IntDir)aemu_server_%(Filename).obj + + + $(IntDir)aemu_server_%(Filename).obj + + + $(IntDir)aemu_server_%(Filename).obj + diff --git a/UWP/CommonUWP/CommonUWP.vcxproj.filters b/UWP/CommonUWP/CommonUWP.vcxproj.filters index 2cb356e71c..cec0a7a1c5 100644 --- a/UWP/CommonUWP/CommonUWP.vcxproj.filters +++ b/UWP/CommonUWP/CommonUWP.vcxproj.filters @@ -560,6 +560,30 @@ ext\aemu_postoffice + + ext\aemu_postoffice + + + ext\aemu_postoffice + + + ext\aemu_postoffice + + + ext\aemu_postoffice + + + ext\aemu_postoffice + + + ext\aemu_postoffice + + + ext\aemu_postoffice + + + ext\aemu_postoffice + UI @@ -1113,6 +1137,33 @@ ext\aemu_postoffice + + ext\aemu_postoffice + + + ext\aemu_postoffice + + + ext\aemu_postoffice + + + ext\aemu_postoffice + + + ext\aemu_postoffice + + + ext\aemu_postoffice + + + ext\aemu_postoffice + + + ext\aemu_postoffice + + + ext\aemu_postoffice + UI diff --git a/android/jni/Android.mk b/android/jni/Android.mk index dcc9f17d33..7346a71cc8 100644 --- a/android/jni/Android.mk +++ b/android/jni/Android.mk @@ -819,6 +819,14 @@ EXEC_AND_LIB_FILES := \ $(SRC)/ext/aemu_postoffice/client/enet.c \ $(SRC)/ext/aemu_postoffice/adhocctl/client/adhocctl.c \ $(SRC)/ext/aemu_postoffice/adhocctl/client/adhocctl_mem.c \ + $(SRC)/ext/aemu_postoffice/server_cpp/server.cpp \ + $(SRC)/ext/aemu_postoffice/server_cpp/session.cpp \ + $(SRC)/ext/aemu_postoffice/server_cpp/semaphore.cpp \ + $(SRC)/ext/aemu_postoffice/server_cpp/log.cpp \ + $(SRC)/ext/aemu_postoffice/server_cpp/common.cpp \ + $(SRC)/ext/aemu_postoffice/server_cpp/enet.cpp \ + $(SRC)/ext/aemu_postoffice/server_cpp/snapshot.cpp \ + $(SRC)/ext/aemu_postoffice/server_cpp/native_socket_linux.cpp \ $(SRC)/Core/HLE/sceNetAdhocMatching.cpp \ $(SRC)/Core/HLE/sceNetApctl.cpp \ $(SRC)/Core/HLE/sceNetInet.cpp \ diff --git a/ext/aemu_postoffice b/ext/aemu_postoffice index 71600a6475..6c18042403 160000 --- a/ext/aemu_postoffice +++ b/ext/aemu_postoffice @@ -1 +1 @@ -Subproject commit 71600a6475c143f4fe9fd4c2f3dd3edc5b6e3896 +Subproject commit 6c1804240370148669e916c4377fbcd863b98382 diff --git a/libretro/Makefile.common b/libretro/Makefile.common index b7d05a816b..1ac69e5d1b 100644 --- a/libretro/Makefile.common +++ b/libretro/Makefile.common @@ -695,13 +695,24 @@ SOURCES_CXX += \ $(EXTDIR)/aemu_postoffice/client/mutex_impl_cpp.cpp \ $(EXTDIR)/aemu_postoffice/client/delay_impl_cpp.cpp \ $(EXTDIR)/aemu_postoffice/client/log_impl_ppsspp.cpp \ + $(EXTDIR)/aemu_postoffice/server_cpp/server.cpp \ + $(EXTDIR)/aemu_postoffice/server_cpp/session.cpp \ + $(EXTDIR)/aemu_postoffice/server_cpp/semaphore.cpp \ + $(EXTDIR)/aemu_postoffice/server_cpp/log.cpp \ + $(EXTDIR)/aemu_postoffice/server_cpp/common.cpp \ + $(EXTDIR)/aemu_postoffice/server_cpp/enet.cpp \ + $(EXTDIR)/aemu_postoffice/server_cpp/snapshot.cpp \ ifeq ($(PLATFORM_EXT), win32) SOURCES_C += \ $(EXTDIR)/aemu_postoffice/client/sock_impl_windows.c +SOURCES_CXX += \ + $(EXTDIR)/aemu_postoffice/server_cpp/native_socket_windows.cpp else SOURCES_C += \ $(EXTDIR)/aemu_postoffice/client/sock_impl_linux.c +SOURCES_CXX += \ + $(EXTDIR)/aemu_postoffice/server_cpp/native_socket_linux.cpp endif SOURCES_CXX += \