Yaya48/dolphin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #14255 from JoshuaVandaele/bsd-fix

Browse Source 
cpp-ipc: Fix builds on non-FreeBSD BSDs
This commit is contained in:
JMC47
2026-01-11 16:27:29 -05:00
committed by GitHub
parent 28a8fa5de6 2005b0365e
commit 823d111922
5 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+3 -1
View File
@@ -773,8 +773,10 @@ endif()
add_subdirectory(Externals/watcher) add_subdirectory(Externals/watcher)
if(NOT ANDROID AND NOT APPLE) # Any other platform or BSD is currently unsupported by cpp-ipc
if(WIN32 OR LINUX OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "QNX")
add_subdirectory(Externals/cpp-ipc) add_subdirectory(Externals/cpp-ipc)
add_definitions(-DHAVE_CPPIPC)
endif() endif()
######################################## ########################################
Source/Core/Core/CMakeLists.txt
+1 -1
View File
@@ -799,7 +799,7 @@ if(UNIX)
) )
endif() endif()
if(NOT ANDROID AND NOT APPLE) if(TARGET cpp-ipc::ipc)
target_sources(core PRIVATE HW/EXI/BBA/IPC.cpp) target_sources(core PRIVATE HW/EXI/BBA/IPC.cpp)
target_link_libraries(core PRIVATE cpp-ipc::ipc) target_link_libraries(core PRIVATE cpp-ipc::ipc)
endif() endif()
Source/Core/Core/HW/EXI/EXI_DeviceEthernet.h
+2 -2
View File
@@ -15,7 +15,7 @@
#endif #endif
#include <SFML/Network.hpp> #include <SFML/Network.hpp>
#if !defined(__ANDROID__) && !defined(__APPLE__) #ifdef HAVE_CPPIPC
#include <libipc/ipc.h> #include <libipc/ipc.h>
#endif #endif
@@ -483,7 +483,7 @@ private:
public: public:
explicit IPCBBAInterface(CEXIETHERNET* const eth_ref) : NetworkInterface(eth_ref) {} explicit IPCBBAInterface(CEXIETHERNET* const eth_ref) : NetworkInterface(eth_ref) {}
#if !defined(__ANDROID__) && !defined(__APPLE__) #ifdef HAVE_CPPIPC
bool Activate() override; bool Activate() override;
void Deactivate() override; void Deactivate() override;
Source/Core/DolphinQt/Settings/GameCubePane.cpp
+1 -1
View File
@@ -143,7 +143,7 @@ void GameCubePane::CreateWidgets()
EXIDeviceType::EthernetXLink, EXIDeviceType::EthernetXLink,
EXIDeviceType::EthernetTapServer, EXIDeviceType::EthernetTapServer,
EXIDeviceType::EthernetBuiltIn, EXIDeviceType::EthernetBuiltIn,
#if !defined(__APPLE__) #ifdef HAVE_CPPIPC
EXIDeviceType::EthernetIPC, EXIDeviceType::EthernetIPC,
#endif #endif
EXIDeviceType::ModemTapServer, EXIDeviceType::ModemTapServer,
Source/VSProps/Base.Dolphin.props
+1
View File
@@ -50,6 +50,7 @@
<PreprocessorDefinitions>RC_CLIENT_SUPPORTS_HASH;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>RC_CLIENT_SUPPORTS_HASH;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>RC_CLIENT_SUPPORTS_RAINTEGRATION;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>RC_CLIENT_SUPPORTS_RAINTEGRATION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(EnableCubeb)'!='false'">HAVE_CUBEB;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions Condition="'$(EnableCubeb)'!='false'">HAVE_CUBEB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>HAVE_CPPIPC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<!-- Warnings one may want to ignore when using Level4. <!-- Warnings one may want to ignore when using Level4.
4201 nonstandard extension used : nameless struct/union 4201 nonstandard extension used : nameless struct/union