piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 13:27:45 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

enet: Search for shared library

Browse Source
This commit is contained in:
degasus 2015-03-01 02:45:04 +01:00
parent cc5a2f3411
commit 691b690afe
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@ -536,9 +536,14 @@ 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 ENET_FOUND) if(NOT APPLE AND NOT ANDROID)
check_lib(ENET enet enet/enet.h QUIET)
endif()
if (ENET_FOUND)
message("Using shared enet")
else()
message("Using static enet from Externals") message("Using static enet from Externals")
include_directories(Externals) include_directories(Externals/enet/include)
add_subdirectory(Externals/enet) add_subdirectory(Externals/enet)
endif() endif()
LIST(APPEND LIBS enet) LIST(APPEND LIBS enet)

2
Source/Core/Common/TraversalClient.h
View File

@ -4,7 +4,7 @@
#include <functional> #include <functional>
#include <list> #include <list>
#include <memory> #include <memory>
#include <enet/include/enet/enet.h> #include <enet/enet.h>
#include "Common/Common.h" #include "Common/Common.h"
#include "Common/Thread.h" #include "Common/Thread.h"
#include "Common/TraversalProto.h" #include "Common/TraversalProto.h"