mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2024-11-14 21:37:52 -07:00
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).
This commit is contained in:
parent
d31d2b1949
commit
eb234da67f
@ -6,6 +6,7 @@ project(dolphin-emu)
|
|||||||
|
|
||||||
option(USE_EGL "Enables EGL OpenGL Interface" OFF)
|
option(USE_EGL "Enables EGL OpenGL Interface" OFF)
|
||||||
option(TRY_X11 "Enables X11 Support" ON)
|
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(USE_UPNP "Enables UPnP port mapping support" ON)
|
||||||
option(DISABLE_WX "Disable wxWidgets (use Qt or CLI interface)" OFF)
|
option(DISABLE_WX "Disable wxWidgets (use Qt or CLI interface)" OFF)
|
||||||
option(ENABLE_QT "Enable Qt (use the experimental Qt 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)
|
add_subdirectory(Externals/Bochs_disasm)
|
||||||
include_directories(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)
|
check_lib(ENET libenet enet enet/enet.h QUIET)
|
||||||
include(CheckSymbolExists)
|
include(CheckSymbolExists)
|
||||||
if (ENET_FOUND)
|
if (ENET_FOUND)
|
||||||
|
Loading…
Reference in New Issue
Block a user