tjh.dev
1diff --git a/CMakeLists.txt b/CMakeLists.txt
2index fb71d2d..3a710a4 100644
3--- a/CMakeLists.txt
4+++ b/CMakeLists.txt
5@@ -200,11 +200,11 @@ if(NOT MANUAL_SUBMODULES)
6 endfunction ()
7
8 message(STATUS "Checking submodules")
9- check_submodule(external/miniupnp)
10- check_submodule(external/unbound)
11- check_submodule(external/rapidjson)
12+ # check_submodule(external/miniupnp)
13+ # check_submodule(external/unbound)
14+ # check_submodule(external/rapidjson)
15 check_submodule(external/trezor-common)
16- check_submodule(external/randomx)
17+ # check_submodule(external/randomx)
18 endif()
19 endif()
20
21@@ -300,7 +300,8 @@ endif()
22 # elseif(CMAKE_SYSTEM_NAME MATCHES ".*BSDI.*")
23 # set(BSDI TRUE)
24
25-include_directories(external/rapidjson/include external/easylogging++ src contrib/epee/include external)
26+include_directories(external/easylogging++ src contrib/epee/include external)
27+#include_directories(external/rapidjson/include external/easylogging++ src contrib/epee/include external)
28
29 if(APPLE)
30 include_directories(SYSTEM /usr/include/malloc)
31diff --git a/cmake/FindMiniupnpc.cmake b/cmake/FindMiniupnpc.cmake
32index ad2004a..7f4bb68 100644
33--- a/cmake/FindMiniupnpc.cmake
34+++ b/cmake/FindMiniupnpc.cmake
35@@ -37,7 +37,7 @@ set(MINIUPNP_STATIC_LIBRARIES ${MINIUPNP_STATIC_LIBRARY})
36
37 include(FindPackageHandleStandardArgs)
38 find_package_handle_standard_args(
39- MiniUPnPc DEFAULT_MSG
40+ Miniupnpc DEFAULT_MSG
41 MINIUPNP_INCLUDE_DIR
42 MINIUPNP_LIBRARY
43 )
44diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
45index 71b165f..10189ce 100644
46--- a/external/CMakeLists.txt
47+++ b/external/CMakeLists.txt
48@@ -37,19 +37,9 @@
49
50 find_package(Miniupnpc REQUIRED)
51
52-message(STATUS "Using in-tree miniupnpc")
53-add_subdirectory(miniupnp/miniupnpc)
54-set_property(TARGET libminiupnpc-static PROPERTY FOLDER "external")
55-if(MSVC)
56- set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -wd4244 -wd4267")
57-elseif(NOT MSVC)
58- set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-undef -Wno-unused-result -Wno-unused-value")
59-endif()
60-if(CMAKE_SYSTEM_NAME MATCHES "NetBSD")
61- set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -D_NETBSD_SOURCE")
62-endif()
63-
64-set(UPNP_LIBRARIES "libminiupnpc-static" PARENT_SCOPE)
65+set(UPNP_STATIC false PARENT_SCOPE)
66+set(UPNP_INCLUDE ${MINIUPNP_INCLUDE_DIR} PARENT_SCOPE)
67+set(UPNP_LIBRARIES ${MINIUPNP_LIBRARY} PARENT_SCOPE)
68
69 find_package(Unbound)
70
71@@ -80,4 +70,3 @@ endif()
72
73 add_subdirectory(db_drivers)
74 add_subdirectory(easylogging++)
75-add_subdirectory(randomx EXCLUDE_FROM_ALL)
76diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl
77index c626e22..be570ed 100644
78--- a/src/p2p/net_node.inl
79+++ b/src/p2p/net_node.inl
80@@ -60,9 +60,9 @@
81 #include "cryptonote_core/cryptonote_core.h"
82 #include "net/parse.h"
83
84-#include <miniupnp/miniupnpc/miniupnpc.h>
85-#include <miniupnp/miniupnpc/upnpcommands.h>
86-#include <miniupnp/miniupnpc/upnperrors.h>
87+#include <miniupnpc/miniupnpc.h>
88+#include <miniupnpc/upnpcommands.h>
89+#include <miniupnpc/upnperrors.h>
90
91 #undef MONERO_DEFAULT_LOG_CATEGORY
92 #define MONERO_DEFAULT_LOG_CATEGORY "net.p2p"