diff --git a/CMakeLists.txt b/CMakeLists.txt index afa692c4f8..5e63c62c66 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -786,7 +786,7 @@ endif() add_subdirectory(Externals/watcher) -if(WIN32 OR LINUX) +if(NOT ANDROID AND NOT APPLE) add_subdirectory(Externals/cpp-ipc) endif() diff --git a/Externals/cpp-ipc/cpp-ipc b/Externals/cpp-ipc/cpp-ipc index a0c7725a14..ce0773b3e6 160000 --- a/Externals/cpp-ipc/cpp-ipc +++ b/Externals/cpp-ipc/cpp-ipc @@ -1 +1 @@ -Subproject commit a0c7725a1441d18bc768d748a93e512a0fa7ab52 +Subproject commit ce0773b3e6d5abaa8d104100c5704321113853ca diff --git a/Source/Core/Core/CMakeLists.txt b/Source/Core/Core/CMakeLists.txt index dd4df0eb86..66236573c1 100644 --- a/Source/Core/Core/CMakeLists.txt +++ b/Source/Core/Core/CMakeLists.txt @@ -799,7 +799,7 @@ if(UNIX) ) endif() -if(WIN32 OR LINUX) +if(NOT ANDROID AND NOT APPLE) target_sources(core PRIVATE HW/EXI/BBA/IPC.cpp) target_link_libraries(core PRIVATE cpp-ipc::ipc) endif() diff --git a/Source/Core/Core/HW/EXI/EXI_DeviceEthernet.h b/Source/Core/Core/HW/EXI/EXI_DeviceEthernet.h index 67a0317831..a6b0780886 100644 --- a/Source/Core/Core/HW/EXI/EXI_DeviceEthernet.h +++ b/Source/Core/Core/HW/EXI/EXI_DeviceEthernet.h @@ -15,7 +15,7 @@ #endif #include -#if defined(WIN32) || (defined(__linux__) && !defined(__ANDROID__)) +#if !defined(__ANDROID__) && !defined(__APPLE__) #include #endif @@ -483,7 +483,7 @@ private: public: explicit IPCBBAInterface(CEXIETHERNET* const eth_ref) : NetworkInterface(eth_ref) {} -#if defined(WIN32) || (defined(__linux__) && !defined(__ANDROID__)) +#if !defined(__ANDROID__) && !defined(__APPLE__) bool Activate() override; void Deactivate() override; diff --git a/Source/Core/DolphinQt/Settings/GameCubePane.cpp b/Source/Core/DolphinQt/Settings/GameCubePane.cpp index 98460f6be0..fd27612dc5 100644 --- a/Source/Core/DolphinQt/Settings/GameCubePane.cpp +++ b/Source/Core/DolphinQt/Settings/GameCubePane.cpp @@ -143,7 +143,7 @@ void GameCubePane::CreateWidgets() EXIDeviceType::EthernetXLink, EXIDeviceType::EthernetTapServer, EXIDeviceType::EthernetBuiltIn, -#if defined(WIN32) || (defined(__linux__) && !defined(__ANDROID__)) +#if !defined(__APPLE__) EXIDeviceType::EthernetIPC, #endif EXIDeviceType::ModemTapServer,