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 <noreply@anthropic.com>
This commit is contained in:
Henrik RydgårdandClaude Opus 5.5 authored and Henrik Rydgård committed 2026-10-28 14:48:47 +01:00
1 parent 643abd5eb5
commit dfa22e5532
7 files changed
+212 -1

No files matched your search

+57
View File
@@ -294,6 +294,15 @@
<ClInclude Include="..\ext\aemu_postoffice\client\enet.h" />
<ClInclude Include="..\ext\aemu_postoffice\adhocctl\client\adhocctl.h" />
<ClInclude Include="..\ext\aemu_postoffice\adhocctl\client\adhocctl_mem.h" />
<ClInclude Include="..\ext\aemu_postoffice\server_cpp\server.h" />
<ClInclude Include="..\ext\aemu_postoffice\server_cpp\session.h" />
<ClInclude Include="..\ext\aemu_postoffice\server_cpp\semaphore.h" />
<ClInclude Include="..\ext\aemu_postoffice\server_cpp\log.h" />
<ClInclude Include="..\ext\aemu_postoffice\server_cpp\common.h" />
<ClInclude Include="..\ext\aemu_postoffice\server_cpp\enet.h" />
<ClInclude Include="..\ext\aemu_postoffice\server_cpp\snapshot.h" />
<ClInclude Include="..\ext\aemu_postoffice\server_cpp\native_socket.h" />
<ClInclude Include="..\ext\aemu_postoffice\server_cpp\config.h" />
<ClInclude Include="..\ext\at3_standalone\at3_decoders.h" />
<ClInclude Include="..\ext\at3_standalone\atrac.h" />
<ClInclude Include="..\ext\at3_standalone\atrac3data.h" />
@@ -638,6 +647,54 @@
<UndefinePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">_CRTDBG_MAP_ALLOC</UndefinePreprocessorDefinitions>
<UndefinePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_CRTDBG_MAP_ALLOC</UndefinePreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\ext\aemu_postoffice\server_cpp\server.cpp">
<UndefinePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_CRTDBG_MAP_ALLOC</UndefinePreprocessorDefinitions>
<UndefinePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">_CRTDBG_MAP_ALLOC</UndefinePreprocessorDefinitions>
<UndefinePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_CRTDBG_MAP_ALLOC</UndefinePreprocessorDefinitions>
<ObjectFileName>$(IntDir)aemu_server_%(Filename).obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\ext\aemu_postoffice\server_cpp\session.cpp">
<UndefinePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_CRTDBG_MAP_ALLOC</UndefinePreprocessorDefinitions>
<UndefinePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">_CRTDBG_MAP_ALLOC</UndefinePreprocessorDefinitions>
<UndefinePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_CRTDBG_MAP_ALLOC</UndefinePreprocessorDefinitions>
<ObjectFileName>$(IntDir)aemu_server_%(Filename).obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\ext\aemu_postoffice\server_cpp\semaphore.cpp">
<UndefinePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_CRTDBG_MAP_ALLOC</UndefinePreprocessorDefinitions>
<UndefinePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">_CRTDBG_MAP_ALLOC</UndefinePreprocessorDefinitions>
<UndefinePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_CRTDBG_MAP_ALLOC</UndefinePreprocessorDefinitions>
<ObjectFileName>$(IntDir)aemu_server_%(Filename).obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\ext\aemu_postoffice\server_cpp\log.cpp">
<UndefinePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_CRTDBG_MAP_ALLOC</UndefinePreprocessorDefinitions>
<UndefinePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">_CRTDBG_MAP_ALLOC</UndefinePreprocessorDefinitions>
<UndefinePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_CRTDBG_MAP_ALLOC</UndefinePreprocessorDefinitions>
<ObjectFileName>$(IntDir)aemu_server_%(Filename).obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\ext\aemu_postoffice\server_cpp\common.cpp">
<UndefinePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_CRTDBG_MAP_ALLOC</UndefinePreprocessorDefinitions>
<UndefinePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">_CRTDBG_MAP_ALLOC</UndefinePreprocessorDefinitions>
<UndefinePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_CRTDBG_MAP_ALLOC</UndefinePreprocessorDefinitions>
<ObjectFileName>$(IntDir)aemu_server_%(Filename).obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\ext\aemu_postoffice\server_cpp\enet.cpp">
<UndefinePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_CRTDBG_MAP_ALLOC</UndefinePreprocessorDefinitions>
<UndefinePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">_CRTDBG_MAP_ALLOC</UndefinePreprocessorDefinitions>
<UndefinePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_CRTDBG_MAP_ALLOC</UndefinePreprocessorDefinitions>
<ObjectFileName>$(IntDir)aemu_server_%(Filename).obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\ext\aemu_postoffice\server_cpp\snapshot.cpp">
<UndefinePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_CRTDBG_MAP_ALLOC</UndefinePreprocessorDefinitions>
<UndefinePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">_CRTDBG_MAP_ALLOC</UndefinePreprocessorDefinitions>
<UndefinePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_CRTDBG_MAP_ALLOC</UndefinePreprocessorDefinitions>
<ObjectFileName>$(IntDir)aemu_server_%(Filename).obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\ext\aemu_postoffice\server_cpp\native_socket_windows.cpp">
<UndefinePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_CRTDBG_MAP_ALLOC</UndefinePreprocessorDefinitions>
<UndefinePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">_CRTDBG_MAP_ALLOC</UndefinePreprocessorDefinitions>
<UndefinePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_CRTDBG_MAP_ALLOC</UndefinePreprocessorDefinitions>
<ObjectFileName>$(IntDir)aemu_server_%(Filename).obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\ext\at3_standalone\atrac.cpp" />
<ClCompile Include="..\ext\at3_standalone\atrac3.cpp" />
<ClCompile Include="..\ext\at3_standalone\atrac3plus.cpp" />
+51
View File
@@ -746,6 +746,33 @@
<ClInclude Include="..\ext\aemu_postoffice\adhocctl\client\adhocctl_mem.h">
<Filter>ext\aemu_postoffice</Filter>
</ClInclude>
<ClInclude Include="..\ext\aemu_postoffice\server_cpp\server.h">
<Filter>ext\aemu_postoffice</Filter>
</ClInclude>
<ClInclude Include="..\ext\aemu_postoffice\server_cpp\session.h">
<Filter>ext\aemu_postoffice</Filter>
</ClInclude>
<ClInclude Include="..\ext\aemu_postoffice\server_cpp\semaphore.h">
<Filter>ext\aemu_postoffice</Filter>
</ClInclude>
<ClInclude Include="..\ext\aemu_postoffice\server_cpp\log.h">
<Filter>ext\aemu_postoffice</Filter>
</ClInclude>
<ClInclude Include="..\ext\aemu_postoffice\server_cpp\common.h">
<Filter>ext\aemu_postoffice</Filter>
</ClInclude>
<ClInclude Include="..\ext\aemu_postoffice\server_cpp\enet.h">
<Filter>ext\aemu_postoffice</Filter>
</ClInclude>
<ClInclude Include="..\ext\aemu_postoffice\server_cpp\snapshot.h">
<Filter>ext\aemu_postoffice</Filter>
</ClInclude>
<ClInclude Include="..\ext\aemu_postoffice\server_cpp\native_socket.h">
<Filter>ext\aemu_postoffice</Filter>
</ClInclude>
<ClInclude Include="..\ext\aemu_postoffice\server_cpp\config.h">
<Filter>ext\aemu_postoffice</Filter>
</ClInclude>
<ClInclude Include="UI\Notice.h">
<Filter>UI</Filter>
</ClInclude>
@@ -1462,6 +1489,30 @@
<ClCompile Include="..\ext\aemu_postoffice\adhocctl\client\adhocctl_mem.c">
<Filter>ext\aemu_postoffice</Filter>
</ClCompile>
<ClCompile Include="..\ext\aemu_postoffice\server_cpp\server.cpp">
<Filter>ext\aemu_postoffice</Filter>
</ClCompile>
<ClCompile Include="..\ext\aemu_postoffice\server_cpp\session.cpp">
<Filter>ext\aemu_postoffice</Filter>
</ClCompile>
<ClCompile Include="..\ext\aemu_postoffice\server_cpp\semaphore.cpp">
<Filter>ext\aemu_postoffice</Filter>
</ClCompile>
<ClCompile Include="..\ext\aemu_postoffice\server_cpp\log.cpp">
<Filter>ext\aemu_postoffice</Filter>
</ClCompile>
<ClCompile Include="..\ext\aemu_postoffice\server_cpp\common.cpp">
<Filter>ext\aemu_postoffice</Filter>
</ClCompile>
<ClCompile Include="..\ext\aemu_postoffice\server_cpp\enet.cpp">
<Filter>ext\aemu_postoffice</Filter>
</ClCompile>
<ClCompile Include="..\ext\aemu_postoffice\server_cpp\snapshot.cpp">
<Filter>ext\aemu_postoffice</Filter>
</ClCompile>
<ClCompile Include="..\ext\aemu_postoffice\server_cpp\native_socket_windows.cpp">
<Filter>ext\aemu_postoffice</Filter>
</ClCompile>
<ClCompile Include="UI\Notice.cpp">
<Filter>UI</Filter>
</ClCompile>
+33
View File
@@ -247,6 +247,15 @@
<ClInclude Include="..\..\ext\aemu_postoffice\client\enet.h" />
<ClInclude Include="..\..\ext\aemu_postoffice\adhocctl\client\adhocctl.h" />
<ClInclude Include="..\..\ext\aemu_postoffice\adhocctl\client\adhocctl_mem.h" />
<ClInclude Include="..\..\ext\aemu_postoffice\server_cpp\server.h" />
<ClInclude Include="..\..\ext\aemu_postoffice\server_cpp\session.h" />
<ClInclude Include="..\..\ext\aemu_postoffice\server_cpp\semaphore.h" />
<ClInclude Include="..\..\ext\aemu_postoffice\server_cpp\log.h" />
<ClInclude Include="..\..\ext\aemu_postoffice\server_cpp\common.h" />
<ClInclude Include="..\..\ext\aemu_postoffice\server_cpp\enet.h" />
<ClInclude Include="..\..\ext\aemu_postoffice\server_cpp\snapshot.h" />
<ClInclude Include="..\..\ext\aemu_postoffice\server_cpp\native_socket.h" />
<ClInclude Include="..\..\ext\aemu_postoffice\server_cpp\config.h" />
<ClInclude Include="..\..\ext\at3_standalone\aac_defines.h" />
<ClInclude Include="..\..\ext\at3_standalone\at3_decoders.h" />
<ClInclude Include="..\..\ext\at3_standalone\atrac.h" />
@@ -438,6 +447,30 @@
<ClCompile Include="..\..\ext\aemu_postoffice\client\enet.c" />
<ClCompile Include="..\..\ext\aemu_postoffice\adhocctl\client\adhocctl.c" />
<ClCompile Include="..\..\ext\aemu_postoffice\adhocctl\client\adhocctl_mem.c" />
<ClCompile Include="..\..\ext\aemu_postoffice\server_cpp\server.cpp">
<ObjectFileName>$(IntDir)aemu_server_%(Filename).obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\..\ext\aemu_postoffice\server_cpp\session.cpp">
<ObjectFileName>$(IntDir)aemu_server_%(Filename).obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\..\ext\aemu_postoffice\server_cpp\semaphore.cpp">
<ObjectFileName>$(IntDir)aemu_server_%(Filename).obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\..\ext\aemu_postoffice\server_cpp\log.cpp">
<ObjectFileName>$(IntDir)aemu_server_%(Filename).obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\..\ext\aemu_postoffice\server_cpp\common.cpp">
<ObjectFileName>$(IntDir)aemu_server_%(Filename).obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\..\ext\aemu_postoffice\server_cpp\enet.cpp">
<ObjectFileName>$(IntDir)aemu_server_%(Filename).obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\..\ext\aemu_postoffice\server_cpp\snapshot.cpp">
<ObjectFileName>$(IntDir)aemu_server_%(Filename).obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\..\ext\aemu_postoffice\server_cpp\native_socket_windows.cpp">
<ObjectFileName>$(IntDir)aemu_server_%(Filename).obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\..\ext\at3_standalone\atrac.cpp" />
<ClCompile Include="..\..\ext\at3_standalone\atrac3.cpp" />
<ClCompile Include="..\..\ext\at3_standalone\atrac3plus.cpp" />
+51
View File
@@ -560,6 +560,30 @@
<ClCompile Include="..\..\ext\aemu_postoffice\adhocctl\client\adhocctl_mem.c">
<Filter>ext\aemu_postoffice</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\aemu_postoffice\server_cpp\server.cpp">
<Filter>ext\aemu_postoffice</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\aemu_postoffice\server_cpp\session.cpp">
<Filter>ext\aemu_postoffice</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\aemu_postoffice\server_cpp\semaphore.cpp">
<Filter>ext\aemu_postoffice</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\aemu_postoffice\server_cpp\log.cpp">
<Filter>ext\aemu_postoffice</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\aemu_postoffice\server_cpp\common.cpp">
<Filter>ext\aemu_postoffice</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\aemu_postoffice\server_cpp\enet.cpp">
<Filter>ext\aemu_postoffice</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\aemu_postoffice\server_cpp\snapshot.cpp">
<Filter>ext\aemu_postoffice</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\aemu_postoffice\server_cpp\native_socket_windows.cpp">
<Filter>ext\aemu_postoffice</Filter>
</ClCompile>
<ClCompile Include="..\..\Common\UI\Notice.cpp">
<Filter>UI</Filter>
</ClCompile>
@@ -1113,6 +1137,33 @@
<ClInclude Include="..\..\ext\aemu_postoffice\adhocctl\client\adhocctl_mem.h">
<Filter>ext\aemu_postoffice</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\aemu_postoffice\server_cpp\server.h">
<Filter>ext\aemu_postoffice</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\aemu_postoffice\server_cpp\session.h">
<Filter>ext\aemu_postoffice</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\aemu_postoffice\server_cpp\semaphore.h">
<Filter>ext\aemu_postoffice</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\aemu_postoffice\server_cpp\log.h">
<Filter>ext\aemu_postoffice</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\aemu_postoffice\server_cpp\common.h">
<Filter>ext\aemu_postoffice</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\aemu_postoffice\server_cpp\enet.h">
<Filter>ext\aemu_postoffice</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\aemu_postoffice\server_cpp\snapshot.h">
<Filter>ext\aemu_postoffice</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\aemu_postoffice\server_cpp\native_socket.h">
<Filter>ext\aemu_postoffice</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\aemu_postoffice\server_cpp\config.h">
<Filter>ext\aemu_postoffice</Filter>
</ClInclude>
<ClInclude Include="..\..\Common\UI\Notice.h">
<Filter>UI</Filter>
</ClInclude>
+8
View File
@@ -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 \
+11
View File
@@ -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 += \