Merge pull request #14255 from JoshuaVandaele/bsd-fix

cpp-ipc: Fix builds on non-FreeBSD BSDs

CMakeLists.txt

@@ -773,8 +773,10 @@ endif()
 
 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_definitions(-DHAVE_CPPIPC)
 endif()
 
 ########################################

Source/Core/Core/CMakeLists.txt

@@ -799,7 +799,7 @@ if(UNIX)
   )
 endif()
 
-if(NOT ANDROID AND NOT APPLE)
+if(TARGET cpp-ipc::ipc)
   target_sources(core PRIVATE HW/EXI/BBA/IPC.cpp)
   target_link_libraries(core PRIVATE cpp-ipc::ipc)
 endif()

Source/Core/Core/HW/EXI/EXI_DeviceEthernet.h

@@ -15,7 +15,7 @@
 #endif
 
 #include <SFML/Network.hpp>
-#if !defined(__ANDROID__) && !defined(__APPLE__)
+#ifdef HAVE_CPPIPC
 #include <libipc/ipc.h>
 #endif
 
@@ -483,7 +483,7 @@ private:
   public:
     explicit IPCBBAInterface(CEXIETHERNET* const eth_ref) : NetworkInterface(eth_ref) {}
 
-#if !defined(__ANDROID__) && !defined(__APPLE__)
+#ifdef HAVE_CPPIPC
 
     bool Activate() override;
     void Deactivate() override;

Source/Core/DolphinQt/Settings/GameCubePane.cpp

@@ -143,7 +143,7 @@ void GameCubePane::CreateWidgets()
            EXIDeviceType::EthernetXLink,
            EXIDeviceType::EthernetTapServer,
            EXIDeviceType::EthernetBuiltIn,
-#if !defined(__APPLE__)
+#ifdef HAVE_CPPIPC
            EXIDeviceType::EthernetIPC,
 #endif
            EXIDeviceType::ModemTapServer,

Source/VSProps/Base.Dolphin.props

@@ -50,6 +50,7 @@
       <PreprocessorDefinitions>RC_CLIENT_SUPPORTS_HASH;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions>RC_CLIENT_SUPPORTS_RAINTEGRATION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(EnableCubeb)'!='false'">HAVE_CUBEB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>HAVE_CPPIPC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <!-- Warnings one may want to ignore when using Level4.
       4201  nonstandard extension used : nameless struct/union