Spdlog 使用系统默认参数

lanthora · Feb 23, 2024 · c04fe5d · c04fe5d
1 parent f1d3ea3
commit c04fe5d
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 0 deletions.
diff --git a/cmake/spdlog.cmake b/cmake/spdlog.cmake
@@ -1,5 +1,7 @@
 find_package(PkgConfig REQUIRED)
 pkg_check_modules(SPDLOG REQUIRED spdlog)
 
+add_definitions(${SPDLOG_CFLAGS})
+
 include_directories(${SPDLOG_INCLUDEDIR})
 target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE ${SPDLOG_LIBRARIES})
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -1,2 +1,4 @@
 aux_source_directory(. DIR_LIB_SRCS)
 add_library(core STATIC ${DIR_LIB_SRCS})
+
+include(${CMAKE_SOURCE_DIR}/cmake/spdlog.cmake)
diff --git a/src/peer/posix.cc b/src/peer/posix.cc
@@ -4,10 +4,13 @@
 #include "peer/peer.h"
 #include "utility/address.h"
 #include <errno.h>
+#include <fcntl.h>
 #include <netdb.h>
 #include <netinet/in.h>
 #include <spdlog/spdlog.h>
+#include <sys/select.h>
 #include <sys/socket.h>
+#include <unistd.h>
 
 namespace Candy {
 

diff --git a/src/tun/darwin.cc b/src/tun/darwin.cc
@@ -4,6 +4,7 @@
 #include "tun/tun.h"
 #include "utility/address.h"
 #include <errno.h>
+#include <fcntl.h>
 #include <memory>
 #include <net/if.h>
 #include <net/if_utun.h>
@@ -14,6 +15,7 @@
 #include <string>
 #include <sys/ioctl.h>
 #include <sys/kern_control.h>
+#include <sys/select.h>
 #include <sys/socket.h>
 #include <sys/sys_domain.h>
 #include <sys/uio.h>

diff --git a/src/utility/time.cc b/src/utility/time.cc
@@ -38,6 +38,8 @@ struct ntp_packet {
 
 #if defined(__linux__) || defined(__linux) || defined(__APPLE__) || defined(__MACH__)
 #include <netdb.h>
+#include <sys/select.h>
+#include <unistd.h>
 
 static int64_t ntpTime() {
     struct addrinfo hints = {}, *info = NULL;