EMU/dolphin-emu_dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2026-01-09 06:41:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14208 from cristian64/broadband_adapter_ipc_freebsd

Browse Source 
Core/HW: Enable BBA (IPC) in FreeBSD.
This commit is contained in:
Jordan Woyak 2025-12-30 17:59:59 -06:00 committed by GitHub
commit d84dd20991
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -786,7 +786,7 @@ endif()
add_subdirectory(Externals/watcher) add_subdirectory(Externals/watcher)
if(WIN32 OR LINUX) if(NOT ANDROID AND NOT APPLE)
add_subdirectory(Externals/cpp-ipc) add_subdirectory(Externals/cpp-ipc)
endif() endif()

2
Externals/cpp-ipc/cpp-ipc vendored

@ -1 +1 @@
Subproject commit a0c7725a1441d18bc768d748a93e512a0fa7ab52 Subproject commit ce0773b3e6d5abaa8d104100c5704321113853ca

2
Source/Core/Core/CMakeLists.txt
View File

@ -799,7 +799,7 @@ if(UNIX)
) )
endif() endif()
if(WIN32 OR LINUX) if(NOT ANDROID AND NOT APPLE)
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()

4
Source/Core/Core/HW/EXI/EXI_DeviceEthernet.h
View File

@ -15,7 +15,7 @@
#endif #endif
#include <SFML/Network.hpp> #include <SFML/Network.hpp>
#if defined(WIN32) || (defined(__linux__) && !defined(__ANDROID__)) #if !defined(__ANDROID__) && !defined(__APPLE__)
#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(WIN32) || (defined(__linux__) && !defined(__ANDROID__)) #if !defined(__ANDROID__) && !defined(__APPLE__)
bool Activate() override; bool Activate() override;
void Deactivate() override; void Deactivate() override;

2
Source/Core/DolphinQt/Settings/GameCubePane.cpp
View File

@ -143,7 +143,7 @@ void GameCubePane::CreateWidgets()
EXIDeviceType::EthernetXLink, EXIDeviceType::EthernetXLink,
EXIDeviceType::EthernetTapServer, EXIDeviceType::EthernetTapServer,
EXIDeviceType::EthernetBuiltIn, EXIDeviceType::EthernetBuiltIn,
#if defined(WIN32) || (defined(__linux__) && !defined(__ANDROID__)) #if !defined(__APPLE__)
EXIDeviceType::EthernetIPC, EXIDeviceType::EthernetIPC,
#endif #endif
EXIDeviceType::ModemTapServer, EXIDeviceType::ModemTapServer,