From eb234da67fef01ffbcf1ae87dce8872cbf451162 Mon Sep 17 00:00:00 2001 From: comex Date: Tue, 2 Jun 2015 18:30:09 -0400 Subject: [PATCH] Disable shared libenet by default because I'm going to diverge it soon. The changes I intend to make are: - supporting IPv6 by rebasing on https://github.com/freeminer/enet - adding custom code for quick resending Even if I manage to get the latter upstream (which I'd like to wait for some testing before attempting), I don't know what the original author might do with the former, so... Leave an option to use it for the sake of Linux distros - this means any changes must stay protocol compatible, and Dolphin must work around any API incompatibilities (e.g. for IPv6). --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a5dae70bc9..538722d147 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,6 +6,7 @@ project(dolphin-emu) option(USE_EGL "Enables EGL OpenGL Interface" OFF) option(TRY_X11 "Enables X11 Support" ON) +option(USE_SHARED_ENET "Use shared libenet if found rather than Dolphin's soon-to-compatibly-diverge version" OFF) option(USE_UPNP "Enables UPnP port mapping support" ON) option(DISABLE_WX "Disable wxWidgets (use Qt or CLI interface)" OFF) option(ENABLE_QT "Enable Qt (use the experimental Qt interface)" OFF) @@ -529,7 +530,7 @@ include_directories(Source/Core) add_subdirectory(Externals/Bochs_disasm) include_directories(Externals/Bochs_disasm) -if(NOT ANDROID) +if(NOT ANDROID AND USE_SHARED_ENET) check_lib(ENET libenet enet enet/enet.h QUIET) include(CheckSymbolExists) if (ENET_FOUND)