mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2026-07-11 01:24:22 +02:00
Merge pull request #14208 from cristian64/broadband_adapter_ipc_freebsd
Core/HW: Enable BBA (IPC) in FreeBSD.
This commit is contained in:
+1
-1
@@ -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()
|
||||
|
||||
|
||||
Vendored
+1
-1
Submodule Externals/cpp-ipc/cpp-ipc updated: a0c7725a14...ce0773b3e6
@@ -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()
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
#endif
|
||||
|
||||
#include <SFML/Network.hpp>
|
||||
#if defined(WIN32) || (defined(__linux__) && !defined(__ANDROID__))
|
||||
#if !defined(__ANDROID__) && !defined(__APPLE__)
|
||||
#include <libipc/ipc.h>
|
||||
#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;
|
||||
|
||||
@@ -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,
|
||||
|
||||
Reference in New Issue
Block a user